Merge pull request #81 from pusher/kill-the-spare

Remove notification validation code

Author: jpatel531

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 1.4.0 2016-08-15
+
+* Add support for sending push notifications.
 
 #### 1.3.0 2016-05-24
 

pusher/http.py

@@ -42,10 +42,8 @@ def make_query_string(params):
     return '&'.join(map('='.join, sorted(params.items(), key=lambda x: x[0])))
 
 def process_response(status, body):
-    if status == 200:
+    if status == 200 or status == 202:
         return json.loads(body)
-    if status == 202:
-        return True
     elif status == 400:
         raise PusherBadRequest(body)
     elif status == 401:

pusher/notification_client.py

@@ -41,50 +41,5 @@ def notify(self, interests, notification):
 			'interests': interests,
 		}
 		params.update(notification)
-		self.validate_notification(params)
 		path =  "/%s/%s/apps/%s/notifications" % (API_PREFIX, API_VERSION, self.app_id)
 		return Request(self, POST, path, params)
-
-	def validate_notification(self, notification):
-		gcm_payload = notification.get('gcm')
-
-		if not gcm_payload and not notification.get('apns') :
-			raise ValueError("Notification must have fields APNS or GCM")
-
-		if gcm_payload:
-			for restricted_key in RESTRICTED_GCM_KEYS:
-				gcm_payload.pop(restricted_key, None)
-
-			ttl = gcm_payload.get('time_to_live')
-			if ttl:
-				if not isinstance(ttl, int):
-					raise ValueError("GCM time_to_live must be an int")
-
-				if not (0 <= ttl <= GCM_TTL):
-					raise ValueError("GCM time_to_live must be between 0 and 241920 (4 weeks)")
-
-			gcm_payload_notification = gcm_payload.get('notification')
-			if gcm_payload_notification:
-				title = gcm_payload_notification.get('title')
-				icon = gcm_payload_notification.get('icon')
-				if not isinstance(title, str):
-					raise ValueError("GCM notification title is required must be a string")
-
-				if not isinstance(icon, str):
-					raise ValueError("GCM notification icon is required must be a string")
-
-				if len(title) is 0:
-					raise ValueError("GCM notification title must not be empty")
-
-				if len(icon) is 0:
-					raise ValueError("GCM notification icon must not be empty")
-
-		webhook_url = notification.get('webhook_url')
-		webhook_level = notification.get('webhook_level')
-
-		if webhook_level:
-			if not webhook_url:
-				raise ValueError("webhook_level cannot be used without a webhook_url")
-
-			if not webhook_level in WEBHOOK_LEVELS:
-				raise ValueError("webhook_level must be either INFO or DEBUG. Blank will default to INFO")

pusher/pusher.py

@@ -270,7 +270,7 @@ def notification_client(self):
         return self._notification_client
 
     def notify(self, interest, notification):
-        self._notification_client.notify(interest, notification)
+        return self._notification_client.notify(interest, notification)
 
     def _data_to_string(self, data):
         if isinstance(data, six.string_types):

pusher/version.py

@@ -1,2 +1,2 @@
 # Don't change the format of this line: the version is extracted by ../setup.py
-VERSION = '1.4rc3'
+VERSION = '1.4'

pusher_tests/test_notification_client.py

@@ -51,137 +51,5 @@ def test_notify_supplied_ssl_and_host(self):
 		request = configured_client.notify.make_request([u'blargh'], self.success_fixture)
 		self.assertEqual(request.base_url, u'http://foo.bar.io:80')
 
-	def test_either_apns_or_gcm_must_be_present(self):
-		self.assertRaises(ValueError, lambda:
-			self.client.notify([u'yolo'], {})
-		)
-
 	def test_only_one_interest_sent_to(self):
 		self.assertRaises(ValueError, lambda: self.client.notify([u'yolo', u'woot'], self.success_fixture))
-
-	def test_gcm_restricted_keys_removed(self):
-		request = self.client.notify.make_request(['yolo'], {
-			'gcm': {
-				'to': 'woot',
-				'registration_ids': ['woot', 'bla'],
-				'notification': {
-					'title': 'yipee',
-					'icon': 'huh'
-				}
-			}
-		})
-		self.assertEqual(request.params, {
-			'interests': ['yolo'],
-			'gcm': {
-				'notification': {
-					'title': 'yipee',
-					'icon': 'huh'
-				}
-			}
-		})
-
-	def test_gcm_validations(self):
-		invalid_gcm_payloads = [
-			{
-				'gcm': {
-					'time_to_live': -1,
-					'notification': {
-						'title': 'yipee',
-						'icon': 'huh'
-					}
-				}
-			},
-			{
-				'gcm': {
-					'time_to_live': 241921,
-					'notification': {
-						'title': 'yipee',
-						'icon': 'huh'
-					}
-				}
-			},
-			{
-				'gcm': {
-					'notification': {
-						'title': 'yipee',
-					}
-				}
-			},
-			{
-				'gcm': {
-					'notification': {
-						'icon': 'huh'
-					}
-				}
-			},
-			{
-				'gcm': {
-					'notification': {
-						'title': '',
-						'icon': 'huh'
-					}
-				}
-			},
-			{
-				'gcm': {
-					'notification': {
-						'title': 'yipee',
-						'icon': ''
-					}
-				}
-			}
-		]
-
-		for payload in invalid_gcm_payloads:
-			self.assertRaises(ValueError, lambda:
-				self.client.notify([u'yolo'], payload)
-			)
-
-		valid_gcm_payload = \
-			{
-				'gcm': {
-					'time_to_live': 42,
-					'notification': {
-						'title': 'yipee',
-						'icon': 'huh'
-					}
-				}
-			}
-		self.client.notify.make_request([u'yolo'], valid_gcm_payload)
-
-	def test_webhook_level_validation(self):
-		invalid_webhook_configs = [
-			{
-				'webhook_level': 'DEBUG',
-				'apns': {
-					'alert': {
-					'title': 'yolo',
-					'body': 'woot'
-					}
-				},
-				'gcm': {
-					'notification': {
-						'title': 'yipee',
-						'icon': 'huh'
-					}
-				}
-			},
-			{
-				'webhook_level': 'FOOBAR',
-				'webhook_url': 'http://webhook.com',
-				'apns': {
-					'alert': {
-					'title': 'yolo',
-					'body': 'woot'
-					}
-				},
-				'gcm': {
-					'notification': {
-						'title': 'yipee',
-						'icon': 'huh'
-					}
-				}
-			}]
-
-		for config in invalid_webhook_configs:
-			self.assertRaises(ValueError, lambda: self.client.notify.make_request([u'yolo'], config))