Use new-style (decorated) middleware syntax (#217)

* Use new-style (decorated) midleware syntax

* Fix required aiohttp version & mention support for Python 3.6

* Add test for stream response, prepared response and bad type response

Author: panagiks

aiohttp_session/__init__.py

@@ -118,35 +118,31 @@ def session_middleware(storage):
 
     assert isinstance(storage, AbstractStorage), storage
 
+    @web.middleware
     @asyncio.coroutine
-    def factory(app, handler):
-
-        @asyncio.coroutine
-        def middleware(request):
-            request[STORAGE_KEY] = storage
-            raise_response = False
-            try:
-                response = yield from handler(request)
-            except web.HTTPException as exc:
-                response = exc
-                raise_response = True
-            if not isinstance(response, web.StreamResponse):
-                raise RuntimeError("Expect response, not {!r}", type(response))
-            if not isinstance(response, web.Response):
-                # likely got websoket or streaming
-                return response
-            if response.prepared:
-                raise RuntimeError(
-                    "Cannot save session data into prepared response")
-            session = request.get(SESSION_KEY)
-            if session is not None:
-                if session._changed:
-                    yield from storage.save_session(request, response, session)
-            if raise_response:
-                raise response
+    def factory(request, handler):
+        request[STORAGE_KEY] = storage
+        raise_response = False
+        try:
+            response = yield from handler(request)
+        except web.HTTPException as exc:
+            response = exc
+            raise_response = True
+        if not isinstance(response, web.StreamResponse):
+            raise RuntimeError("Expect response, not {!r}", type(response))
+        if not isinstance(response, web.Response):
+            # likely got websoket or streaming
             return response
-
-        return middleware
+        if response.prepared:
+            raise RuntimeError(
+                "Cannot save session data into prepared response")
+        session = request.get(SESSION_KEY)
+        if session is not None:
+            if session._changed:
+                yield from storage.save_session(request, response, session)
+        if raise_response:
+            raise response
+        return response
 
     return factory
 

setup.py

@@ -15,7 +15,7 @@
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
-install_requires = ['aiohttp>=1.0.2']
+install_requires = ['aiohttp>=2.3.0']
 extras_require = {
     'aioredis': ['aioredis>=0.1.4'],
     'pycrypto': ['cryptography'],
@@ -35,6 +35,7 @@ def read(f):
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: AsyncIO',
       ],

tests/test_response_types.py

@@ -0,0 +1,60 @@
+import asyncio
+import pytest
+
+from aiohttp import web
+from aiohttp.test_utils import make_mocked_request
+from aiohttp_session import (session_middleware,
+                             get_session, SimpleCookieStorage, SESSION_KEY)
+
+
+def create_app(loop, *handlers):
+    middleware = session_middleware(SimpleCookieStorage())
+    app = web.Application(middlewares=[middleware], loop=loop)
+    for url, handler in handlers:
+        app.router.add_route('GET', url, handler)
+    return app
+
+
+@asyncio.coroutine
+def test_stream_response(test_client):
+
+    @asyncio.coroutine
+    def stream_response(request):
+        session = yield from get_session(request)
+        session['will_not'] = 'show up'
+        return web.StreamResponse()
+
+    client = yield from test_client(create_app,
+                                    ('/stream', stream_response))
+
+    resp = yield from client.get('/stream')
+    assert resp.status == 200
+    assert SESSION_KEY.upper() not in resp.cookies
+
+
+@asyncio.coroutine
+def test_bad_response_type(test_client):
+
+    @asyncio.coroutine
+    def bad_response(request):
+        return ''
+
+    middleware = session_middleware(SimpleCookieStorage())
+    req = make_mocked_request('GET', '/')
+    with pytest.raises(RuntimeError):
+        yield from middleware(req, bad_response)
+
+
+@asyncio.coroutine
+def test_prepared_response_type(test_client):
+
+    @asyncio.coroutine
+    def prepared_response(request):
+        resp = web.Response()
+        yield from resp.prepare(request)
+        return resp
+
+    middleware = session_middleware(SimpleCookieStorage())
+    req = make_mocked_request('GET', '/')
+    with pytest.raises(RuntimeError):
+        yield from middleware(req, prepared_response)