Added first version of normalize_path_middleware

aiohttp/middlewares.py

@@ -0,0 +1,33 @@
+import asyncio
+
+# from aiohttp.web_exceptions import HTTPMovedPermanently, HTTPNotFound
+from aiohttp.web_urldispatcher import SystemRoute
+
+
+@asyncio.coroutine
+def normalize_path_middleware(app, handler):
+    """
+    Middleware that normalizes the path of a request. By normalizing it means:
+
+        - Add a trailing slash to the path.
+        - Double slashes are replaced by one.
+    """
+
+    @asyncio.coroutine
+    def middleware(request):
+
+        router = request.app.router
+        if not isinstance(request.match_info.route, SystemRoute):
+            resp = yield from handler(request)
+
+        elif not request.path.endswith('/'):
+            request = request.clone(path=request.path + '/')
+            match_info = yield from router.resolve(request)
+            resp = yield from match_info.handler(request)
+
+        else:
+            resp = yield from handler(request)
+
+        return resp
+
+    return middleware

aiohttp/web_reqrep.py

@@ -19,7 +19,7 @@
 from . import hdrs
 from .helpers import reify, sentinel
 from .protocol import Response as ResponseImpl
-from .protocol import HttpVersion10, HttpVersion11
+from .protocol import HttpVersion10, HttpVersion11, RawRequestMessage
 from .streams import EOF_MARKER
 
 __all__ = (
@@ -381,6 +381,33 @@ def post(self):
         self._post = MultiDictProxy(out)
         return self._post
 
+    def clone(self, *, method=None, path=None, headers=None, raw_headers=None):
+        """
+        Creates and returns a new instance of Request object. If no parameters
+        are given, an exact copy is returned. If a parameter is not passed, it
+        will reuse the one from the current request object.
+
+        :param method: str http method
+        :param path: str url path to use
+        :param headers: CIMultidictProxy or compatible containing the headers.
+        :param raw_headers: tuple of two element tuples containing the headers
+            as bytearrays.
+        """
+
+        message = RawRequestMessage(
+            method or self.method, path or self.path, self.version,
+            headers or self.headers, raw_headers or self.raw_headers,
+            self.keep_alive, None)
+
+        return Request(
+            self._app,
+            message,
+            self._payload,
+            self._transport,
+            self._reader,
+            self._writer,
+            secure_proxy_ssl_header=self._secure_proxy_ssl_header)
+
     def copy(self):
         raise NotImplementedError
 

setup.cfg

@@ -1,8 +1,12 @@
+[pep8]
+max-line-length=80
+
 [easy_install]
 zip_ok = false
 
 [flake8]
 ignore = N801,N802,N803,E226
+max-line-length=80
 
 [tool:pytest]
 timeout = 5

tests/test_middlewares.py

@@ -0,0 +1,27 @@
+import asyncio
+
+from aiohttp import middlewares, web
+
+
+class TestNormalizePathMiddleware:
+
+    @asyncio.coroutine
+    def test_add_trailing_when_necessary(self, create_app_and_client):
+        app, client = yield from create_app_and_client()
+        app.middlewares.append(middlewares.normalize_path_middleware)
+        app.router.add_route(
+            'GET', '/resource1', lambda x: web.Response(text="OK"))
+        app.router.add_route(
+            'GET', '/resource2/', lambda x: web.Response(text="OK"))
+
+        resp = yield from client.get('/resource1')
+        assert resp.status == 200
+
+        resp = yield from client.get('/resource1/')
+        assert resp.status == 404
+
+        resp = yield from client.get('/resource2')
+        assert resp.status == 200
+
+        resp = yield from client.get('/resource2/')
+        assert resp.status == 200