Change how routing key is included in event payloads

Including the routing key via the `send_event` method broke some downstream usage of the client, which depended on being able to call `post` directly with an explicitly-defined payload that lacked a routing key (which was possible when using the header).

To remedy this, the `post` method is overridden in EventsAPIClient to add the `routing_key` parameter to the body before sending.

pdpyras.py

@@ -697,10 +697,7 @@ def send_event(self, action, dedup_key=None, **properties):
         if action not in actions:
             raise ValueError("Event action must be one of: "+', '.join(actions))
 
-        event = {
-            'event_action':action,
-            'routing_key': self.api_key
-        }
+        event = {'event_action':action}
 
         event.update(properties)
         if isinstance(dedup_key, string_types):
@@ -716,6 +713,16 @@ def send_event(self, action, dedup_key=None, **properties):
                 "deduplication key.", response=response)
         return response_body['dedup_key']
 
+    def post(self, *args, **kw):
+        """
+        Override of ``requests.Session.post``
+
+        Adds the ``routing_key`` parameter to the body before sending.
+        """
+        if 'json' in kw and hasattr(kw['json'], 'update'):
+            kw['json'].update({'routing_key': self.api_key})
+        return super(EventsAPISession, self).post(*args, **kw)
+
     def trigger(self, summary, source, dedup_key=None, severity='critical',
             payload=None, custom_details=None, images=None, links=None):
         """

test_pdpyras.py

@@ -127,6 +127,26 @@ def test_send_event(self):
                 },
                 parent.request.call_args[1]['json'])
 
+    def test_send_explicit_event(self):
+        # test sending an event by calling `post` directly as opposed to any of
+        # the methods written into the client for sending events
+        sess = pdpyras.EventsAPISession('routingkey')
+        parent = MagicMock()
+        parent.request = MagicMock()
+        parent.request.side_effect = [Response(202, '{"dedup_key":"abc123"}')]
+        with patch.object(sess, 'parent', new=parent):
+            response = sess.post('/v2/enqueue', json={
+                'payload': {
+                    'summary': 'testing 123',
+                    'source': 'pdpyras integration',
+                    'severity': 'critical'
+                },
+                'event_action': 'trigger'
+            })
+            json_sent = parent.request.call_args[1]['json']
+            self.assertTrue('routing_key' in json_sent)
+            self.assertEqual(json_sent['routing_key'], 'routingkey')
+
 class APISessionTest(SessionTest):
 
     def debug(self, sess):