yhttp 8.3.0__tar.gz → 8.4.2__tar.gz

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

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

{yhttp-8.3.0 → yhttp-8.4.2}/tests/test_locale.py

@@ -7,15 +7,15 @@ def test_locales(app, httpreq):
     @app.route()
     @json
     def get(req):
-        return req.locales
+        return [req.locales, req.language]
 
     with httpreq(headers={'Accept-Languages': 'en-US,*;q=0.5,fa;q=0.7'}):
         assert status == 200
-        assert response.json == ['en-US', 'fa', '*']
+        assert response.json == [['en-US', 'fa', '*'], 'en']
 
         when(headers={})
         assert status == 200
-        assert response.json == ['*']
+        assert response.json == [['*'], None]
 
         when(headers={'Accept-Languages': ';;'})
         assert status == 400

{yhttp-8.3.0 → yhttp-8.4.2}/tests/test_middleware.py

@@ -7,7 +7,7 @@ def test_middleware_returnnone(app, httpreq):
     def middleware(request):
         request.query['baz'] = 'qux'
 
-    app.middlewares.append(middleware)
+    app.request_middlewares.append(middleware)
 
     @app.route()
     def get(req):
@@ -22,7 +22,7 @@ def test_middleware_returnbody(app, httpreq):
     def middleware(request):
         return 'something else'
 
-    app.middlewares.append(middleware)
+    app.request_middlewares.append(middleware)
 
     @app.route()
     def get(req):
@@ -37,7 +37,7 @@ def test_middleware_raise(app, httpreq):
     def middleware(request):
         raise statuses.found('/foo')
 
-    app.middlewares.append(middleware)
+    app.request_middlewares.append(middleware)
 
     @app.route()
     def get(req):

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

@@ -8,6 +8,10 @@ def test_request(app, httpreq):
         assert req.scheme == 'http'
         assert req.headers.get('foo-bar') == 'baz'
         assert req.contenttype is None
+        assert req.language == 'fa'
 
-    with httpreq('/foo?bar=baz', headers={'Foo-Bar': 'baz'}):
+    with httpreq('/foo?bar=baz', headers={
+        'Foo-Bar': 'baz',
+        'Accept-Languages': 'fa-IR'
+    }):
         assert status == 200

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

@@ -1,4 +1,5 @@
 import inspect
+import traceback
 import functools
 import re
 import types
@@ -62,7 +63,7 @@ class BaseApplication:
         self.events = {}
         self.cliarguments = []
         self.settings = pymlconf.Root(self._builtinsettings)
-        self.middlewares = []
+        self.request_middlewares = []
 
     def when(self, func):
         """Return decorator to registers the ``func`` into :attr:`events` by
@@ -302,7 +303,7 @@ class Application(BaseApplication):
         try:
 
             # execute middlewares if any
-            for middleware in self.middlewares:
+            for middleware in self.request_middlewares:
                 body = middleware(request)
                 if body:
                     break
@@ -322,6 +323,7 @@ class Application(BaseApplication):
         except statuses.HTTPStatus as exc:
             self.handlestatus(request, exc)
         except Exception as exc:
+            traceback.print_exc()
             self.handlestatus(request, statuses.internalservererror(
                 error=exc if self.settings.debug else None
             ))

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

@@ -68,6 +68,13 @@ class Request:
 
         return [i[0] for i in sorted(langs, key=lambda x: x[1], reverse=True)]
 
+    @property
+    def language(self):
+        if self.locales == ['*']:
+            return None
+
+        return self.locales[0].split('-', 1)[0]
+
     @cached_property
     def verb(self):
         """HTTP method."""

yhttp-8.4.2/yhttp/core/version.py

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

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

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

yhttp-8.3.0/yhttp/core/version.py

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