Merge pull request #45 from pusher/run-with-it

Run with it

Author: jpatel531

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4

.travis.yml

@@ -5,5 +5,10 @@ python:
   - "2.7"
 #  - "3.2"
   - "3.3"
-install: "python setup.py develop"
+install: 
+  - "python setup.py develop"
+  - "pip install aiohttp"
+  - "pip install tornado"
+  - "pip install urlfetch"
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
 script: "python setup.py test"

README.md

@@ -39,8 +39,8 @@ constructor arguments which identify your Pusher app. You can find them by
 going to "API Keys" on your app at https://app.pusher.com.
 
 ```python
-from pusher import Config, Pusher
-pusher = Pusher(config=Config(app_id=u'4', key=u'key', secret=u'secret'))
+from pusher import Pusher
+pusher = Pusher(app_id=u'4', key=u'key', secret=u'secret')
 ```
 
 You can then trigger events to channels. Channel and event names may only
@@ -50,6 +50,31 @@ contain alphanumeric characters, `-` and `_`:
 pusher.trigger(u'a_channel', u'an_event', {u'some': u'data'})
 ```
 
+## Configuration
+
+```python
+from pusher import Pusher
+pusher = Pusher(app_id, key, secret, config=None, backend=None)
+```
+
+|Argument   |Description   |
+|:-:|:-:|
+|app_id `String`  |**Required** <br> The Pusher application ID |
+|key `String`     |**Required** <br> The Pusher application key |
+|secret `String`  |**Required** <br> The Pusher application secret token |
+|host `String`    | **Default:`None`** <br> The host to connect to |
+|port `int`       | **Default:`None`** <br>Which port to connect to |
+|ssl `bool`       | **Default:`False`** <br> Use HTTPS |
+|cluster `String` | **Default:`None`** <br> Convention for other clusters than the main Pusher-one. Eg: 'eu' will resolve to the api-eu.pusherapp.com host |
+|backend `Object` | an object that responds to the send_request(request) method. If none is provided, a `python.sync.SynchronousBackend` instance is created. |
+
+##### Example
+
+```py
+from pusher import Pusher, Config
+pusher = Pusher(app_id=u'4', key=u'key', secret=u'secret', Config(ssl=True, cluster=u'eu'))
+```
+
 Triggering Events
 -----------------
 
@@ -159,13 +184,13 @@ pusher.users_info(u'presence-chatroom')
 Authenticating Channel Subscription
 -----------------
 
-#### `Config::authenticate_subscription`
+#### `Pusher::authenticate`
 
 In order for users to subscribe to a private- or presence-channel, they must be authenticated by your server.
 
 The client will make a POST request to an endpoint (either "/pusher/auth" or any which you specify) with a body consisting of the channel's name and socket_id.
 
-Using your `Config` instance, with which you initialized `Pusher`, you can generate an authentication signature. Having responded to the request with this signature, the subscription will be authenticated.
+Using your `Pusher` instance, with which you initialized `Pusher`, you can generate an authentication signature. Having responded to the request with this signature, the subscription will be authenticated.
 
 |Argument   |Description   |
 |:-:|:-:|
@@ -182,8 +207,7 @@ Using your `Config` instance, with which you initialized `Pusher`, you can gener
 ###### Private Channels
 
 ```python
-config = pusher.config
-auth = config.authenticate_subscription(
+auth = pusher.authenticate_subscription(
 
   channel=u"private-channel",
 
@@ -195,9 +219,7 @@ auth = config.authenticate_subscription(
 ###### Presence Channels
 
 ```python
-config = pusher.config
-
-auth = config.authenticate_subscription(
+auth = pusher.authenticate_subscription(
 
   channel=u"presence-channel",
 
@@ -216,9 +238,9 @@ auth = config.authenticate_subscription(
 Receiving Webhooks
 -----------------
 
-If you have webhooks set up to POST a payload to a specified endpoint, you may wish to validate that these are actually from Pusher. The `Config` object achieves this by checking the authentication signature in the request body using your application credentials.
+If you have webhooks set up to POST a payload to a specified endpoint, you may wish to validate that these are actually from Pusher. The `Pusher` object achieves this by checking the authentication signature in the request body using your application credentials.
 
-#### `Config::validate_webhook`
+#### `Pusher::validate_webhook`
 
 |Argument   |Description   |
 |:-:|:-:|
@@ -233,7 +255,7 @@ If you have webhooks set up to POST a payload to a specified endpoint, you may w
 ##### Example
 
 ```python
-webhook = pusher.config.validate_webhook(
+webhook = pusher.validate_webhook(
 
   key="key_sent_in_header",
 
@@ -253,4 +275,4 @@ To run the tests run `python setup.py test`
 License
 -------
 
-Copyright (c) 2014 Pusher Ltd. See LICENSE for details.
+Copyright (c) 2015 Pusher Ltd. See LICENSE for details.

pusher/__init__.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from .config import Config
 from .pusher import Pusher
 
 __all__ = [
-    'Config',
     'Pusher',
 ]

pusher/aiohttp.py

@@ -1,27 +1,29 @@
 # -*- coding: utf-8 -*-
 
 import aiohttp
-import pusher
+import asyncio
 
-class AsyncIOBackend:
-    """Adapter for the aiohttp module.
-
-    This backend is only availble for python 3 users and doesn't support SSL.
+from pusher.http import process_response
 
-    :param config: pusher.Config instance
-    """
+class AsyncIOBackend:
     def __init__(self, config):
+        """Adapter for the requests module.
+
+        :param config:  pusher.Pusher object
+        """
         self.config = config
-        if config.ssl:
-            raise NotImplementedError("SSL not supported for this backend")
+        self.conn = aiohttp.TCPConnector()
 
     def send_request(self, request):
         method = request.method
-        url = "http://%s:%s%s" % (self.config.host, self.config.port, request.path)
+        url = "%s%s" % (request.base_url, request.path)
         params = request.query_params
         data = request.body
         headers = request.headers
 
-        response = yield from aiohttp.request(method, url, params=params, data=data, headers=headers)
+        response = yield from asyncio.wait_for(
+            aiohttp.request(method, url, params=params, data=data, headers=headers, connector=self.conn),
+            timeout=self.config.timeout
+        )
         body = yield from response.read_and_close()
-        return pusher.process_response(response.status, body.decode('utf8'))
+        return process_response(response.status, body.decode('utf8'))

pusher/config.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+class PusherError(Exception):
+    pass
+
+class PusherBadRequest(PusherError):
+    pass
+
+class PusherBadAuth(PusherError):
+    pass
+
+class PusherForbidden(PusherError):
+    pass
+
+class PusherBadStatus(PusherError):
+    pass