New interests form in publish api

Author: jonathanlloyd

README.rst

@@ -38,6 +38,6 @@ Once you have created your PushNotifications instance you can publish a push not
 
 .. code:: python
 
-  response = pn_client.publish({'interests': ['hello'], 'apns': {'aps': {'alert': 'Hello!'}}})
+  response = pn_client.publish(interests=['hello'], publish_body={'apns': {'aps': {'alert': 'Hello!'}}})
 
   print(response['publishId'])

pusher_push_notifications/__init__.py

@@ -29,20 +29,49 @@ def endpoint(self):
         """Property method to calculate the correct Pusher API host"""
         default_endpoint = '{}.pushnotifications.pusher.com'.format(
             self.instance_id,
-        )
+        ).lower()
         return self._endpoint or default_endpoint
 
-    def publish(self, publish_body):
-        requests.post(
+    def publish(self, interests, publish_body):
+        """Publish the given publish_body to the specified interests.
+
+        Args:
+            interests (list): List of interests that the publish body should
+                be sent to.
+            publish_body (dict): Dict containing the body of the push
+            notification publish request.
+            (see https://docs.pusher.com/push-notifications)
+
+        Returns:
+            A dict containing the publish response from the Pusher Push
+            Notifications service.
+            (see https://docs.pusher.com/push-notifications)
+
+        Raises:
+            TypeError: if interests is not a list
+            TypeError: if publish_body is not a dict
+        """
+        if not isinstance(interests, list):
+            raise TypeError('interests must be a list')
+        if not isinstance(publish_body, dict):
+            raise TypeError('publish_body must be a dictionary')
+
+        publish_body['interests'] = interests
+
+        session = requests.Session()
+        request = requests.Request(
+            'POST',
             'https://{}/publish_api/v1/instances/{}/publishes'.format(
                 self.endpoint,
                 self.instance_id,
             ),
             json=publish_body,
             headers={
+                'host': self.endpoint,
                 'authorization': 'Bearer {}'.format(self.secret_key),
                 'x-pusher-library': 'pusher-push-notifications-python {}'.format(
                     SDK_VERSION,
                 )
             },
         )
+        session.send(request.prepare())

tests/test_push_notifications.py

@@ -43,7 +43,7 @@ def test_constructor_should_set_endpoint_default(self):
         )
         self.assertEqual(
             pn_client.endpoint,
-            'INSTANCE_ID.pushnotifications.pusher.com',
+            'instance_id.pushnotifications.pusher.com',
         )
 
     def test_constructor_should_accept_endpoint_override(self):
@@ -67,14 +67,16 @@ def test_publish_should_make_correct_http_request(self):
                 requests_mock.ANY,
                 requests_mock.ANY,
             )
-            pn_client.publish({
-                'interests': ['donuts'],
-                'apns': {
-                    'aps': {
-                        'alert': 'Hello World!',
+            pn_client.publish(
+                interests=['donuts'],
+                publish_body={
+                    'apns': {
+                        'aps': {
+                            'alert': 'Hello World!',
+                        },
                     },
                 },
-            })
+            )
             req = http_mock.request_history[0]
 
         method = req.method
@@ -111,3 +113,31 @@ def test_publish_should_make_correct_http_request(self):
                 },
             },
         )
+
+        def test_publish_should_fail_if_interests_not_list(self):
+            pn_client = PushNotifications(
+                'INSTANCE_ID',
+                'SECRET_KEY'
+            )
+            with self.assertRaises(TypeError):
+                pn_client.publish(
+                        interests=False,
+                        publish_body={
+                            'apns': {
+                                'aps': {
+                                    'alert': 'Hello World!',
+                                },
+                            },
+                        },
+                )
+
+        def test_publish_should_fail_if_body_not_dict(self):
+            pn_client = PushNotifications(
+                'INSTANCE_ID',
+                'SECRET_KEY'
+            )
+            with self.assertRaises(TypeError):
+                pn_client.publish(
+                        interests=['donuts'],
+                        publish_body=False,
+                )