Merge pull request #2 from pusher/support-dash

Interest name can include dash character

Author: jonathanlloyd

pusher_push_notifications/__init__.py

@@ -6,9 +6,9 @@
 import requests
 import six
 
-SDK_VERSION = '0.9.1'
+SDK_VERSION = '0.9.2'
 INTEREST_MAX_LENGTH = 164
-INTEREST_REGEX = re.compile('^(_|=|@|,|\\.|:|[A-Z]|[a-z]|[0-9])*$')
+INTEREST_REGEX = re.compile('^(_-|=|@|,|\\.|:|[A-Z]|[a-z]|[0-9])*$')
 
 
 class PusherValidationError(ValueError):
@@ -119,13 +119,6 @@ def publish(self, interests, publish_body):
                         INTEREST_MAX_LENGTH,
                     )
                 )
-            if '-' in interest:
-                raise ValueError(
-                    'Interest "{}" contains a "-" which is forbidden. '.format(
-                        interest,
-                    )
-                    + 'have you considered using a "_" instead?'
-                )
             if not INTEREST_REGEX.match(interest):
                 raise ValueError(
                     'Interest "{}" contains a forbidden character. '.format(

setup.py

@@ -2,7 +2,7 @@
 from codecs import open
 from os import path
 
-__version__ = '0.9.1'
+__version__ = '0.9.2'
 
 here = path.abspath(path.dirname(__file__))
 

tests/test_push_notifications.py

@@ -108,7 +108,7 @@ def test_publish_should_make_correct_http_request(self):
                 'content-type': 'application/json',
                 'content-length': '69',
                 'authorization': 'Bearer SECRET_KEY',
-                'x-pusher-library': 'pusher-push-notifications-python 0.9.1',
+                'x-pusher-library': 'pusher-push-notifications-python 0.9.2',
                 'host': 'instance_id.pushnotifications.pusher.com',
             },
         )
@@ -217,7 +217,7 @@ def test_publish_should_fail_if_interest_contains_invalid_chars(self):
         )
         with self.assertRaises(ValueError):
             pn_client.publish(
-                    interests=['bad-interest'],
+                    interests=['bad|interest'],
                     publish_body={
                         'apns': {
                             'aps': {