Signals v2

aiohttp/signals.py

@@ -0,0 +1,29 @@
+import asyncio
+
+
+class Signal(list):
+    """
+    Coroutine-based signal implementation
+
+    To connect a callback to a signal, use any list method. If wish to pass
+    additional arguments to your callback, use :meth:`functools.partial`.
+
+    Signals are fired using the :meth:`send` coroutine, which takes named
+    arguments.
+    """
+
+    @asyncio.coroutine
+    def send(self, **kwargs):
+        """
+        Sends data to all registered receivers.
+        """
+        for receiver in self:
+            res = receiver(**kwargs)
+            if asyncio.iscoroutine(res) or isinstance(res, asyncio.Future):
+                yield from res
+
+    def copy(self):
+        raise NotImplementedError("copy() is forbidden")
+
+    def sort(self):
+        raise NotImplementedError("sort() is forbidden")

aiohttp/web.py

@@ -7,6 +7,7 @@
 from .web_urldispatcher import *  # noqa
 from .web_ws import *  # noqa
 from .protocol import HttpVersion  # noqa
+from .signals import Signal
 
 
 import asyncio
@@ -196,6 +197,8 @@ def __init__(self, *, logger=web_logger, loop=None,
             assert asyncio.iscoroutinefunction(factory), factory
         self._middlewares = list(middlewares)
 
+        self.on_response_prepare = Signal()
+
     @property
     def router(self):
         return self._router

aiohttp/web_reqrep.py

@@ -646,6 +646,8 @@ def prepare(self, request):
         resp_impl = self._start_pre_check(request)
         if resp_impl is not None:
             return resp_impl
+        yield from request.app.on_response_prepare.send(request=request,
+                                                        response=self)
 
         return self._start(request)
 

docs/api.rst

@@ -49,6 +49,14 @@ aiohttp.protocol module
     :undoc-members:
     :show-inheritance:
 
+aiohttp.signals module
+----------------------
+
+.. automodule:: aiohttp.signals
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 aiohttp.streams module
 ----------------------
 

docs/web_reference.rst

@@ -554,7 +554,8 @@ StreamResponse
                                           response answers.
 
       Send *HTTP header*. You should not change any header data after
-      calling this method.
+      calling this method, except through
+      :attr:`Application.on_response_start` signal callbacks.
 
       .. deprecated:: 0.18
 
@@ -920,6 +921,13 @@ arbitrary properties for later access from
 
       :ref:`event loop<asyncio-event-loop>` used for processing HTTP requests.
 
+   .. attribute:: on_response_start
+
+      A :class:`~aiohttp.signals.FunctionSignal` that is fired at the beginning
+      of :meth:`StreamResponse.start` with parameters ``request`` and
+      ``response``. It can be used, for example, to add custom headers to each
+      response before sending.
+
    .. method:: make_handler(**kwargs)
 
       Creates HTTP protocol factory for handling requests.

tests/test_signals.py

@@ -0,0 +1,95 @@
+import asyncio
+import unittest
+from unittest import mock
+from aiohttp.multidict import CIMultiDict
+from aiohttp.signals import Signal
+from aiohttp.web import Application
+from aiohttp.web import Request, Response
+from aiohttp.protocol import HttpVersion11
+from aiohttp.protocol import RawRequestMessage
+
+
+class TestSignals(unittest.TestCase):
+    def setUp(self):
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(None)
+
+    def tearDown(self):
+        self.loop.close()
+
+    def make_request(self, method, path, headers=CIMultiDict(), app=None):
+        message = RawRequestMessage(method, path, HttpVersion11, headers,
+                                    False, False)
+        return self.request_from_message(message, app)
+
+    def request_from_message(self, message, app=None):
+        self.app = app if app is not None else mock.Mock()
+        self.payload = mock.Mock()
+        self.transport = mock.Mock()
+        self.reader = mock.Mock()
+        self.writer = mock.Mock()
+        req = Request(self.app, message, self.payload,
+                      self.transport, self.reader, self.writer)
+        return req
+
+    def test_add_response_prepare_signal_handler(self):
+        callback = asyncio.coroutine(lambda request, response: None)
+        app = Application(loop=self.loop)
+        app.on_response_prepare.append(callback)
+
+    def test_add_signal_handler_not_a_callable(self):
+        callback = True
+        app = Application(loop=self.loop)
+        app.on_response_prepare.append(callback)
+        with self.assertRaises(TypeError):
+            app.on_response_prepare(None, None)
+
+    def test_function_signal_dispatch(self):
+        signal = Signal()
+        kwargs = {'foo': 1, 'bar': 2}
+
+        callback_mock = mock.Mock()
+        callback = asyncio.coroutine(callback_mock)
+
+        signal.append(callback)
+
+        self.loop.run_until_complete(signal.send(**kwargs))
+        callback_mock.assert_called_once_with(**kwargs)
+
+    def test_response_prepare(self):
+        callback = mock.Mock()
+
+        app = Application(loop=self.loop)
+        app.on_response_prepare.append(asyncio.coroutine(callback))
+
+        request = self.make_request('GET', '/', app=app)
+        response = Response(body=b'')
+        self.loop.run_until_complete(response.prepare(request))
+
+        callback.assert_called_once_with(request=request,
+                                         response=response)
+
+    def test_non_coroutine(self):
+        signal = Signal()
+        kwargs = {'foo': 1, 'bar': 2}
+
+        callback = mock.Mock()
+
+        signal.append(callback)
+
+        self.loop.run_until_complete(signal.send(**kwargs))
+        callback.assert_called_once_with(**kwargs)
+
+    def test_copy_forbidden(self):
+        signal = Signal()
+        with self.assertRaises(NotImplementedError):
+            signal.copy()
+
+    def test_sort_forbidden(self):
+        l1 = lambda: None
+        l2 = lambda: None
+        l3 = lambda: None
+        signal = Signal([l1, l2, l3])
+        with self.assertRaises(NotImplementedError):
+            signal.sort()
+        self.assertEqual(signal, [l1, l2, l3])

tests/test_web_exceptions.py

@@ -6,7 +6,7 @@
 from aiohttp.web import Request
 from aiohttp.protocol import RawRequestMessage, HttpVersion11
 
-from aiohttp import web
+from aiohttp import signals, web
 
 
 class TestHTTPExceptions(unittest.TestCase):
@@ -32,6 +32,7 @@ def append(self, data):
 
     def make_request(self, method='GET', path='/', headers=CIMultiDict()):
         self.app = mock.Mock()
+        self.app.on_response_prepare = signals.Signal()
         message = RawRequestMessage(method, path, HttpVersion11, headers,
                                     False, False)
         req = Request(self.app, message, self.payload,

tests/test_web_request.py

@@ -1,6 +1,7 @@
 import asyncio
 import unittest
 from unittest import mock
+from aiohttp.signals import Signal
 from aiohttp.web import Request
 from aiohttp.multidict import MultiDict, CIMultiDict
 from aiohttp.protocol import HttpVersion
@@ -23,6 +24,7 @@ def make_request(self, method, path, headers=CIMultiDict(), *,
         if version < HttpVersion(1, 1):
             closing = True
         self.app = mock.Mock()
+        self.app.on_response_prepare = Signal()
         message = RawRequestMessage(method, path, version, headers, closing,
                                     False)
         self.payload = mock.Mock()

tests/test_web_response.py

@@ -2,7 +2,7 @@
 import datetime
 import unittest
 from unittest import mock
-from aiohttp import hdrs
+from aiohttp import hdrs, signals
 from aiohttp.multidict import CIMultiDict
 from aiohttp.web import ContentCoding, Request, StreamResponse, Response
 from aiohttp.protocol import HttpVersion, HttpVersion11, HttpVersion10
@@ -26,6 +26,7 @@ def make_request(self, method, path, headers=CIMultiDict(),
 
     def request_from_message(self, message):
         self.app = mock.Mock()
+        self.app.on_response_prepare = signals.Signal()
         self.payload = mock.Mock()
         self.transport = mock.Mock()
         self.reader = mock.Mock()
@@ -514,6 +515,16 @@ def test_start_twice(self, ResponseImpl):
             impl2 = resp.start(req)
             self.assertIs(impl1, impl2)
 
+    def test_prepare_calls_signal(self):
+        req = self.make_request('GET', '/')
+        resp = StreamResponse()
+
+        sig = mock.Mock()
+        self.app.on_response_prepare.append(sig)
+        self.loop.run_until_complete(resp.prepare(req))
+
+        sig.assert_called_with(request=req, response=resp)
+
 
 class TestResponse(unittest.TestCase):
 
@@ -526,6 +537,7 @@ def tearDown(self):
 
     def make_request(self, method, path, headers=CIMultiDict()):
         self.app = mock.Mock()
+        self.app.on_response_prepare = signals.Signal()
         message = RawRequestMessage(method, path, HttpVersion11, headers,
                                     False, False)
         self.payload = mock.Mock()

tests/test_web_websocket.py

@@ -5,7 +5,7 @@
 from aiohttp.web import (
     MsgType, Request, WebSocketResponse, HTTPMethodNotAllowed, HTTPBadRequest)
 from aiohttp.protocol import RawRequestMessage, HttpVersion11
-from aiohttp import errors, websocket
+from aiohttp import errors, signals, websocket
 
 
 class TestWebWebSocket(unittest.TestCase):
@@ -37,6 +37,7 @@ def make_request(self, method, path, headers=None, protocols=False):
         self.reader = mock.Mock()
         self.writer = mock.Mock()
         self.app.loop = self.loop
+        self.app.on_response_prepare = signals.Signal()
         req = Request(self.app, message, self.payload,
                       self.transport, self.reader, self.writer)
         return req