Merge pull request #414 from taoufik07/v2.0.5

v2.0.5

CHANGELOG.md

@@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [v2.0.5] - 2019-12-15
+### Added
+- Update requirements to support python 3.8
+
+## [v2.0.4] - 2019-11-19
+### Fixed
+- Fix static app resolving
+
+## [v2.0.3] - 2019-09-20
+### Fixed
+- Fix template conflicts
 
 ## [v2.0.2] - 2019-09-20
 ### Fixed
@@ -220,7 +231,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Conception!
 
-[Unreleased]: https://github.com/taoufik07/responder/compare/v2.0.2..HEAD
+[Unreleased]: https://github.com/taoufik07/responder/compare/v2.0.5..HEAD
+[v2.0.5]: https://github.com/taoufik07/responder/compare/v2.0.4..v2.0.5
+[v2.0.4]: https://github.com/taoufik07/responder/compare/v2.0.3..v2.0.4
+[v2.0.3]: https://github.com/taoufik07/responder/compare/v2.0.2..v2.0.3
 [v2.0.2]: https://github.com/taoufik07/responder/compare/v2.0.1..v2.0.2
 [v2.0.1]: https://github.com/taoufik07/responder/compare/v2.0.0..v2.0.1
 [v2.0.0]: https://github.com/taoufik07/responder/compare/v1.3.2..v2.0.0

docs/source/quickstart.rst

@@ -85,9 +85,10 @@ Usage::
   def hello(req, resp, name):
       resp.html = templates.render("hello.html", name=name)
 
-      
+
 Also a ``render_async`` is available::
 
+    templates = Templates(enable_async=True)
     resp.html = await templates.render_async("hello.html", who=who)
 
 You can also use the existing ``api.template(filename, *args, **kwargs)`` to render templates::

responder/__version__.py

@@ -1 +1 @@
-__version__ = "2.0.2"
+__version__ = "2.0.5"

responder/api.py

@@ -117,9 +117,9 @@ class API:
         if openapi or docs_route:
             self.openapi = OpenAPISchema(
                 app=self,
-                title="Web Service",
-                version="1.0",
-                openapi="3.0.2",
+                title=title,
+                version=version,
+                openapi=openapi,
                 docs_route=docs_route,
                 description=description,
                 terms_of_service=terms_of_service,
@@ -218,7 +218,7 @@ class API:
         index = (self.static_dir / "index.html").resolve()
         if os.path.exists(index):
             with open(index, "r") as f:
-                resp.html = "Hello world !"
+                resp.html = f.read()
         else:
             resp.status_code = status_codes.HTTP_404
             resp.text = "Not found."

responder/models.py

@@ -283,9 +283,7 @@ class Response:
         self.content = None  #: A bytes representation of the response body.
         self.mimetype = None
         self.encoding = DEFAULT_ENCODING
-        self.media = (
-            None
-        )  #: A Python object that will be content-negotiated and sent back to the client. Typically, in JSON formatting.
+        self.media = None  #: A Python object that will be content-negotiated and sent back to the client. Typically, in JSON formatting.
         self._stream = None
         self.headers = (
             {}

responder/routes.py

@@ -302,6 +302,15 @@ class Router:
         path = scope["path"]
         root_path = scope.get("root_path", "")
 
+        # Check "primary" mounted routes first (before submounted apps)
+        route = self._resolve_route(scope)
+
+        scope["before_requests"] = self.before_requests
+
+        if route is not None:
+            await route(scope, receive, send)
+            return
+
         # Call into a submounted app, if one exists.
         for path_prefix, app in self.apps.items():
             if path.startswith(path_prefix):
@@ -315,12 +324,4 @@ class Router:
                     await app(scope, receive, send)
                     return
 
-        route = self._resolve_route(scope)
-
-        scope["before_requests"] = self.before_requests
-
-        if route is not None:
-            await route(scope, receive, send)
-            return
-
         await self.default_response(scope, receive, send)

responder/templates.py

@@ -4,10 +4,14 @@ import jinja2
 
 
 class Templates:
-    def __init__(self, directory="templates", autoescape=True, context=None):
+    def __init__(
+        self, directory="templates", autoescape=True, context=None, enable_async=False
+    ):
         self.directory = directory
         self._env = jinja2.Environment(
-            loader=jinja2.FileSystemLoader([str(self.directory)]), autoescape=autoescape
+            loader=jinja2.FileSystemLoader([str(self.directory)]),
+            autoescape=autoescape,
+            enable_async=enable_async,
         )
         self.default_context = {} if context is None else {**context}
         self._env.globals.update(self.default_context)

setup.py

@@ -23,14 +23,13 @@ if sys.argv[-1] == "publish":
 
 required = [
     "starlette==0.12.*",
-    "uvicorn>=0.7, <0.9",
+    "uvicorn==0.10.*",
     "aiofiles",
     "pyyaml",
     "requests",
     "graphene<3.0",
     "graphql-server-core>=1.1",
     "jinja2",
-    "uvloop; sys_platform != 'win32' and sys_platform != 'cygwin' and sys_platform != 'cli'",
     "rfc3986",
     "python-multipart",
     "chardet",
@@ -40,6 +39,7 @@ required = [
     "docopt",
     "requests-toolbelt",
     "apistar",
+    "itsdangerous",
 ]
 
 

tests/conftest.py

@@ -56,3 +56,12 @@ def schema():
             return f"Hello {name}"
 
     return graphene.Schema(query=Query)
+
+
+@pytest.fixture
+def template_path(tmpdir):
+    # create a Jinja template file on the filesystem
+    template_name = "test.html"
+    template_file = tmpdir.mkdir("static").join(template_name)
+    template_file.write("{{ var }}")
+    return template_file

tests/test_responder.py

@@ -8,6 +8,7 @@ import requests
 import string
 import io
 from responder.routes import Router, Route, WebSocketRoute
+from responder.templates import Templates
 
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.responses import PlainTextResponse
@@ -590,22 +591,39 @@ def test_template_string_rendering(api):
     assert r.text == "hello"
 
 
-def test_template_rendering(tmpdir):
-    # create a Jinja template file on the filesystem
-    template_name = "test.html"
-    template_file = tmpdir.mkdir("static").join(template_name)
-    template_file.write("{{ var }}")
-
-    api = responder.API(templates_dir=template_file.dirpath())
+def test_template_rendering(template_path):
+    api = responder.API(templates_dir=template_path.dirpath())
 
     @api.route("/")
     def view(req, resp):
-        resp.content = api.template(template_name, var="hello")
+        resp.content = api.template(template_path.basename, var="hello")
 
     r = api.requests.get(api.url_for(view))
     assert r.text == "hello"
 
 
+def test_template(api, template_path):
+    templates = Templates(directory=template_path.dirpath())
+
+    @api.route("/{var}/")
+    def view(req, resp, var):
+        resp.html = templates.render(template_path.basename, var=var)
+
+    r = api.requests.get("/test/")
+    assert r.text == "test"
+
+
+def test_template_async(api, template_path):
+    templates = Templates(directory=template_path.dirpath(), enable_async=True)
+
+    @api.route("/{var}/async")
+    async def view_async(req, resp, var):
+        resp.html = await templates.render_async(template_path.basename, var=var)
+
+    r = api.requests.get("/test/async")
+    assert r.text == "test"
+
+
 def test_file_uploads(api):
     @api.route("/")
     async def upload(req, resp):