yhttp 8.2.0__tar.gz → 8.3.0__tar.gz

{yhttp-8.2.0 → yhttp-8.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 8.2.0
+Version: 8.3.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani

yhttp-8.3.0/tests/test_middleware.py

@@ -0,0 +1,48 @@
+from bddrest import status, response
+
+from yhttp.core import statuses
+
+
+def test_middleware_returnnone(app, httpreq):
+    def middleware(request):
+        request.query['baz'] = 'qux'
+
+    app.middlewares.append(middleware)
+
+    @app.route()
+    def get(req):
+        return '&'.join([f'{k}={v}' for k, v in req.query.items()])
+
+    with httpreq('?foo=bar'):
+        assert status == 200
+        assert response.text == 'foo=bar&baz=qux'
+
+
+def test_middleware_returnbody(app, httpreq):
+    def middleware(request):
+        return 'something else'
+
+    app.middlewares.append(middleware)
+
+    @app.route()
+    def get(req):
+        return 'foobar'
+
+    with httpreq('?foo=bar'):
+        assert status == 200
+        assert response.text == 'something else'
+
+
+def test_middleware_raise(app, httpreq):
+    def middleware(request):
+        raise statuses.found('/foo')
+
+    app.middlewares.append(middleware)
+
+    @app.route()
+    def get(req):
+        return 'foobar'
+
+    with httpreq('?foo=bar'):
+        assert status == 302
+        assert response.headers['location'] == '/foo'

{yhttp-8.2.0 → yhttp-8.3.0}/tests/test_request.py

@@ -4,7 +4,7 @@ from bddrest import status
 def test_request(app, httpreq):
     @app.route('/foo')
     def get(req):
-        assert req.fullpath == 'http://bddrest-interceptor/foo?bar=baz'
+        assert req.fullpath == '/foo?bar=baz'
         assert req.scheme == 'http'
         assert req.headers.get('foo-bar') == 'baz'
         assert req.contenttype is None

{yhttp-8.2.0 → yhttp-8.3.0}/yhttp/core/application.py

@@ -62,6 +62,7 @@ class BaseApplication:
         self.events = {}
         self.cliarguments = []
         self.settings = pymlconf.Root(self._builtinsettings)
+        self.middlewares = []
 
     def when(self, func):
         """Return decorator to registers the ``func`` into :attr:`events` by
@@ -245,8 +246,7 @@ class Application(BaseApplication):
             pathparams = [a for a in match.groups() if a is not None]
             info = info_.copy()
             info['kwonly'] = {
-                k: request.query[k] for k in info_['kwonly']
-                if k in request.query
+                k: request.query.get(k, v) for k, v in info_['kwonly'].items()
             }
 
             return handler, pathparams, info
@@ -297,17 +297,25 @@ class Application(BaseApplication):
 
         """
         response = self.response_factory(self, environ, startresponse)
+        request = self.request_factory(self, environ, response)
 
         try:
-            request = self.request_factory(self, environ, response)
-            handler, pathparams, info = self._findhandler(request)
-            body = handler(request, *pathparams, **info['kwonly'])
 
-            if isinstance(body, statuses.HTTPStatus):
-                raise body
+            # execute middlewares if any
+            for middleware in self.middlewares:
+                body = middleware(request)
+                if body:
+                    break
 
-            if isinstance(body, types.GeneratorType):
-                response.stream_firstchunk = next(body)
+            else:
+                handler, pathparams, info = self._findhandler(request)
+                body = handler(request, *pathparams, **info['kwonly'])
+
+                if isinstance(body, statuses.HTTPStatus):
+                    raise body
+
+                if isinstance(body, types.GeneratorType):
+                    response.stream_firstchunk = next(body)
 
             response.body = body
 

{yhttp-8.2.0 → yhttp-8.3.0}/yhttp/core/request.py

@@ -1,4 +1,5 @@
 import wsgiref.util as wsgiutil
+from urllib.parse import urlencode
 from http import cookies
 from functools import partial, cached_property
 from urllib.parse import parse_qs, unquote, quote
@@ -72,6 +73,20 @@ class Request:
         """HTTP method."""
         return self.environ['REQUEST_METHOD'].lower()
 
+    @cached_property
+    def contentlength(self):
+        """HTTP Request ``Content-Length`` header value."""
+        v = self.environ.get('CONTENT_LENGTH')
+        return None if not v or not v.strip() else int(v)
+
+    @cached_property
+    def contenttype(self):
+        """HTTP Request ``Content-Type`` header value without encoding."""
+        contenttype = self.environ.get('CONTENT_TYPE')
+        if contenttype:
+            return contenttype.split(';')[0]
+        return None
+
     @cached_property
     def path(self):
         """Request URL without query string and ``scheme://domain.ext``."""
@@ -83,24 +98,15 @@ class Request:
 
         return p
 
-    @cached_property
+    @property
     def fullpath(self):
         """Request full URI including query string."""
-        return wsgiutil.request_uri(self.environ, include_query=True)
+        result = self.path
+        query = urlencode(self.query, doseq=True)
+        if query:
+            result += f'?{query}'
 
-    @cached_property
-    def contentlength(self):
-        """HTTP Request ``Content-Length`` header value."""
-        v = self.environ.get('CONTENT_LENGTH')
-        return None if not v or not v.strip() else int(v)
-
-    @cached_property
-    def contenttype(self):
-        """HTTP Request ``Content-Type`` header value without encoding."""
-        contenttype = self.environ.get('CONTENT_TYPE')
-        if contenttype:
-            return contenttype.split(';')[0]
-        return None
+        return result
 
     @cached_property
     def query(self):

yhttp-8.3.0/yhttp/core/version.py

@@ -0,0 +1 @@
+__version__ = '8.3.0'

{yhttp-8.2.0 → yhttp-8.3.0}/yhttp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 8.2.0
+Version: 8.3.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani

{yhttp-8.2.0 → yhttp-8.3.0}/yhttp.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ tests/test_guard_query.py
 tests/test_headerset.py
 tests/test_jsonencoding.py
 tests/test_locale.py
+tests/test_middleware.py
 tests/test_multidict.py
 tests/test_multipart.py
 tests/test_querystring.py

yhttp-8.2.0/yhttp/core/version.py

@@ -1 +0,0 @@
-__version__ = '8.2.0'