Merge pull request #414 from taoufik07/v2.0.5

v2.0.5
2026-06-05 23:00:17 +00:00 · 2019-12-15 16:38:02 +01:00 · 2019-12-15 16:32:47 +01:00 · 2019-12-15 16:28:17 +01:00 · 2019-12-15 16:22:26 +01:00 · 2019-12-04 20:07:46 +01:00
33 changed files with 2395 additions and 1143 deletions
@@ -1,12 +1,18 @@
+# travis use trusty by default
+dist: xenial
+
 language: python
 python:
-  - "3.6"
+  - 3.6
+  - 3.7
+  - "3.8-dev"

 # command to install dependencies
 install:
-  - "pip install pipenv --upgrade-strategy=only-if-needed"
-  - "pipenv install --dev"
+  - pip install pipenv --upgrade-strategy=only-if-needed
+  - pipenv install --dev

 # command to run the dependencies
 script:
-  - "pytest"
+  - black responder tests setup.py --check
+  - pytest
@@ -1,102 +1,279 @@
-# v1.1.1
+# Changelog
+All notable changes to this project will be documented in this file.
+
+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
+- Fix template conflicts
+
+## [v2.0.1] - 2019-09-20
+### Fixed
+- Fix template import
+
+## [v2.0.0] - 2019-09-19
+### Changed
+- Refactor Router and Schema
+
+## [v1.3.2] - 2019-08-15
+### Added
+- ASGI 3 support
+- CI tests for python 3.8-dev
+- Now requests have `state` a mapping object
+
+### Deprecated
+- ASGI 2
+
+## [v1.3.1] - 2019-04-28
+### Added
+- Route params Converters
+- Add search for documentation pages
+
+### Changed
+- Bump dependencies
+
+## [v1.3.0] - 2019-02-22
+### Fixed
+- Versioning issue
+- Multiple cookies.
+- Whitenoise returns not found.
+- Other bugfixes.
+
+### Added
+- Stream support via `resp.stream`.
+- Cookie directives via `resp.set_cookie`.
+- Add `resp.html` to send HTML.
+- Other improvements.
+
+## [v1.1.3] - 2019-01-12
+### Changed
+- Refactor `_route_for`
+
+### Fixed
+- Resolve startup/shutdwown events
+
+## [v1.2.0] - 2018-12-29
+### Added
+- Documentations
+
+### Changed
+- Use Starlette's LifeSpan middleware
+- Update denpendencies
+
+### Fixed
+- Fix route.is_class_based
+- Fix test_500
+- Typos
+
+## [v1.1.2] - 2018-11-11
+### Fixed
+- Minor fixes for Open API
+- Typos
+
+## [v1.1.1] - 2018-10-29
+### Changed
 - Run sync views in a threadpoolexecutor.

-# v1.1.0
+## [v1.1.0] - 2018-10-27
+### Added
 - Support for `before_request`.

-# v1.0.4
+## [v1.0.5]- 2018-10-27
+### Fixed
+- Fix sessions.
+
+## [v1.0.4] - 2018-10-27
+### Fixed
 - Potential bufix for cookies.

-# v1.0.3
+## [v1.0.3] - 2018-10-27
+### Fixed
 - Bugfix for redirects.

-# v1.0.2
+## [v1.0.2] - 2018-10-27
+### Changed
 - Improvement for static file hosting.

-# v1.0.1
+## [v1.0.1] - 2018-10-26
+### Changed
 - Improve cors configuration settings.

-# v1.0.0
+## [v1.0.0] - 2018-10-26
+### Changed
 - Move GraphQL support into a built-in plugin.

-# v0.3.3
- Improved exceptions.
- CORS support.
+## [v0.3.3] - 2018-10-25
+### Added
+- CORS support

-# v0.3.2
+### Changed
+- Improved exceptions.
+
+## [v0.3.2] - 2018-10-25
+### Changed
 - Subtle improvements.

-# v0.3.1
+## [v0.3.1] - 2018-10-24
+### Fixed
 - Packaging fix.

-# v0.3.0
+## [v0.3.0] - 2018-10-24
+### Changed
 - Interactive Documentation endpoint.
 - Minor improvements.

-# v0.2.3
+## [v0.2.3] - 2018-10-24
+### Changed
 - Overall improvements.

-# v0.2.2
+## [v0.2.2] - 2018-10-23
+### Added
 - Show traceback info when background tasks raise exceptions.

-# v0.2.1
+## [v0.2.1] - 2018-10-23
+### Added
 - api.requests.

-# v0.2.0
+## [v0.2.0] - 2018-10-22
+### Added
 - WebSocket support.

-# v0.1.6
+## [v0.1.6] - 2018-10-20
+### Added
 - 500 support.

-# v0.1.5
- Improvements to sequential media reading.
- File upload support.
+## [v0.1.5] - 2018-10-20
+### Added
+- File upload support

-# v0.1.4
+### Changed
+- Improvements to sequential media reading.
+
+## [v0.1.4] - 2018-10-19
+### Fixed
 - Stability.

-# v0.1.3
+## [v0.1.3] - 2018-10-18
+### Added
 - Sessions support.

-# v0.1.2
+## [v0.1.2] - 2018-10-18
+### Added
 - Cookies support.

-# v0.1.1
+## [v0.1.1] - 2018-10-17
+### Changed
 - Default routes.

-# v0.1.0
+## [v0.1.0] - 2018-10-17
+### Added
 - Prototype of static application support.

-# v0.0.10
+## [v0.0.10] - 2018-10-17
+### Fixed
 - Bugfix for async class-based views.

-# v0.0.9
+## [v0.0.9] - 2018-10-17
+### Fixed
 - Bugfix for async class-based views.

-# v0.0.8
+## [v0.0.8] - 2018-10-17
+### Added
 - GraphiQL Support.
+
+### Changed
 - Improvement to route selection.

-# v0.0.7
- - Immutable Request object.
+## [v0.0.7] - 2018-10-16
+### Changed
+- Immutable Request object.

-# v0.0.6:
- - Ability to mount WSGI apps.
- - Supply content-type when serving up the schema.
+## [v0.0.6] - 2018-10-16
+### Added
+- Ability to mount WSGI apps.
+- Supply content-type when serving up the schema.

-# v0.0.5:
- - OpenAPI Schema support.
- - Safe load/dump yaml.
+## [v0.0.5] - 2018-10-15
+### Added
+- OpenAPI Schema support.
+- Safe load/dump yaml.

-# v0.0.4:
- - Asynchronous support for data uploads.
- - Bug fixes.
+## [v0.0.4] - 2018-10-15
+### Added
+- Asynchronous support for data uploads.

-# v0.0.3:
+### Fixed
 - Bug fixes.

-# v0.0.2
+## [v0.0.3] - 2018-10-13
+### Fixed
+- Bug fixes.
+
+## [v0.0.2] - 2018-10-13
+### Changed
 - Switch to ASGI/Starlette.

-# v0.0.1
+## [v0.0.1] - 2018-10-12
+### Added
 - Conception!
+
+[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
+[v1.3.2]: https://github.com/taoufik07/responder/compare/v1.3.1..v1.3.2
+[v1.3.1]: https://github.com/taoufik07/responder/compare/v1.3.0..v1.3.1
+[v1.3.0]: https://github.com/taoufik07/responder/compare/v1.2.0..v1.3.0
+[v1.2.0]: https://github.com/taoufik07/responder/compare/v1.1.3..v1.2.0
+[v1.1.3]: https://github.com/taoufik07/responder/compare/v1.1.2..v1.1.3
+[v1.1.2]: https://github.com/taoufik07/responder/compare/v1.1.1..v1.1.2
+[v1.1.1]: https://github.com/taoufik07/responder/compare/v1.1.0..v1.1.1
+[v1.1.0]: https://github.com/taoufik07/responder/compare/v1.0.5..v1.1.0
+[v1.0.5]: https://github.com/taoufik07/responder/compare/v1.0.4..v1.0.5
+[v1.0.4]: https://github.com/taoufik07/responder/compare/v1.0.3..v1.0.4
+[v1.0.3]: https://github.com/taoufik07/responder/compare/v1.0.2..v1.0.3
+[v1.0.2]: https://github.com/taoufik07/responder/compare/v1.0.1..v1.0.2
+[v1.0.1]: https://github.com/taoufik07/responder/compare/v1.0.0..v1.0.1
+[v1.0.0]: https://github.com/taoufik07/responder/compare/v0.3.3..v1.0.0
+[v0.3.3]: https://github.com/taoufik07/responder/compare/v0.3.2..v0.3.3
+[v0.3.2]: https://github.com/taoufik07/responder/compare/v0.3.1..v0.3.2
+[v0.3.1]: https://github.com/taoufik07/responder/compare/v0.3.0..v0.3.1
+[v0.3.0]: https://github.com/taoufik07/responder/compare/v0.2.3..v0.3.0
+[v0.2.3]: https://github.com/taoufik07/responder/compare/v0.2.2..v0.2.3
+[v0.2.2]: https://github.com/taoufik07/responder/compare/v0.2.1..v0.2.2
+[v0.2.1]: https://github.com/taoufik07/responder/compare/v0.2.0..v0.2.1
+[v0.2.0]: https://github.com/taoufik07/responder/compare/v0.1.6..v0.2.0
+[v0.1.6]: https://github.com/taoufik07/responder/compare/v0.1.5..v0.1.6
+[v0.1.5]: https://github.com/taoufik07/responder/compare/v0.1.4..v0.1.5
+[v0.1.4]: https://github.com/taoufik07/responder/compare/v0.1.3..v0.1.4
+[v0.1.3]: https://github.com/taoufik07/responder/compare/v0.1.2..v0.1.3
+[v0.1.2]: https://github.com/taoufik07/responder/compare/v0.1.1..v0.1.2
+[v0.1.1]: https://github.com/taoufik07/responder/compare/v0.1.0..v0.1.1
+[v0.1.0]: https://github.com/taoufik07/responder/compare/v0.0.10..v0.1.0
+[v0.0.10]: https://github.com/taoufik07/responder/compare/v0.0.9..v0.0.10
+[v0.0.9]: https://github.com/taoufik07/responder/compare/v0.0.8..v0.0.9
+[v0.0.8]: https://github.com/taoufik07/responder/compare/v0.0.7..v0.0.8
+[v0.0.7]: https://github.com/taoufik07/responder/compare/v0.0.6..v0.0.7
+[v0.0.6]: https://github.com/taoufik07/responder/compare/v0.0.5..v0.0.6
+[v0.0.5]: https://github.com/taoufik07/responder/compare/v0.0.4..v0.0.5
+[v0.0.4]: https://github.com/taoufik07/responder/compare/v0.0.3..v0.0.4
+[v0.0.3]: https://github.com/taoufik07/responder/compare/v0.0.2..v0.0.3
+[v0.0.2]: https://github.com/taoufik07/responder/compare/v0.0.1..v0.0.2
+[v0.0.1]: https://github.com/taoufik07/responder/compare/v0.0.0..v0.0.1
@@ -0,0 +1 @@
+include LICENSE
@@ -16,8 +16,5 @@ sphinx = "*"
 marshmallow = "*"
 pytest-cov = "*"

-[requires]
-python_version = "3.7"
-
 [pipenv]
 allow_prereleases = true
@@ -1,16 +1,16 @@
 # Responder: a familiar HTTP Service Framework for Python

-[![Build Status](https://travis-ci.org/kennethreitz/responder.svg?branch=master)](https://travis-ci.org/kennethreitz/responder)
+[![Build Status](https://travis-ci.org/taoufik07/responder.svg?branch=master)](https://travis-ci.org/taoufik07/responder)
 [![Documentation Status](https://readthedocs.org/projects/mybinder/badge/?version=latest)](https://responder.readthedocs.io/en/latest/)
 [![image](https://img.shields.io/pypi/v/responder.svg)](https://pypi.org/project/responder/)
 [![image](https://img.shields.io/pypi/l/responder.svg)](https://pypi.org/project/responder/)
 [![image](https://img.shields.io/pypi/pyversions/responder.svg)](https://pypi.org/project/responder/)
-[![image](https://img.shields.io/github/contributors/kennethreitz/responder.svg)](https://github.com/kennethreitz/responder/graphs/contributors)
+[![image](https://img.shields.io/github/contributors/taoufik07/responder.svg)](https://github.com/taoufik07/responder/graphs/contributors)

-[![](https://farm2.staticflickr.com/1959/43750081370_a4e20752de_o_d.png)](http://python-responder.org/)
+[![](https://farm2.staticflickr.com/1959/43750081370_a4e20752de_o_d.png)](https://responder.readthedocs.io)


-Powered by [Starlette](https://www.starlette.io/). That `async` declaration is optional. [View documentation](http://python-responder.org).
+Powered by [Starlette](https://www.starlette.io/). That `async` declaration is optional. [View documentation](https://responder.readthedocs.io).

 This gets you a ASGI app, with a production static files server pre-installed, jinja2 templating (without additional imports), and a production webserver based on uvloop, serving up requests with gzip compression automatically.

@@ -26,21 +26,21 @@ This gets you a ASGI app, with a production static files server pre-installed, j

 ## More Examples

-See [the documentation's feature tour](http://python-responder.org/en/latest/tour.html) for more details on features available in Responder.
+See [the documentation's feature tour](https://responder.readthedocs.io/en/latest/tour.html) for more details on features available in Responder.


 # Installing Responder

-Install the latest release:
+Install the stable release:


-    $ pipenv install responder --pre
+    $ pipenv install responder
    ✨🍰✨


 Or, install from the development branch:

-    $ pipenv install -e git+https://github.com/kennethreitz/responder.git#egg=responder
+    $ pipenv install -e git+https://github.com/taoufik07/responder.git#egg=responder

 Only **Python 3.6+** is supported.

@@ -49,11 +49,13 @@ Only **Python 3.6+** is supported.

 The primary concept here is to bring the niceties that are brought forth from both Flask and Falcon and unify them into a single framework, along with some new ideas I have. I also wanted to take some of the API primitives that are instilled in the Requests library and put them into a web framework. So, you'll find a lot of parallels here with Requests.

- Setting `resp.text` sends back unicode, while setting `resp.content` sends back bytes.
- Setting `resp.media` sends back JSON/YAML (`.text`/`.content` override this).
+- Setting `resp.content` sends back bytes.
+- Setting `resp.text` sends back unicode, while setting `resp.html` sends back HTML.
+- Setting `resp.media` sends back JSON/YAML (`.text`/`.html`/`.content` override this).
 - Case-insensitive `req.headers` dict (from Requests directly).
 - `resp.status_code`, `req.method`, `req.url`, and other familiar friends.

+
 ## Ideas

 - Flask-style route expression, with new capabilities -- all while using Python 3.6+'s new f-string syntax.
@@ -66,8 +68,3 @@ The primary concept here is to bring the niceties that are brought forth from bo
 - Uvicorn built-in as a production web server. I would have chosen Gunicorn, but it doesn't run on Windows. Plus, Uvicorn serves well to protect against slowloris attacks, making nginx unnecessary in production.
 - GraphQL support, via Graphene. The goal here is to have any GraphQL query exposable at any route, magically.
 - Provide an official way to run webpack.
-
-
----------
-
-[![hacktoberfest](https://hacktoberfest.digitalocean.com/assets/hacktoberfest-2018-social-card-c8d2e1489f647f2e0a26e6f598adeb760872818905b34cd437afc7ac2857ceab.png)](https://hacktoberfest.digitalocean.com/)
@@ -45,4 +45,4 @@ tqdm==4.26.0
 twine==1.12.1
 urllib3==1.23
 webencodings==0.5.1
-werkzeug==0.14.1
+werkzeug==0.15.5
@@ -26,7 +26,7 @@
  .class em,
  .descname,
  .method em {
-    font-family: "Operator Mono SSm A", "Operator Mono SSm B" !important;
+    font-family: "Operator Mono SSm A", "Operator Mono SSm B", monospace !important;
    font-weight: 400 !important;
  }

@@ -8,6 +8,27 @@
  <iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&repo=responder&type=watch&count=true&size=large"
    allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+.algolia-autocomplete{
+  width: 100%;
+  height: 1.5em
+}
+.algolia-autocomplete a{
+  border-bottom: none !important;
+}
+#doc_search{
+  width: 100%;
+  height: 100%;
+}
+</style>
+<input id="doc_search" placeholder="Search the doc" autofocus/>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+  apiKey: 'ac965312db252e0496283c75c6f76f0b',
+  indexName: 'python-responder',
+  inputSelector: '#doc_search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+})" async></script>

 <p>
  <strong>Responder</strong> is a web service framework, written for human beings.
@@ -8,6 +8,27 @@
  <iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&repo=responder&type=watch&count=true&size=large"
    allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<style>
+.algolia-autocomplete{
+  width: 100%;
+  height: 1.5em
+}
+.algolia-autocomplete a{
+  border-bottom: none !important;
+}
+#doc_search{
+  width: 100%;
+  height: 100%;
+}
+</style>
+<input id="doc_search" placeholder="Search the doc" autofocus/>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" onload="docsearch({
+  apiKey: 'ac965312db252e0496283c75c6f76f0b',
+  indexName: 'python-responder',
+  inputSelector: '#doc_search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+})" async></script>

 <p>
  <strong>Responder</strong> is a web service framework, written for human beings.
@@ -31,7 +31,7 @@ The basics::

 Install Responder::

-    $ pipenv install responder --pre
+    $ pipenv install responder
    ...

 Write out an ``api.py``::
@@ -36,19 +36,21 @@ A familiar HTTP Service Framework

 Powered by `Starlette <https://www.starlette.io/>`_. That ``async`` declaration is optional.

-This gets you a ASGI app, with a production static files server (WhiteNoise)
+This gets you a ASGI app, with a production static files server
+(`WhiteNoise <http://whitenoise.evans.io/en/stable/>`_)
 pre-installed, jinja2 templating (without additional imports), and a
-production webserver based on uvloop, serving up requests with gzip
-compression automatically.
+production webserver based on uvloop, serving up requests with
+automatic gzip compression.

 Features
 --------

 - A pleasant API, with a single import statement.
 - Class-based views without inheritance.
- ASGI framework, the future of Python web services.
+- `ASGI <https://asgi.readthedocs.io>`_ framework, the future of Python web services.
+- WebSocket support!
 - The ability to mount any ASGI / WSGI app at a subroute.
- *f-string syntax* route declaration.
+- `f-string syntax <https://docs.python.org/3/whatsnew/3.6.html#pep-498-formatted-string-literals>`_ route declaration.
 - Mutable response object, passed into each view. No need to return anything.
 - Background tasks, spawned off in a ``ThreadPoolExecutor``.
 - GraphQL (with *GraphiQL*) support!
@@ -101,7 +103,7 @@ Installing Responder

 .. code-block:: shell

-    $ pipenv install responder --pre
+    $ pipenv install responder
    ✨🍰✨

 Only **Python 3.6+** is supported.
@@ -112,8 +114,9 @@ The Basic Idea

 The primary concept here is to bring the niceties that are brought forth from both Flask and Falcon and unify them into a single framework, along with some new ideas I have. I also wanted to take some of the API primitives that are instilled in the Requests library and put them into a web framework. So, you'll find a lot of parallels here with Requests.

- Setting ``resp.text`` sends back unicode, while setting ``resp.content`` sends back bytes.
- Setting ``resp.media`` sends back JSON/YAML (``.text``/``.content`` override this).
+- Setting ``resp.content`` sends back bytes.
+- Setting ``resp.text`` sends back unicode, while setting ``resp.html`` sends back HTML.
+- Setting ``resp.media`` sends back JSON/YAML (``.text``/``.html``/``.content`` override this).
 - Case-insensitive ``req.headers`` dict (from Requests directly).
 - ``resp.status_code``, ``req.method``, ``req.url``, and other familiar friends.

@@ -121,13 +124,13 @@ Ideas
 -----

 - Flask-style route expression, with new capabilities -- all while using Python 3.6+'s new f-string syntax.
- I love Falcon's "every request and response is passed into to each view and mutated" methodology, especially ``response.media``, and have used it here. In addition to supporting JSON, I have decided to support YAML as well, as Kubernetes is slowly taking over the world, and it uses YAML for all the things. Content-negotiation and all that.
+- I love Falcon's "every request and response is passed into each view and mutated" methodology, especially ``response.media``, and have used it here. In addition to supporting JSON, I have decided to support YAML as well, as Kubernetes is slowly taking over the world, and it uses YAML for all the things. Content-negotiation and all that.
 - **A built in testing client that uses the actual Requests you know and love**.
 - The ability to mount other WSGI apps easily.
 - Automatic gzipped-responses.
 - In addition to Falcon's ``on_get``, ``on_post``, etc methods, Responder features an ``on_request`` method, which gets called on every type of request, much like Requests.
 - A production static files server is built-in.
- Uvicorn built-in as a production web server. I would have chosen Gunicorn, but it doesn't run on Windows. Plus, Uvicorn serves well to protect against slowloris attacks, making nginx unneccessary in production.
+- `Uvicorn <https://www.uvicorn.org/>`_ is built-in as a production web server. I would have chosen Gunicorn, but it doesn't run on Windows. Plus, Uvicorn serves well to protect against `slowloris <https://en.wikipedia.org/wiki/Slowloris_(computer_security)>`_ attacks, making nginx unnecessary in production.
 - GraphQL support, via Graphene. The goal here is to have any GraphQL query exposable at any route, magically.


@@ -48,6 +48,14 @@ If you want dynamic URLs, you can use Python's familiar *f-string syntax* to dec

 A ``GET`` request to ``/hello/brettcannon`` will result in a response of ``hello, brettcannon!``.

+Type convertors are also available::
+
+    @api.route("/add/{a:int}/{b:int}")
+    async def add(req, resp, *, a, b):
+        resp.text = f"{a} + {b} = {a + b}"
+
+Supported types: ``str``, ``int`` and ``float``.
+
 Returning JSON / YAML
 ---------------------

@@ -65,13 +73,30 @@ If the client requests YAML instead (with a header of ``Accept: application/x-ya
 Rendering a Template
 --------------------

-If you want to render a template, simply use ``api.template``. No need for additional imports::
+Responder provides a built-in light `jinja2 <http://jinja.pocoo.org/docs/>`_ wrapper ``templates.Templates``
+
+Usage::
+
+  from responder.templates import Templates
+
+  templates = Templates()
+
+  @api.route("/hello/{name}/html")
+  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::

    @api.route("/hello/{who}/html")
    def hello_html(req, resp, *, who):
-        resp.content = api.template('hello.html', who=who)
+        resp.html = api.template('hello.html', who=who)

-The ``api`` instance is available as an object during template rendering.

 Setting Response Status Code
 ----------------------------
@@ -124,3 +149,29 @@ Here, we'll process our data in the background, while responding immediately to
        resp.media = {'success': True}

 A ``POST`` request to ``/incoming`` will result in an immediate response of ``{'success': true}``.
+
+
+Here's a sample code to post a file with background::
+
+    @api.route("/")
+    async def upload_file(req, resp):
+
+        @api.background.task
+        def process_data(data):
+            f = open('./{}'.format(data['file']['filename']), 'w')
+            f.write(data['file']['content'].decode('utf-8'))
+            f.close()
+
+        data = await req.media(format='files')
+        process_data(data)
+
+        resp.media = {'success': 'ok'}
+
+You can send a file easily with requests::
+
+	  import requests
+
+	  data = {'file': ('hello.txt', 'hello, world!', "text/plain")}
+	  r = requests.post('http://127.0.0.1:8210/file', files=data)
+
+	  print(r.text)
@@ -52,19 +52,44 @@ Serve a GraphQL API::

 Visiting the endpoint will render a *GraphiQL* instance, in the browser.

+You can make use of Responder's Request and Response objects in your GraphQL resolvers through ``info.context['request']`` and ``info.context['response']``.
+

 OpenAPI Schema Support
 ----------------------

-Responder comes with built-in support for OpenAPI / marshmallow::
+Responder comes with built-in support for OpenAPI / marshmallow
+
+New in Responder `1.4.0`::

    import responder
+    from responder.ext.schema import Schema as OpenAPISchema
    from marshmallow import Schema, fields

-    api = responder.API(title="Web Service", version="1.0", openapi="3.0.0")
+    contact = {
+        "name": "API Support",
+        "url": "http://www.example.com/support",
+        "email": "support@example.com",
+    }
+    license = {
+        "name": "Apache 2.0",
+        "url": "https://www.apache.org/licenses/LICENSE-2.0.html",
+    }
+    
+    api = responder.API()

+    schema = OpenAPISchema(
+        app=api,
+        title="Web Service",
+        version="1.0",
+        openapi="3.0.2",
+        description="A simple pet store",
+        terms_of_service="http://example.com/terms/",
+        contact=contact,
+        license=license,
+    )

-    @api.schema("Pet")
+    @schema.schema("Pet")
    class PetSchema(Schema):
        name = fields.Str()

@@ -78,46 +103,134 @@ Responder comes with built-in support for OpenAPI / marshmallow::
            responses:
                200:
                    description: A pet to be returned
-                    schema:
-                        $ref = "#/components/schemas/Pet"
+                    content:  
+                        application/json: 
+                            schema: 
+                                $ref: '#/components/schemas/Pet'                         
        """
-        resp.media = PetSchema().dump({"name": "little orange"}).data
+        resp.media = PetSchema().dump({"name": "little orange"})


+Old way *It's recommended to use the code above* ::
+
+    import responder
+    from marshmallow import Schema, fields
+
+    contact = {
+        "name": "API Support",
+        "url": "http://www.example.com/support",
+        "email": "support@example.com",
+    }
+    license = {
+        "name": "Apache 2.0",
+        "url": "https://www.apache.org/licenses/LICENSE-2.0.html",
+    }
+
+    api = responder.API(
+        title="Web Service",
+        version="1.0",
+        openapi="3.0.2",
+        description="A simple pet store",
+        terms_of_service="http://example.com/terms/",
+        contact=contact,
+        license=license,
+    )
+
+    @api.schema("Pet")
+    class PetSchema(Schema):
+        name = fields.Str()
+
+    @api.route("/")
+    def route(req, resp):
+        """A cute furry animal endpoint.
+        ---
+        get:
+            description: Get a random pet
+            responses:
+                200:
+                    description: A pet to be returned
+                    content:  
+                        application/json: 
+                            schema: 
+                                $ref: '#/components/schemas/Pet'                         
+        """
+        resp.media = PetSchema().dump({"name": "little orange"})
+
 ::

    >>> r = api.session().get("http://;/schema.yml")

    >>> print(r.text)
    components:
-    parameters: {}
-    schemas:
+      parameters: {}
+      responses: {}
+      schemas:
        Pet:
-        properties:
+          properties:
            name: {type: string}
-        type: object
-    info: {title: Web Service, version: 1.0}
-    openapi: '3.0'
+          type: object
+      securitySchemes: {}
+    info:
+      contact: {email: support@example.com, name: API Support, url: 'http://www.example.com/support'}
+      description: This is a sample server for a pet store.
+      license: {name: Apache 2.0, url: 'https://www.apache.org/licenses/LICENSE-2.0.html'}
+      termsOfService: http://example.com/terms/
+      title: Web Service
+      version: 1.0
+    openapi: 3.0.2
    paths:
      /:
        get:
          description: Get a random pet
          responses:
-            200: {description: A pet to be returned, schema: $ref = "#/components/schemas/Pet"}
+            200: {description: A pet to be returned, schema: $ref: "#/components/schemas/Pet"}
    tags: []


 Interactive Documentation
 -------------------------

-Responder can automatically supply API Documentation for you. Using the example above::
+Responder can automatically supply API Documentation for you. Using the example above

-    api = responder.API(title="Web Service", version="1.0", openapi="3.0.0", docs_route="/docs")
+The new and recommended way::
+
+    ...
+    from responder.ext.schema import Schema
+    ...
+    api = responder.API()
+
+    schema = Schema(
+        app=api,
+        title="Web Service",
+        version="1.0",
+        openapi="3.0.2",
+        ...
+        docs_route='/docs',
+        ...
+        description=description,
+        terms_of_service=terms_of_service,
+        contact=contact,
+        license=license,
+    )
+    
+
+The old way ::
+
+    api = responder.API(
+        title="Web Service",
+        version="1.0",
+        openapi="3.0.2",
+        docs_route='/docs',
+        description=description,
+        terms_of_service=terms_of_service,
+        contact=contact,
+        license=license,
+    )

 This will make ``/docs`` render interactive documentation for your API.

-Mount a WSGI App (e.g. Flask)
-----------------------------
+Mount a WSGI / ASGI Apps (e.g. Flask, Starlette,...)
+----------------------------------------------------

 Responder gives you the ability to mount another ASGI / WSGI app at a subroute::

@@ -155,6 +268,24 @@ Responder makes it very easy to interact with cookies from a Request, or add som
    {"hello": "world"}


+To set cookies directives, you should use `resp.set_cookie`::
+
+    >>> resp.set_cookie("hello", value="world", max_age=60)
+
+Supported directives:
+
+* ``key`` - **Required**
+* ``value`` - [OPTIONAL] - Defaults to ``""``. 
+* ``expires`` - Defaults to ``None``.
+* ``max_age`` - Defaults to ``None``.
+* ``domain`` - Defaults to ``None``.
+* ``path`` - Defaults to ``"/"``.
+* ``secure`` - Defaults to ``False``.
+* ``httponly`` - Defaults to ``True``.
+
+For more information see `directives <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#Directives>`_
+
+
 Using Cookie-Based Sessions
 ---------------------------

@@ -184,6 +315,41 @@ If you'd like a view to be executed before every request, simply do the followin

 Now all requests to your HTTP Service will include an ``X-Pizza`` header.

+For ``websockets``::
+
+    @api.route(before_request=True, websocket=True)
+    def prepare_response(ws):
+        await ws.accept()
+
+
+WebSocket Support
+-----------------
+
+Responder supports WebSockets::
+
+    @api.route('/ws', websocket=True)
+    async def websocket(ws):
+        await ws.accept()
+        while True:
+            name = await ws.receive_text()
+            await ws.send_text(f"Hello {name}!")
+        await ws.close()
+
+Accepting the connection::
+
+    await websocket.accept()
+
+Sending and receiving data::
+
+    await websocket.send_{format}(data) 
+    await websocket.receive_{format}(data)
+
+Supported formats: ``text``, ``json``, ``bytes``.
+
+Closing the connection::
+
+    await websocket.close()
+
 Using Requests Test Client
 --------------------------

@@ -250,7 +416,7 @@ A 400 response will be raised, if a request does not match any of the provided p

 ::

-    api = responder.API(allowed_hosts=[example.com, tenant.example.com])
+    api = responder.API(allowed_hosts=['example.com', 'tenant.example.com'])

 * ``allowed_hosts`` - A list of allowed hostnames. 

@@ -1 +1 @@
-__version__ = "1.1.2"
+__version__ = "2.0.5"
@@ -1,44 +1,33 @@
 import json
 import os

-from uuid import uuid4
 from pathlib import Path
-from base64 import b64encode

-import apistar
-import itsdangerous
 import jinja2
 import uvicorn
-import yaml
-from apispec import APISpec, yaml_utils
-from apispec.ext.marshmallow import MarshmallowPlugin
-from asgiref.wsgi import WsgiToAsgi
 from starlette.exceptions import ExceptionMiddleware
-from starlette.lifespan import LifespanHandler
+from starlette.middleware.wsgi import WSGIMiddleware
+from starlette.middleware.errors import ServerErrorMiddleware
 from starlette.middleware.cors import CORSMiddleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware
 from starlette.middleware.trustedhost import TrustedHostMiddleware
-from starlette.routing import Router
+from starlette.middleware.sessions import SessionMiddleware
+from starlette.routing import Lifespan
 from starlette.staticfiles import StaticFiles
 from starlette.testclient import TestClient
 from starlette.websockets import WebSocket
-from whitenoise import WhiteNoise

 from . import models, status_codes
 from .background import BackgroundQueue
 from .formats import get_formats
-from .routes import Route
-from .statics import (
-    DEFAULT_API_THEME,
-    DEFAULT_CORS_PARAMS,
-    DEFAULT_SECRET_KEY,
-    DEFAULT_SESSION_COOKIE,
-)
-from .templates import GRAPHIQL
+from .routes import Router
+from .statics import DEFAULT_API_THEME, DEFAULT_CORS_PARAMS, DEFAULT_SECRET_KEY
+from .ext.schema import Schema as OpenAPISchema
+from .staticfiles import StaticFiles
+from .templates import Templates


-# TODO: consider moving status codes here
 class API:
    """The primary web-service class.

@@ -56,6 +45,10 @@ class API:
        debug=False,
        title=None,
        version=None,
+        description=None,
+        terms_of_service=None,
+        contact=None,
+        license=None,
        openapi=None,
        openapi_route="/schema.yml",
        static_dir="static",
@@ -72,24 +65,21 @@ class API:
        self.background = BackgroundQueue()

        self.secret_key = secret_key
-        self.title = title
-        self.version = version
-        self.openapi_version = openapi
-        self.static_dir = Path(os.path.abspath(static_dir))
+
+        self.router = Router()
+
+        if static_dir is not None:
+            if static_route is None:
+                static_route = static_dir
+            static_dir = Path(os.path.abspath(static_dir))
+
+        self.static_dir = static_dir
        self.static_route = static_route
-        self.templates_dir = Path(os.path.abspath(templates_dir))
-        self.built_in_templates_dir = Path(
-            os.path.abspath(os.path.dirname(__file__) + "/templates")
-        )
-        self.routes = {}
-        self.docs_theme = DEFAULT_API_THEME
-        self.docs_route = docs_route
-        self.schemas = {}
-        self.session_cookie = DEFAULT_SESSION_COOKIE

        self.hsts_enabled = enable_hsts
        self.cors = cors
        self.cors_params = cors_params
+        self.debug = debug

        if not allowed_hosts:
            # if not debug:
@@ -99,35 +89,19 @@ class API:
            allowed_hosts = ["*"]
        self.allowed_hosts = allowed_hosts

-        # Make the static/templates directory if they don't exist.
-        for _dir in (self.static_dir, self.templates_dir):
-            os.makedirs(_dir, exist_ok=True)
+        if self.static_dir is not None:
+            os.makedirs(self.static_dir, exist_ok=True)

-        self.whitenoise = WhiteNoise(application=self._default_wsgi_app)
-        self.whitenoise.add_files(str(self.static_dir))
-
-        self.whitenoise.add_files(
-            (
-                Path(apistar.__file__).parent / "themes" / self.docs_theme / "static"
-            ).resolve()
-        )
-
-        self.apps = {}
-        self.mount(self.static_route, self.whitenoise)
+        if self.static_dir is not None:
+            self.mount(self.static_route, self.static_app)

        self.formats = get_formats()

        # Cached requests session.
        self._session = None

-        if self.openapi_version:
-            self.add_route(openapi_route, self.schema_response)
-
-        if self.docs_route:
-            self.add_route(self.docs_route, self.docs_response)
-
        self.default_endpoint = None
-        self.app = self.dispatch
+        self.app = ExceptionMiddleware(self.router, debug=debug)
        self.add_middleware(GZipMiddleware)

        if self.hsts_enabled:
@@ -135,121 +109,60 @@ class API:

        self.add_middleware(TrustedHostMiddleware, allowed_hosts=self.allowed_hosts)

-        self.lifespan_handler = LifespanHandler()
-
        if self.cors:
            self.add_middleware(CORSMiddleware, **self.cors_params)
-        self.add_middleware(ExceptionMiddleware, debug=debug)
+        self.add_middleware(ServerErrorMiddleware, debug=debug)
+        self.add_middleware(SessionMiddleware, secret_key=self.secret_key)

-        # Jinja enviroment
-        self.jinja_env = jinja2.Environment(
-            loader=jinja2.FileSystemLoader(
-                [str(self.templates_dir), str(self.built_in_templates_dir)],
-                followlinks=True,
-            ),
-            autoescape=jinja2.select_autoescape(["html", "xml"] if auto_escape else []),
-        )
-        self.jinja_values_base = {"api": self}  # Give reference to self.
+        if openapi or docs_route:
+            self.openapi = OpenAPISchema(
+                app=self,
+                title=title,
+                version=version,
+                openapi=openapi,
+                docs_route=docs_route,
+                description=description,
+                terms_of_service=terms_of_service,
+                contact=contact,
+                license=license,
+                openapi_route=openapi_route,
+                static_route=static_route,
+            )
+
+        # TODO: Update docs for templates
+        self.templates = Templates(directory=templates_dir)
        self.requests = (
            self.session()
        )  #: A Requests session that is connected to the ASGI app.

-    @staticmethod
-    def _default_wsgi_app(*args, **kwargs):
-        pass
-
    @property
-    def before_requests(self):
-        def gen():
-            for route in self.routes:
-                if self.routes[route].before_request:
-                    yield self.routes[route]
+    def static_app(self):
+        if not hasattr(self, "_static_app"):
+            assert self.static_dir is not None
+            self._static_app = StaticFiles(directory=self.static_dir)
+        return self._static_app

-        return [g for g in gen()]
+    def before_request(self, websocket=False):
+        def decorator(f):
+            self.router.before_request(f, websocket=websocket)
+            return f

-    @property
-    def _apispec(self):
-        spec = APISpec(
-            title=self.title,
-            version=self.version,
-            openapi_version=self.openapi_version,
-            plugins=[MarshmallowPlugin()],
-        )
-
-        for route in self.routes:
-            if self.routes[route].description:
-                operations = yaml_utils.load_operations_from_docstring(
-                    self.routes[route].description
-                )
-                spec.path(path=route, operations=operations)
-
-        for name, schema in self.schemas.items():
-            spec.components.schema(name, schema=schema)
-
-        return spec
-
-    @property
-    def openapi(self):
-        return self._apispec.to_yaml()
+        return decorator

    def add_middleware(self, middleware_cls, **middleware_config):
        self.app = middleware_cls(self.app, **middleware_config)

-    def __call__(self, scope):
-        if scope["type"] == "lifespan":
-            return self.lifespan_handler(scope)
-
-        path = scope["path"]
-        root_path = scope.get("root_path", "")
-
-        # Call into a submounted app, if one exists.
-        for path_prefix, app in self.apps.items():
-            if path.startswith(path_prefix):
-                scope["path"] = path[len(path_prefix) :]
-                scope["root_path"] = root_path + path_prefix
-                try:
-                    return app(scope)
-                except TypeError:
-                    app = WsgiToAsgi(app)
-                    return app(scope)
-
-        return self.app(scope)
-
-    def dispatch(self, scope):
-        # Call the main dispatcher.
-        async def asgi(receive, send):
-            nonlocal scope, self
-
-            req = models.Request(scope, receive=receive, api=self)
-            resp = await self._dispatch_request(
-                req, scope=scope, send=send, receive=receive
-            )
-            await resp(receive, send)
-
-        return asgi
-
-    def add_schema(self, name, schema, check_existing=True):
-        """Adds a mashmallow schema to the API specification."""
-        if check_existing:
-            assert name not in self.schemas
-
-        self.schemas[name] = schema
-
    def schema(self, name, **options):
        """Decorator for creating new routes around function and class definitions.
-
        Usage::
-
            from marshmallow import Schema, fields
-
            @api.schema("Pet")
            class PetSchema(Schema):
                name = fields.Str()
-
        """

        def decorator(f):
-            self.add_schema(name=name, schema=f, **options)
+            self.openapi.add_schema(name=name, schema=f, **options)
            return f

        return decorator
@@ -259,128 +172,18 @@ class API:

        :param path: The path portion of a URL, to test all known routes against.
        """
-        for (route, route_object) in self.routes.items():
-            if route_object.does_match(path):
+        for route in self.router.routes:
+            match, _ = route.matches(path)
+            if match:
                return route

-    def _prepare_cookies(self, resp):
-        if resp.cookies:
-            header = " ".join([f"{k}={v};" for k, v in resp.cookies.items()])
-            resp.headers["Set-Cookie"] = header
-
-    @property
-    def _signer(self):
-        return itsdangerous.Signer(self.secret_key)
-
-    def _prepare_session(self, resp):
-
-        if resp.session:
-            data = self._signer.sign(
-                b64encode(json.dumps(resp.session).encode("utf-8"))
-            )
-            resp.cookies[self.session_cookie] = data.decode("utf-8")
-
-    @staticmethod
-    def no_response(req, resp, **params):
-        pass
-
-    async def _dispatch_request(self, req, **options):
-        # Set formats on Request object.
-        req.formats = self.formats
-
-        # Get the route.
-        route = self.path_matches_route(req.url.path)
-        route = self.routes.get(route)
-        if route:
-            if route.uses_websocket:
-                resp = WebSocket(**options)
-            else:
-                resp = models.Response(req=req, formats=self.formats)
-
-            for before_request in self.before_requests:
-                await self._execute_route(route=before_request, req=req, resp=resp)
-
-            await self._execute_route(route=route, req=req, resp=resp, **options)
-        else:
-            resp = models.Response(req=req, formats=self.formats)
-            self.default_response(req, resp, notfound=True)
-        self.default_response(req, resp)
-
-        self._prepare_session(resp)
-        self._prepare_cookies(resp)
-
-        return resp
-
-    async def _execute_route(self, *, route, req, resp, **options):
-
-        params = route.incoming_matches(req.url.path)
-
-        if route.is_function:
-            try:
-                try:
-                    # Run the view.
-
-                    r = self.background(route.endpoint, req, resp, **params)
-                    # If it's async, await it.
-                    if hasattr(r, "cr_running"):
-                        await r
-                except TypeError as e:
-                    cont = True
-            except Exception:
-                self.background(self.default_response, req, resp, error=True)
-                raise
-
-        if route.is_class_based or cont:
-            try:
-                view = route.endpoint(**params)
-            except TypeError:
-                try:
-                    view = route.endpoint()
-                except TypeError:
-                    view = route.endpoint
-                    pass
-
-            # Run on_request first.
-            try:
-                # Run the view.
-                r = getattr(view, "on_request", self.no_response)
-                r = self.background(r, req, resp, **params)
-                # If it's async, await it.
-                if hasattr(r, "send"):
-                    await r
-            except Exception:
-                await self.background(self.default_response, req, resp, error=True)
-                raise
-
-            # Then run on_method.
-            method = req.method
-            try:
-                # Run the view.
-                r = getattr(view, f"on_{method}", self.no_response)
-                r = self.background(r, req, resp, **params)
-                # If it's async, await it.
-                if hasattr(r, "send"):
-                    await r
-            except Exception as e:
-                await self.background(self.default_response, req, resp, error=True)
-                raise
-
-    def add_event_handler(self, event_type, handler):
-        """Adds an event handler to the API.
-
-        :param event_type: A string in ("startup", "shutdown")
-        :param handler: The function to run. Can be either a function or a coroutine.
-        """
-
-        self.lifespan_handler.add_event_handler(event_type, handler)
-
    def add_route(
        self,
        route=None,
        endpoint=None,
        *,
        default=False,
-        static=False,
+        static=True,
        check_existing=True,
        websocket=False,
        before_request=False,
@@ -391,79 +194,49 @@ class API:
        :param endpoint: The endpoint for the route -- can be a callable, or a class.
        :param default: If ``True``, all unknown requests will route to this view.
        :param static: If ``True``, and no endpoint was passed, render "static/index.html", and it will become a default route.
-        :param check_existing: If ``True``, an AssertionError will be raised, if the route is already defined.
        """
-        if route is None:
-            route = f"/{uuid4().hex}"

-        if check_existing:
-            assert route not in self.routes
+        # Path
+        if static:
+            assert self.static_dir is not None
+            if not endpoint:
+                endpoint = self._static_response
+                default = True

-        if not endpoint and static:
-            endpoint = self.static_response
-            default = True
-
-        if default:
-            self.default_endpoint = endpoint
-
-        self.routes[route] = Route(
-            route, endpoint, websocket=websocket, before_request=before_request
-        )
-        # TODO: A better data structure or sort it once the app is loaded
-        self.routes = dict(
-            sorted(self.routes.items(), key=lambda item: item[1]._weight())
+        self.router.add_route(
+            route,
+            endpoint,
+            default=default,
+            websocket=websocket,
+            before_request=before_request,
+            check_existing=check_existing,
        )

-    def default_response(self, req, resp, notfound=False, error=False):
-        if resp.status_code is None:
-            resp.status_code = 200
+    async def _static_response(self, req, resp):
+        assert self.static_dir is not None

-        if self.default_endpoint and notfound:
-            self.default_endpoint(req, resp)
-        else:
-            if notfound:
-                resp.status_code = status_codes.HTTP_404
-                resp.text = "Not found."
-            if error:
-                resp.status_code = status_codes.HTTP_500
-                resp.text = "Application error."
-
-    def docs_response(self, req, resp):
-        resp.text = self.docs
-
-    def static_response(self, req, resp):
        index = (self.static_dir / "index.html").resolve()
-        resp.content = ""
        if os.path.exists(index):
            with open(index, "r") as f:
-                resp.text = f.read()
-
-    def schema_response(self, req, resp):
-        resp.status_code = status_codes.HTTP_200
-        resp.headers["Content-Type"] = "application/x-yaml"
-        resp.content = self.openapi
+                resp.html = f.read()
+        else:
+            resp.status_code = status_codes.HTTP_404
+            resp.text = "Not found."

    def redirect(
        self, resp, location, *, set_text=True, status_code=status_codes.HTTP_301
    ):
        """Redirects a given response to a given location.
-
        :param resp: The Response to mutate.
        :param location: The location of the redirect.
        :param set_text: If ``True``, sets the Redirect body content automatically.
        :param status_code: an `API.status_codes` attribute, or an integer, representing the HTTP status code of the redirect.
        """
-
-        # assert resp.status_code.is_300(status_code)
-
-        resp.status_code = status_code
-        if set_text:
-            resp.text = f"Redirecting to: {location}"
-        resp.headers.update({"Location": location})
+        resp.redirect(location, set_text=set_text, status_code=status_code)

    def on_event(self, event_type: str, **args):
        """Decorator for registering functions or coroutines to run at certain events
-        Supported events: startup, cleanup, shutdown, tick
+        Supported events: startup, shutdown

        Usage::

@@ -471,11 +244,7 @@ class API:
            async def open_database_connection_pool():
                ...

-            @api.on_event('tick', seconds=10)
-            async def do_stuff():
-                ...
-
-            @api.on_event('cleanup')
+            @api.on_event('shutdown')
            async def close_database_connection_pool():
                ...

@@ -487,6 +256,15 @@ class API:

        return decorator

+    def add_event_handler(self, event_type, handler):
+        """Adds an event handler to the API.
+
+        :param event_type: A string in ("startup", "shutdown")
+        :param handler: The function to run. Can be either a function or a coroutine.
+        """
+
+        self.router.lifespan_handler.add_event_handler(event_type, handler)
+
    def route(self, route=None, **options):
        """Decorator for creating new routes around function and class definitions.

@@ -510,7 +288,7 @@ class API:
        :param route: String representation of the route to be used (shouldn't be parameterized).
        :param app: The other WSGI / ASGI app.
        """
-        self.apps.update({route: app})
+        self.router.apps.update({route: app})

    def session(self, base_url="http://;"):
        """Testing HTTP client. Returns a Requests session object, able to send HTTP requests to the Responder application.
@@ -522,84 +300,32 @@ class API:
            self._session = TestClient(self, base_url=base_url)
        return self._session

-    def _route_for(self, endpoint):
-        for (route, route_object) in self.routes.items():
-            if route_object.endpoint == endpoint:
-                return route_object
-            elif route_object.endpoint_name == endpoint:
-                return route_object
-
    def url_for(self, endpoint, **params):
        # TODO: Absolute_url
        """Given an endpoint, returns a rendered URL for its route.

-        :param view: The route endpoint you're searching for.
+        :param endpoint: The route endpoint you're searching for.
        :param params: Data to pass into the URL generator (for parameterized URLs).
        """
-        route_object = self._route_for(endpoint)
-        if route_object:
-            return route_object.url(**params)
-        raise ValueError
+        return self.router.url_for(endpoint, **params)

-    def static_url(self, asset):
-        """Given a static asset, return its URL path."""
-        return f"{self.static_route}/{str(asset)}"
-
-    @property
-    def docs(self):
-
-        loader = jinja2.PrefixLoader(
-            {
-                self.docs_theme: jinja2.PackageLoader(
-                    "apistar", os.path.join("themes", self.docs_theme, "templates")
-                )
-            }
-        )
-        env = jinja2.Environment(autoescape=True, loader=loader)
-        document = apistar.document.Document()
-        document.content = yaml.safe_load(self.openapi)
-
-        template = env.get_template("/".join([self.docs_theme, "index.html"]))
-
-        def static_url(asset):
-            return f"{self.static_route}/{asset}"
-            # return asset
-
-        return template.render(
-            document=document,
-            langs=["javascript", "python"],
-            code_style=None,
-            static_url=static_url,
-            schema_url="/schema.yml",
-        )
-
-    def template(self, name_, **values):
+    def template(self, filename, *args, **kwargs):
        """Renders the given `jinja2 <http://jinja.pocoo.org/docs/>`_ template, with provided values supplied.
-
        Note: The current ``api`` instance is by default passed into the view. This is set in the dict ``api.jinja_values_base``.
-
-        :param name_: The filename of the jinja2 template, in ``templates_dir``.
-        :param values: Data to pass into the template.
+        :param filename: The filename of the jinja2 template, in ``templates_dir``.
+        :param *args: Data to pass into the template.
+        :param *kwargs: Date to pass into the template.
        """
-        # Prepopulate values with base
-        values = {**self.jinja_values_base, **values}
+        return self.templates.render(filename, *args, **kwargs)

-        template = self.jinja_env.get_template(name_)
-        return template.render(**values)
-
-    def template_string(self, s_, **values):
+    def template_string(self, source, *args, **kwargs):
        """Renders the given `jinja2 <http://jinja.pocoo.org/docs/>`_ template string, with provided values supplied.
-
        Note: The current ``api`` instance is by default passed into the view. This is set in the dict ``api.jinja_values_base``.
-
-        :param s_: The template to use.
-        :param values: Data to pass into the template.
+        :param source: The template to use.
+        :param *args: Data to pass into the template.
+        :param **kwargs: Data to pass into the template.
        """
-        # Prepopulate values with base
-        values = {**self.jinja_values_base, **values}
-
-        template = self.jinja_env.from_string(s_)
-        return template.render(**values)
+        return self.templates.render_string(source, *args, **kwargs)

    def serve(self, *, address=None, port=None, debug=False, **options):
        """Runs the application with uvicorn. If the ``PORT`` environment
@@ -628,4 +354,9 @@ class API:
        spawn()

    def run(self, **kwargs):
+        if "debug" not in kwargs:
+            kwargs.update({"debug": self.debug})
        self.serve(**kwargs)
+
+    async def __call__(self, scope, receive, send):
+        await self.app(scope, receive, send)
@@ -3,6 +3,7 @@ import functools
 import concurrent.futures
 import multiprocessing
 import traceback
+from starlette.concurrency import run_in_threadpool


 class BackgroundQueue:
@@ -40,6 +41,4 @@ class BackgroundQueue:
        if asyncio.iscoroutinefunction(func):
            return await asyncio.ensure_future(func(*args, **kwargs))
        else:
-            fn = functools.partial(func, *args, **kwargs)
-            loop = asyncio.get_event_loop()
-            return await loop.run_in_executor(None, fn)
+            return await run_in_threadpool(func, *args, **kwargs)
@@ -40,4 +40,4 @@ def cli():
            prop = "api"

        app = __import__(module)
-        getattr(app, prop).run()
+        getattr(app, prop).run()
@@ -3,7 +3,7 @@ from functools import partial

 from graphql_server import default_format_error, encode_execution_results, json_encode

-from ..templates import GRAPHIQL
+from .templates import GRAPHIQL


 class GraphQLView:
@@ -44,12 +44,15 @@ class GraphQLView:
        show_graphiql = req.method == "get" and req.accepts("text/html")

        if show_graphiql:
-            resp.content = self.api.template_string(GRAPHIQL, endpoint=req.url.path)
+            resp.content = self.api.templates.render_string(
+                GRAPHIQL, endpoint=req.url.path
+            )
            return

        query, variables, operation_name = await self._resolve_graphql_query(req)
+        context = {"request": req, "response": resp}
        result = schema.execute(
-            query, variables=variables, operation_name=operation_name
+            query, variables=variables, operation_name=operation_name, context=context
        )
        result, status_code = encode_execution_results(
            [result],
@@ -62,3 +65,6 @@ class GraphQLView:

    async def on_request(self, req, resp):
        await self.graphql_response(req, resp, self.schema)
+
+    async def __call__(self, req, resp):
+        await self.on_request(req, resp)
@@ -0,0 +1,160 @@
+import os
+from pathlib import Path
+
+import apistar
+import jinja2
+import yaml
+from apispec import APISpec, yaml_utils
+from apispec.ext.marshmallow import MarshmallowPlugin
+
+from responder.statics import DEFAULT_API_THEME
+from responder.staticfiles import StaticFiles
+from responder import status_codes
+
+
+class Schema:
+    def __init__(
+        self,
+        app,
+        title,
+        version,
+        plugins=None,
+        description=None,
+        terms_of_service=None,
+        contact=None,
+        license=None,
+        openapi=None,
+        openapi_route="/schema.yml",
+        docs_route="/docs/",
+        static_route="/static",
+    ):
+        self.app = app
+        self.schemas = {}
+        self.title = title
+        self.version = version
+        self.description = description
+        self.terms_of_service = terms_of_service
+        self.contact = contact
+        self.license = license
+
+        self.openapi_version = openapi
+        self.openapi_route = openapi_route
+
+        self.docs_theme = DEFAULT_API_THEME
+        self.docs_route = docs_route
+
+        self.plugins = [MarshmallowPlugin()] if plugins is None else plugins
+
+        if self.openapi_version is not None:
+            self.app.add_route(self.openapi_route, self.schema_response)
+
+        if self.docs_route is not None:
+            self.app.add_route(self.docs_route, self.docs_response)
+
+        theme_path = (
+            Path(apistar.__file__).parent / "themes" / self.docs_theme / "static"
+        ).resolve()
+
+        self.static_route = static_route
+
+        self.app.static_app.add_directory(theme_path)
+
+    @property
+    def _apispec(self):
+
+        info = {}
+        if self.description is not None:
+            info["description"] = self.description
+        if self.terms_of_service is not None:
+            info["termsOfService"] = self.terms_of_service
+        if self.contact is not None:
+            info["contact"] = self.contact
+        if self.license is not None:
+            info["license"] = self.license
+
+        spec = APISpec(
+            title=self.title,
+            version=self.version,
+            openapi_version=self.openapi_version,
+            plugins=self.plugins,
+            info=info,
+        )
+
+        for route in self.app.router.routes:
+            if route.description:
+                operations = yaml_utils.load_operations_from_docstring(
+                    route.description
+                )
+                spec.path(path=route.route, operations=operations)
+
+        for name, schema in self.schemas.items():
+            spec.components.schema(name, schema=schema)
+
+        return spec
+
+    @property
+    def openapi(self):
+        return self._apispec.to_yaml()
+
+    def add_schema(self, name, schema, check_existing=True):
+        """Adds a mashmallow schema to the API specification."""
+        if check_existing:
+            assert name not in self.schemas
+
+        self.schemas[name] = schema
+
+    def schema(self, name, **options):
+        """Decorator for creating new routes around function and class definitions.
+
+        Usage::
+
+            from marshmallow import Schema, fields
+
+            @api.schema("Pet")
+            class PetSchema(Schema):
+                name = fields.Str()
+
+        """
+
+        def decorator(f):
+            self.add_schema(name=name, schema=f, **options)
+            return f
+
+        return decorator
+
+    @property
+    def docs(self):
+
+        loader = jinja2.PrefixLoader(
+            {
+                self.docs_theme: jinja2.PackageLoader(
+                    "apistar", os.path.join("themes", self.docs_theme, "templates")
+                )
+            }
+        )
+        env = jinja2.Environment(autoescape=True, loader=loader)
+        document = apistar.document.Document()
+        document.content = yaml.safe_load(self.openapi)
+
+        template = env.get_template("/".join([self.docs_theme, "index.html"]))
+
+        return template.render(
+            document=document,
+            langs=["javascript", "python"],
+            code_style=None,
+            static_url=self.static_url,
+            schema_url="/schema.yml",
+        )
+
+    def static_url(self, asset):
+        """Given a static asset, return its URL path."""
+        assert self.static_route is not None
+        return f"{self.static_route}/{str(asset)}"
+
+    def docs_response(self, req, resp):
+        resp.html = self.docs
+
+    def schema_response(self, req, resp):
+        resp.status_code = status_codes.HTTP_200
+        resp.headers["Content-Type"] = "application/x-yaml"
+        resp.content = self.openapi
@@ -1,15 +1,31 @@
-from urllib.parse import parse_qs
+import json
+from urllib.parse import urlencode

 import yaml
-import json
-from parse import findall
-from .models import QueryDict
 from requests_toolbelt.multipart import decoder

+from .models import QueryDict
+

 async def format_form(r, encode=False):
    if encode:
        pass
+    elif "multipart/form-data" in r.headers.get("Content-Type"):
+        decode = decoder.MultipartDecoder(await r.content, r.mimetype)
+        querys = list()
+        for part in decode.parts:
+            header = part.headers.get(b"Content-Disposition").decode("utf-8")
+            text = part.text
+
+            for section in [h.strip() for h in header.split(";")]:
+                split = section.split("=")
+                if len(split) > 1:
+                    key = split[1]
+                    key = key[1:-1]
+                    querys.append((key, text))
+
+        content = urlencode(querys)
+        return QueryDict(content)
    else:
        return QueryDict(await r.text)

@@ -38,6 +54,7 @@ async def format_files(r, encode=False):
        dump = {}
        for part in decoded.parts:
            header = part.headers[b"Content-Disposition"].decode("utf-8")
+            mimetype = part.headers.get(b"Content-Type", None)
            filename = None

            for section in [h.strip() for h in header.split(";")]:
@@ -50,9 +67,17 @@ async def format_files(r, encode=False):

                    if key == "filename":
                        filename = value
+                    elif key == "name":
+                        formname = value

-            if filename:
-                dump[filename] = part.content
+            if mimetype is None:
+                dump[formname] = part.content
+            else:
+                dump[formname] = {
+                    "filename": filename,
+                    "content": part.content,
+                    "content-type": mimetype.decode("utf-8"),
+                }
        return dump


@@ -1,23 +1,28 @@
+import functools
 import io
+import inspect
 import json
 import gzip
+from urllib.parse import parse_qs
 from base64 import b64decode
 from http.cookies import SimpleCookie

-
 import chardet
 import rfc3986
 import graphene
 import yaml
+
 from requests.structures import CaseInsensitiveDict
 from requests.cookies import RequestsCookieJar
+
 from starlette.datastructures import MutableHeaders
-from starlette.requests import Request as StarletteRequest
-from starlette.responses import Response as StarletteResponse
+from starlette.requests import Request as StarletteRequest, State
+from starlette.responses import (
+    Response as StarletteResponse,
+    StreamingResponse as StarletteStreamingResponse,
+)

-from urllib.parse import parse_qs
-
-from .status_codes import HTTP_200
+from .status_codes import HTTP_200, HTTP_301
 from .statics import DEFAULT_ENCODING


@@ -89,13 +94,20 @@ class QueryDict(dict):
        yield from super().items()


-# TODO: add slots
 class Request:
-    __slots__ = ["_starlette", "formats", "_headers", "_encoding", "api", "_content"]
+    __slots__ = [
+        "_starlette",
+        "formats",
+        "_headers",
+        "_encoding",
+        "api",
+        "_content",
+        "_cookies",
+    ]

-    def __init__(self, scope, receive, api=None):
+    def __init__(self, scope, receive, api=None, formats=None):
        self._starlette = StarletteRequest(scope, receive)
-        self.formats = None
+        self.formats = formats
        self._encoding = None
        self.api = api
        self._content = None
@@ -105,18 +117,12 @@ class Request:
            headers[key] = value

        self._headers = headers
+        self._cookies = None

    @property
    def session(self):
        """The session data, in dict form, from the Request."""
-        if "Responder-Session" in self.cookies:
-
-            data = self.cookies[self.api.session_cookie]
-
-            data = self.api._signer.unsign(data)
-            data = b64decode(data)
-            return json.loads(data)
-        return {}
+        return self._starlette.session

    @property
    def headers(self):
@@ -145,14 +151,17 @@ class Request:
    @property
    def cookies(self):
        """The cookies sent in the Request, as a dictionary."""
-        cookies = RequestsCookieJar()
-        cookie_header = self.headers.get("Cookie", "")
+        if self._cookies is None:
+            cookies = RequestsCookieJar()
+            cookie_header = self.headers.get("Cookie", "")

-        bc = SimpleCookie(cookie_header)
-        for k, v in bc.items():
-            cookies[k] = v
+            bc = SimpleCookie(cookie_header)
+            for key, morsel in bc.items():
+                cookies[key] = morsel.value

-        return cookies.get_dict()
+            self._cookies = cookies.get_dict()
+
+        return self._cookies

    @property
    def params(self):
@@ -162,6 +171,19 @@ class Request:
        except AttributeError:
            return QueryDict({})

+    @property
+    def state(self) -> State:
+        """
+        Use the state to store additional information.
+
+        This can be a very helpful feature, if you want to hand over
+        information from a middelware or a route decorator to the
+        actual route handler.
+
+        Usage: ``request.state.time_started = time.time()``
+        """
+        return self._starlette.state
+
    @property
    async def encoding(self):
        """The encoding of the Request's body. Can be set, manually. Must be awaited."""
@@ -169,13 +191,7 @@ class Request:
        if self._encoding:
            return self._encoding

-        # Then try what's defined by the Request.
-        elif await self.declared_encoding:
-            return self.declared_encoding
-
-        # Then, automatically detect the encoding.
-        else:
-            return await self.apparent_encoding
+        return await self.apparent_encoding

    @encoding.setter
    def encoding(self, value):
@@ -205,8 +221,8 @@ class Request:

        if declared_encoding:
            return declared_encoding
-        else:
-            return chardet.detect(await self.content)["encoding"]
+
+        return chardet.detect(await self.content)["encoding"] or DEFAULT_ENCODING

    @property
    def is_secure(self):
@@ -232,11 +248,21 @@ class Request:
            return await format(self)


+def content_setter(mimetype):
+    def getter(instance):
+        return instance.content
+
+    def setter(instance, value):
+        instance.content = value
+        instance.mimetype = mimetype
+
+    return property(fget=getter, fset=setter)
+
+
 class Response:
    __slots__ = [
        "req",
        "status_code",
-        "text",
        "content",
        "encoding",
        "media",
@@ -244,33 +270,58 @@ class Response:
        "formats",
        "cookies",
        "session",
+        "mimetype",
+        "_stream",
    ]

+    text = content_setter("text/plain")
+    html = content_setter("text/html")
+
    def __init__(self, req, *, formats):
        self.req = req
        self.status_code = None  #: The HTTP Status Code to use for the Response.
-        self.text = None  #: A unicode representation of the response body.
        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 = (
            {}
        )  #: A Python dictionary of ``{key: value}``, representing the headers of the response.
        self.formats = formats
-        self.cookies = {}  #: The cookies set in the Response, as a dictionary
+        self.cookies = SimpleCookie()  #: The cookies set in the Response
        self.session = (
-            req.session.copy()
+            req.session
        )  #: The cookie-based session data, in dict form, to add to the Response.

+    # Property or func/dec
+    def stream(self, func, *args, **kwargs):
+        assert inspect.isasyncgenfunction(func)
+
+        self._stream = functools.partial(func, *args, **kwargs)
+
+        return func
+
+    def redirect(self, location, *, set_text=True, status_code=HTTP_301):
+        self.status_code = status_code
+        if set_text:
+            self.text = f"Redirecting to: {location}"
+        self.headers.update({"Location": location})
+
    @property
    async def body(self):
-        if self.content is not None:
-            return (self.content, {})
+        if self._stream is not None:
+            return (self._stream(), {})

-        if self.text is not None:
-            return (self.text.encode(self.encoding), {"Encoding": self.encoding})
+        if self.content is not None:
+            headers = {}
+            content = self.content
+            if self.mimetype is not None:
+                headers["Content-Type"] = self.mimetype
+            if self.mimetype == "text/plain" and self.encoding is not None:
+                headers["Encoding"] = self.encoding
+                content = content.encode(self.encoding)
+            return (content, headers)

        for format in self.formats:
            if self.req.accepts(format):
@@ -282,12 +333,48 @@ class Response:
            {"Content-Type": "application/json"},
        )

-    async def __call__(self, receive, send):
+    def set_cookie(
+        self,
+        key,
+        value="",
+        expires=None,
+        path="/",
+        domain=None,
+        max_age=None,
+        secure=False,
+        httponly=True,
+    ):
+        self.cookies[key] = value
+        morsel = self.cookies[key]
+        if expires is not None:
+            morsel["expires"] = expires
+        if path is not None:
+            morsel["path"] = path
+        if domain is not None:
+            morsel["domain"] = domain
+        if max_age is not None:
+            morsel["max-age"] = max_age
+        morsel["secure"] = secure
+        morsel["httponly"] = httponly
+
+    def _prepare_cookies(self, starlette_response):
+        cookie_header = (
+            (b"set-cookie", morsel.output(header="").lstrip().encode("latin-1"))
+            for morsel in self.cookies.values()
+        )
+        starlette_response.raw_headers.extend(cookie_header)
+
+    async def __call__(self, scope, receive, send):
        body, headers = await self.body
        if self.headers:
            headers.update(self.headers)

-        response = StarletteResponse(
-            body, status_code=self.status_code, headers=headers
-        )
-        await response(receive, send)
+        if self._stream is not None:
+            response_cls = StarletteStreamingResponse
+        else:
+            response_cls = StarletteResponse
+
+        response = response_cls(body, status_code=self.status_code, headers=headers)
+        self._prepare_cookies(response)
+
+        await response(scope, receive, send)
@@ -1,27 +1,76 @@
+import asyncio
+import json
 import re
-import functools
-from parse import parse
+import inspect
+
+from starlette.routing import Lifespan
+from starlette.middleware.wsgi import WSGIMiddleware
+from starlette.websockets import WebSocket, WebSocketClose
+from starlette.concurrency import run_in_threadpool
+from starlette.exceptions import HTTPException
+
+from .models import Request, Response
+from . import status_codes
+from .formats import get_formats
+from .statics import DEFAULT_SESSION_COOKIE


-class Route:
-    _param_pattern = re.compile(r"{([^{}]*)}")
+_CONVERTORS = {
+    "int": (int, r"\d+"),
+    "str": (str, r"[^/]+"),
+    "float": (float, r"\d+(.\d+)?"),
+}

-    def __init__(self, route, endpoint, *, websocket=False, before_request=False):
+PARAM_RE = re.compile("{([a-zA-Z_][a-zA-Z0-9_]*)(:[a-zA-Z_][a-zA-Z0-9_]*)?}")
+
+
+def compile_path(path):
+    path_re = "^"
+    param_convertors = {}
+    idx = 0
+
+    for match in PARAM_RE.finditer(path):
+        param_name, convertor_type = match.groups(default="str")
+        convertor_type = convertor_type.lstrip(":")
+        assert (
+            convertor_type in _CONVERTORS.keys()
+        ), f"Unknown path convertor '{convertor_type}'"
+        convertor, convertor_re = _CONVERTORS[convertor_type]
+
+        path_re += path[idx : match.start()]
+        path_re += rf"(?P<{param_name}>{convertor_re})"
+
+        param_convertors[param_name] = convertor
+
+        idx = match.end()
+
+    path_re += path[idx:] + "$"
+
+    return re.compile(path_re), param_convertors
+
+
+class BaseRoute:
+    def matches(self, scope):
+        raise NotImplementedError()
+
+    async def __call__(self, scope, receive, send):
+        raise NotImplementedError()
+
+
+class Route(BaseRoute):
+    def __init__(self, route, endpoint, *, before_request=False):
+        assert route.startswith("/"), "Route path must start with '/'"
        self.route = route
        self.endpoint = endpoint
-        self.uses_websocket = websocket
        self.before_request = before_request

+        self.path_re, self.param_convertors = compile_path(route)
+
    def __repr__(self):
        return f"<Route {self.route!r}={self.endpoint!r}>"

-    def __eq__(self, other):
-        if hasattr(other, "route"):
-            # Being compared to other routes.
-            return self.route == other.route
-        else:
-            # Strings.
-            return self.does_match(other)
+    def url(self, **params):
+        return self.route.format(**params)

    @property
    def endpoint_name(self):
@@ -31,46 +80,248 @@ class Route:
    def description(self):
        return self.endpoint.__doc__

-    @property
-    def has_parameters(self):
-        return bool(self._param_pattern.search(self.route))
+    def matches(self, scope):
+        if scope["type"] != "http":
+            return False, {}

-    @functools.lru_cache(maxsize=None)
-    def does_match(self, s):
-        if s == self.route:
-            return True
+        path = scope["path"]
+        match = self.path_re.match(path)

-        named = self.incoming_matches(s)
-        return bool(len(named))
+        if match is None:
+            return False, {}

-    @functools.lru_cache(maxsize=None)
-    def incoming_matches(self, s):
-        results = parse(self.route, s)
-        return results.named if results else {}
+        matched_params = match.groupdict()
+        for key, value in matched_params.items():
+            matched_params[key] = self.param_convertors[key](value)
+
+        return True, {"path_params": {**matched_params}}
+
+    async def __call__(self, scope, receive, send):
+        request = Request(scope, receive, formats=get_formats())
+        response = Response(req=request, formats=get_formats())
+
+        path_params = scope.get("path_params", {})
+        before_requests = scope.get("before_requests", [])
+
+        for before_request in before_requests.get("http", []):
+            if asyncio.iscoroutinefunction(before_request):
+                await before_request(request, response)
+            else:
+                await run_in_threadpool(before_request, request, response)
+
+        views = []
+
+        if inspect.isclass(self.endpoint):
+            endpoint = self.endpoint()
+            on_request = getattr(endpoint, "on_request", None)
+            if on_request:
+                views.append(on_request)
+
+            method_name = f"on_{request.method}"
+            try:
+                view = getattr(endpoint, method_name)
+                views.append(view)
+            except AttributeError:
+                if on_request is None:
+                    raise HTTPException(status_code=status_codes.HTTP_405)
+        else:
+            views.append(self.endpoint)
+
+        for view in views:
+            # "Monckey patch" for graphql: explicitly checking __call__
+            if asyncio.iscoroutinefunction(view) or asyncio.iscoroutinefunction(
+                view.__call__
+            ):
+                await view(request, response, **path_params)
+            else:
+                await run_in_threadpool(view, request, response, **path_params)
+
+        if response.status_code is None:
+            response.status_code = status_codes.HTTP_200
+
+        await response(scope, receive, send)
+
+    def __eq__(self, other):
+        # [TODO] compare to str ?
+        return self.route == other.route and self.endpoint == other.endpoint
+
+    def __hash__(self):
+        return hash(self.route) ^ hash(self.endpoint) ^ hash(self.before_request)
+
+
+class WebSocketRoute(BaseRoute):
+    def __init__(self, route, endpoint, *, before_request=False):
+        assert route.startswith("/"), "Route path must start with '/'"
+        self.route = route
+        self.endpoint = endpoint
+        self.before_request = before_request
+
+        self.path_re, self.param_convertors = compile_path(route)
+
+    def __repr__(self):
+        return f"<Route {self.route!r}={self.endpoint!r}>"

    def url(self, **params):
        return self.route.format(**params)

-    def _weight(self):
-        params = set(self._param_pattern.findall(self.route))
-        params_count = len(params)
-        w = len(self.route.rsplit('}', 1)[-1].strip('/'))
-        return params_count != 0, w == 0, -params_count
+    @property
+    def endpoint_name(self):
+        return self.endpoint.__name__

    @property
-    def is_class_based(self):
-        return hasattr(self.endpoint, "__class__")
+    def description(self):
+        return self.endpoint.__doc__

-    @property
-    def is_function(self):
-        code = hasattr(self.endpoint, "__code__")
-        kwdefaults = hasattr(self.endpoint, "__kwdefaults__")
-        return all((callable(self.endpoint), code, kwdefaults))
+    def matches(self, scope):
+        if scope["type"] != "websocket":
+            return False, {}
+
+        path = scope["path"]
+        match = self.path_re.match(path)
+
+        if match is None:
+            return False, {}
+
+        matched_params = match.groupdict()
+        for key, value in matched_params.items():
+            matched_params[key] = self.param_convertors[key](value)
+
+        return True, {"path_params": {**matched_params}}
+
+    async def __call__(self, scope, receive, send):
+        ws = WebSocket(scope, receive, send)
+
+        before_requests = scope.get("before_requests", [])
+        for before_request in before_requests.get("ws", []):
+            await before_request(ws)
+
+        await self.endpoint(ws)
+
+    def __eq__(self, other):
+        # [TODO] compare to str ?
+        return self.route == other.route and self.endpoint == other.endpoint

    def __hash__(self):
-        return (
-            hash(self.route)
-            ^ hash(self.endpoint)
-            ^ hash(self.uses_websocket)
-            ^ hash(self.before_request)
+        return hash(self.route) ^ hash(self.endpoint) ^ hash(self.before_request)
+
+
+class Router:
+    def __init__(self, routes=None, default_response=None, before_requests=None):
+        self.routes = [] if routes is None else list(routes)
+        # [TODO] Make its own router
+        self.apps = {}
+        self.default_endpoint = (
+            self.default_response if default_response is None else default_response
        )
+        self.lifespan_handler = Lifespan()
+        self.before_requests = (
+            {"http": [], "ws": []} if before_requests is None else before_requests
+        )
+
+    def add_route(
+        self,
+        route=None,
+        endpoint=None,
+        *,
+        default=False,
+        websocket=False,
+        before_request=False,
+        check_existing=False,
+    ):
+        """ Adds a route to the router.
+        :param route: A string representation of the route
+        :param endpoint: The endpoint for the route -- can be callable, or class.
+        :param default: If ``True``, all unknown requests will route to this view.
+        """
+        if before_request:
+            if websocket:
+                self.before_requests.setdefault("ws", []).append(endpoint)
+            else:
+                self.before_requests.setdefault("http", []).append(endpoint)
+            return
+
+        if check_existing:
+            assert not self.routes or route not in (
+                item.route for item in self.routes
+            ), f"Route '{route}' already exists"
+
+        if default:
+            self.default_endpoint = endpoint
+
+        if websocket:
+            route = WebSocketRoute(route, endpoint)
+        else:
+            route = Route(route, endpoint)
+
+        self.routes.append(route)
+
+    def mount(self, route, app):
+        """Mounts ASGI / WSGI applications at a given route
+        """
+        self.apps.update(route, app)
+
+    def before_request(self, endpoint, websocket=False):
+        if websocket:
+            self.before_requests.setdefault("ws", []).append(endpoint)
+        else:
+            self.before_requests.setdefault("http", []).append(endpoint)
+
+    def url_for(self, endpoint, **params):
+        # TODO: Check for params
+        for route in self.routes:
+            if endpoint in (route.endpoint, route.endpoint.__name__):
+                return route.url(**params)
+        return None
+
+    async def default_response(self, scope, receive, send):
+        if scope["type"] == "websocket":
+            websocket_close = WebSocketClose()
+            await websocket_close(receive, send)
+            return
+
+        request = Request(scope, receive)
+        response = Response(request, formats=get_formats())
+
+        raise HTTPException(status_code=status_codes.HTTP_404)
+
+    def _resolve_route(self, scope):
+        for route in self.routes:
+            matches, child_scope = route.matches(scope)
+            if matches:
+                scope.update(child_scope)
+                return route
+        return None
+
+    async def __call__(self, scope, receive, send):
+        assert scope["type"] in ("http", "websocket", "lifespan")
+
+        if scope["type"] == "lifespan":
+            await self.lifespan_handler(scope, receive, send)
+            return
+
+        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):
+                scope["path"] = path[len(path_prefix) :]
+                scope["root_path"] = root_path + path_prefix
+                try:
+                    await app(scope, receive, send)
+                    return
+                except TypeError:
+                    app = WSGIMiddleware(app)
+                    await app(scope, receive, send)
+                    return
+
+        await self.default_response(scope, receive, send)
@@ -0,0 +1,18 @@
+import typing
+
+from starlette.staticfiles import StaticFiles
+
+
+class StaticFiles(StaticFiles):
+    """I've created an issue to disccuss allowing multiple directories in starletter's `StaticFiles`.
+    
+    https://github.com/encode/starlette/issues/625
+    
+    I've also made a PR to add this method to starlette StaticFiles
+    Once accepted we will remove this.
+    
+    https://github.com/encode/starlette/pull/626
+    """
+
+    def add_directory(self, directory: str) -> None:
+        self.all_directories = [*self.all_directories, *self.get_directories(directory)]
@@ -4,11 +4,11 @@ DEFAULT_SESSION_COOKIE = "Responder-Session"
 DEFAULT_SECRET_KEY = "NOTASECRET"

 DEFAULT_CORS_PARAMS = {
-	"allow_origins": (),
-	"allow_methods": ("GET",),
-	"allow_headers": (),
-	"allow_credentials": False,
-	"allow_origin_regex": None,
-	"expose_headers": (),
-	"max_age": 600,
+    "allow_origins": (),
+    "allow_methods": ("GET",),
+    "allow_headers": (),
+    "allow_credentials": False,
+    "allow_origin_regex": None,
+    "expose_headers": (),
+    "max_age": 600,
 }
@@ -0,0 +1,59 @@
+from contextlib import contextmanager
+
+import jinja2
+
+
+class Templates:
+    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,
+            enable_async=enable_async,
+        )
+        self.default_context = {} if context is None else {**context}
+        self._env.globals.update(self.default_context)
+
+    @property
+    def context(self):
+        return self._env.globals
+
+    @context.setter
+    def context(self, context):
+        self._env.globals = {**self.default_context, **context}
+
+    def get_template(self, name):
+        return self._env.get_template(name)
+
+    def render(self, template, *args, **kwargs):
+        """Renders the given `jinja2 <http://jinja.pocoo.org/docs/>`_ template, with provided values supplied.
+
+        :param template: The filename of the jinja2 template.
+        :param **kwargs: Data to pass into the template.
+        :param **kwargs: Data to pass into the template.
+        """
+        return self.get_template(template).render(*args, **kwargs)
+
+    @contextmanager
+    def _async(self):
+        self._env.is_async = True
+        try:
+            yield
+        finally:
+            self._env.is_async = False
+
+    async def render_async(self, template, *args, **kwargs):
+        with self._async():
+            return await self.get_template(template).render_async(*args, **kwargs)
+
+    def render_string(self, source, *args, **kwargs):
+        """Renders the given `jinja2 <http://jinja.pocoo.org/docs/>`_ template string, with provided values supplied.
+
+        :param source: The template to use.
+        :param *args, **kwargs: Data to pass into the template.
+        :param **kwargs: Data to pass into the template.
+        """
+        template = self._env.from_string(source)
+        return template.render(*args, **kwargs)
@@ -22,27 +22,24 @@ if sys.argv[-1] == "publish":
    sys.exit()

 required = [
-    "starlette",
-    "uvicorn",
+    "starlette==0.12.*",
+    "uvicorn==0.10.*",
    "aiofiles",
    "pyyaml",
    "requests",
-    "graphene",
+    "graphene<3.0",
    "graphql-server-core>=1.1",
    "jinja2",
-    "parse",
-    "uvloop ; sys_platform != 'win32'",
    "rfc3986",
    "python-multipart",
    "chardet",
    "apispec>=1.0.0b1",
    "marshmallow",
-    "asgiref",
    "whitenoise",
    "docopt",
-    "itsdangerous",
    "requests-toolbelt",
    "apistar",
+    "itsdangerous",
 ]


@@ -70,7 +67,7 @@ class DebCommand(Command):
            rmtree(os.path.join(here, "deb_dist"))
        except FileNotFoundError:
            pass
-        self.status(u"Creating debian mainfest…")
+        self.status(u"Creating debian manifest…")
        os.system(
            "python setup.py --command-packages=stdeb.command sdist_dsc -z artful --package3=pipenv --depends3=python3-virtualenv-clone"
        )
@@ -123,21 +120,7 @@ setup(
    url="https://github.com/kennethreitz/responder",
    packages=find_packages(exclude=["tests"]),
    entry_points={"console_scripts": ["responder=responder.cli:cli"]},
-    package_data={
-        # "": ["LICENSE", "NOTICES"],
-        #     "pipenv.vendor.requests": ["*.pem"],
-        #     "pipenv.vendor.certifi": ["*.pem"],
-        #     "pipenv.vendor.click_completion": ["*.j2"],
-        #     "pipenv.patched.notpip._vendor.certifi": ["*.pem"],
-        #     "pipenv.patched.notpip._vendor.requests": ["*.pem"],
-        #     "pipenv.patched.notpip._vendor.distlib._backport": ["sysconfig.cfg"],
-        #     "pipenv.patched.notpip._vendor.distlib": [
-        #         "t32.exe",
-        #         "t64.exe",
-        #         "w32.exe",
-        #         "w64.exe",
-        #     ],
-    },
+    package_data={},
    python_requires=">=3.6",
    setup_requires=[],
    install_requires=required,
@@ -18,10 +18,7 @@ def current_dir():

@pytest.fixture
 def api():
-    return responder.API(
-        debug=False,
-        allowed_hosts=[";"]
-    )
+    return responder.API(debug=False, allowed_hosts=[";"])


@pytest.fixture
@@ -49,6 +46,7 @@ def flask():

    return app

+
@pytest.fixture
 def schema():
    class Query(graphene.ObjectType):
@@ -58,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
@@ -2,11 +2,17 @@ import concurrent

 import pytest
 import yaml
+import random
 import responder
 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
+from starlette.testclient import TestClient as StarletteTestClient


 def test_api_basic_route(api):
@@ -15,6 +21,47 @@ def test_api_basic_route(api):
        resp.text = "hello world!"


+def test_route_repr():
+    def home(req, resp):
+        """Home page
+        """
+        resp.text = "Hello !"
+
+    route = Route("/", home)
+
+    assert route.__repr__() == f"<Route '/'={home!r}>"
+
+    assert route.endpoint_name == home.__name__
+    assert route.description == home.__doc__
+
+
+def test_websocket_route_repr():
+    def chat_endpoint(ws):
+        """Chat
+        """
+        pass
+
+    route = WebSocketRoute("/", chat_endpoint)
+
+    assert route.__repr__() == f"<Route '/'={chat_endpoint!r}>"
+
+    assert route.endpoint_name == chat_endpoint.__name__
+    assert route.description == chat_endpoint.__doc__
+
+
+def test_route_eq():
+    def home(req, resp):
+        resp.text = "Hello !"
+
+    assert Route("/", home) == Route("/", home)
+
+    def chat(ws):
+        pass
+
+    assert WebSocketRoute("/", home) == WebSocketRoute("/", home)
+
+
+"""
 def test_api_basic_route_overlap(api):
    @api.route("/")
    def home(req, resp):
@@ -25,39 +72,7 @@ def test_api_basic_route_overlap(api):
        @api.route("/")
        def home2(req, resp):
            resp.text = "hello world!"
-
-
-def test_api_basic_route_overlap_alternative(api):
-    @api.route("/")
-    def home(req, resp):
-        resp.text = "hello world!"
-
-    def home2(req, resp):
-        resp.text = "hello world!"
-
-    with pytest.raises(AssertionError):
-        api.add_route("/", home2)
-
-
-def test_api_basic_route_overlap_allowed(api):
-    @api.route("/")
-    def home(req, resp):
-        resp.text = "hello world!"
-
-    def home2(req, resp):
-        resp.text = "hello world!"
-
-    api.add_route("/", home2, check_existing=False)
-
-
-def test_api_basic_route_overlap_allowed_alternative(api):
-    @api.route("/")
-    def home(req, resp):
-        resp.text = "hello world!"
-
-    @api.route("/", check_existing=False)
-    def home2(req, resp):
-        resp.text = "hello world!"
+"""


 def test_class_based_view_registration(api):
@@ -70,10 +85,10 @@ def test_class_based_view_registration(api):
 def test_class_based_view_parameters(api):
    @api.route("/{greeting}")
    class Greeting:
-        def on_request(self, req, resp, *, greeting):
-            resp.text = f"{greeting}, world!"
+        pass

-    assert api.session().get("http://;/Hello").ok
+    resp = api.session().get("http://;/Hello")
+    assert resp.status_code == api.status_codes.HTTP_405


 def test_requests_session(api):
@@ -81,14 +96,14 @@ def test_requests_session(api):
    assert api.requests


-def test_requests_session_works(api, url):
+def test_requests_session_works(api):
    TEXT = "spiral out"

    @api.route("/")
    def hello(req, resp):
        resp.text = TEXT

-    assert api.requests.get(url("/")).text == TEXT
+    assert api.requests.get("/").text == TEXT


 def test_status_code(api):
@@ -123,7 +138,7 @@ def test_yaml_media(api):
    r = api.requests.get("http://;/", headers={"Accept": "yaml"})

    assert "yaml" in r.headers["Content-Type"]
-    assert yaml.load(r.content) == dump
+    assert yaml.load(r.content, Loader=yaml.FullLoader) == dump


 def test_graphql_schema_query_querying(api, schema):
@@ -219,7 +234,7 @@ def test_media_parsing(api):
    assert r.json() == dump

    r = api.requests.get(api.url_for(route), headers={"Accept": "application/x-yaml"})
-    assert r.text == "{hello: sam}\n"
+    assert r.text == "hello: sam\n"


 def test_background(api):
@@ -302,6 +317,11 @@ def test_form_uploads(api):
    r = api.requests.post(api.url_for(route), data=dump)
    assert r.json() == dump

+    # requests with boundary
+    files = {"complicated": (None, "times")}
+    r = api.requests.post(api.url_for(route), files=files)
+    assert r.json() == {"complicated": "times"}
+

 def test_json_downloads(api):
    dump = {"testing": "123"}
@@ -329,19 +349,18 @@ def test_yaml_downloads(api):
    assert yaml.safe_load(r.content) == dump


-def test_schema_generation():
+def test_schema_generation_explicit():
    import responder
-    from marshmallow import Schema, fields
+    from responder.ext.schema import Schema as OpenAPISchema
+    import marshmallow

-    api = responder.API(
-        title="Web Service",
-        openapi="3.0",
-        allowed_hosts=["testserver", ";"]
-    )
+    api = responder.API()

-    @api.schema("Pet")
-    class PetSchema(Schema):
-        name = fields.Str()
+    schema = OpenAPISchema(app=api, title="Web Service", version="1.0", openapi="3.0.2")
+
+    @schema.schema("Pet")
+    class PetSchema(marshmallow.Schema):
+        name = marshmallow.fields.Str()

    @api.route("/")
    def route(req, resp):
@@ -353,7 +372,7 @@ def test_schema_generation():
                200:
                    description: A pet to be returned
                    schema:
-                        $ref = "#/components/schemas/Pet"
+                        $ref: "#/components/schemas/Pet"
        """
        resp.media = PetSchema().dump({"name": "little orange"})

@@ -361,18 +380,120 @@ def test_schema_generation():
    dump = yaml.safe_load(r.content)

    assert dump
-    assert dump["openapi"] == "3.0"
+    assert dump["openapi"] == "3.0.2"
+
+
+def test_schema_generation():
+    import responder
+    from marshmallow import Schema, fields
+
+    api = responder.API(title="Web Service", openapi="3.0.2")
+
+    @api.schema("Pet")
+    class PetSchema(Schema):
+        name = fields.Str()
+
+    @api.route("/")
+    def route(req, resp):
+        """A cute furry animal endpoint.
+        ---
+        get:
+            description: Get a random pet
+            responses:
+                200:
+                    description: A pet to be returned
+                    schema:
+                        $ref: "#/components/schemas/Pet"
+        """
+        resp.media = PetSchema().dump({"name": "little orange"})
+
+    r = api.requests.get("http://;/schema.yml")
+    dump = yaml.safe_load(r.content)
+
+    assert dump
+    assert dump["openapi"] == "3.0.2"
+
+
+def test_documentation_explicit():
+    import responder
+    from responder.ext.schema import Schema as OpenAPISchema
+
+    import marshmallow
+
+    description = "This is a sample server for a pet store."
+    terms_of_service = "http://example.com/terms/"
+    contact = {
+        "name": "API Support",
+        "url": "http://www.example.com/support",
+        "email": "support@example.com",
+    }
+    license = {
+        "name": "Apache 2.0",
+        "url": "https://www.apache.org/licenses/LICENSE-2.0.html",
+    }
+
+    api = responder.API(allowed_hosts=["testserver", ";"])
+
+    schema = OpenAPISchema(
+        app=api,
+        title="Web Service",
+        version="1.0",
+        openapi="3.0.2",
+        docs_route="/docs",
+        description=description,
+        terms_of_service=terms_of_service,
+        contact=contact,
+        license=license,
+    )
+
+    @schema.schema("Pet")
+    class PetSchema(marshmallow.Schema):
+        name = marshmallow.fields.Str()
+
+    @api.route("/")
+    def route(req, resp):
+        """A cute furry animal endpoint.
+        ---
+        get:
+            description: Get a random pet
+            responses:
+                200:
+                    description: A pet to be returned
+                    schema:
+                        $ref: "#/components/schemas/Pet"
+        """
+        resp.media = PetSchema().dump({"name": "little orange"})
+
+    r = api.requests.get("/docs")
+    assert "html" in r.text


 def test_documentation():
    import responder
    from marshmallow import Schema, fields

+    description = "This is a sample server for a pet store."
+    terms_of_service = "http://example.com/terms/"
+    contact = {
+        "name": "API Support",
+        "url": "http://www.example.com/support",
+        "email": "support@example.com",
+    }
+    license = {
+        "name": "Apache 2.0",
+        "url": "https://www.apache.org/licenses/LICENSE-2.0.html",
+    }
+
    api = responder.API(
        title="Web Service",
-        openapi="3.0",
+        version="1.0",
+        openapi="3.0.2",
        docs_route="/docs",
-        allowed_hosts=["testserver", ";"]
+        description=description,
+        terms_of_service=terms_of_service,
+        contact=contact,
+        license=license,
+        allowed_hosts=["testserver", ";"],
    )

    @api.schema("Pet")
@@ -389,7 +510,7 @@ def test_documentation():
                200:
                    description: A pet to be returned
                    schema:
-                        $ref = "#/components/schemas/Pet"
+                        $ref: "#/components/schemas/Pet"
        """
        resp.media = PetSchema().dump({"name": "little orange"})

@@ -424,13 +545,23 @@ def test_cookies(api):
    def cookies(req, resp):
        resp.media = {"cookies": req.cookies}
        resp.cookies["sent"] = "true"
+        resp.set_cookie(
+            "hello",
+            "world",
+            expires=123,
+            path="/",
+            max_age=123,
+            secure=False,
+            httponly=True,
+        )

    r = api.requests.get(api.url_for(cookies), cookies={"hello": "universe"})
    assert r.json() == {"cookies": {"hello": "universe"}}
    assert "sent" in r.cookies
+    assert "hello" in r.cookies

    r = api.requests.get(api.url_for(cookies))
-    assert r.json() == {"cookies": {"sent": "true"}}
+    assert r.json() == {"cookies": {"hello": "world", "sent": "true"}}


@pytest.mark.xfail
@@ -441,17 +572,17 @@ def test_sessions(api):
        resp.media = resp.session

    r = api.requests.get(api.url_for(view))
-    assert "Responder-Session" in r.cookies
+    assert api.session_cookie in r.cookies

    r = api.requests.get(api.url_for(view))
    assert (
-        r.cookies["Responder-Session"]
+        r.cookies[api.session_cookie]
        == '{"hello": "world"}.r3EB04hEEyLYIJaAXCEq3d4YEbs'
    )
    assert r.json() == {"hello": "world"}


-def test_template_rendering(api):
+def test_template_string_rendering(api):
    @api.route("/")
    def view(req, resp):
        resp.content = api.template_string("{{ var }}", var="hello")
@@ -460,33 +591,66 @@ def test_template_rendering(api):
    assert r.text == "hello"


+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_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):

        files = await req.media("files")
-        files["hello"] = files["hello"].decode("utf-8")
-        resp.media = {"files": files}
+        result = {}
+        result["hello"] = files["hello"]["content"].decode("utf-8")
+        result["not-a-file"] = files["not-a-file"].decode("utf-8")
+        resp.media = {"files": result}

    world = io.StringIO("world")
-    data = {"hello": world}
+    data = {"hello": ("hello.txt", world, "text/plain"), "not-a-file": b"data only"}
    r = api.requests.post(api.url_for(upload), files=data)
-    assert r.json() == {"files": {"hello": "world"}}
+    assert r.json() == {"files": {"hello": "world", "not-a-file": "data only"}}


 def test_500(api):
-    def catcher(request, exc):
-        return PlainTextResponse("Suppressed error", 500)
-
-    api.app.add_exception_handler(ValueError, catcher)
-
    @api.route("/")
    def view(req, resp):
        raise ValueError

-    r = api.requests.get(api.url_for(view))
+    dumb_client = responder.api.TestClient(
+        api, base_url="http://;", raise_server_exceptions=False
+    )
+    r = dumb_client.get(api.url_for(view))
    assert not r.ok
-    assert r.content == b"Suppressed error"
+    assert r.status_code == responder.status_codes.HTTP_500


 def test_404(api):
@@ -495,16 +659,73 @@ def test_404(api):
    assert r.status_code == responder.status_codes.HTTP_404


-def test_kinda_websockets(api):
+def test_websockets_text(api):
+    payload = "Hello via websocket!"
+
    @api.route("/ws", websocket=True)
    async def websocket(ws):
        await ws.accept()
-        await ws.send_text("Hello via websocket!")
+        await ws.send_text(payload)
        await ws.close()

+    client = StarletteTestClient(api)
+    with client.websocket_connect("ws://;/ws") as websocket:
+        data = websocket.receive_text()
+        assert data == payload

-@pytest.mark.xfail
-def test_startup(api, session):
+
+def test_websockets_bytes(api):
+    payload = b"Hello via websocket!"
+
+    @api.route("/ws", websocket=True)
+    async def websocket(ws):
+        await ws.accept()
+        await ws.send_bytes(payload)
+        await ws.close()
+
+    client = StarletteTestClient(api)
+    with client.websocket_connect("ws://;/ws") as websocket:
+        data = websocket.receive_bytes()
+        assert data == payload
+
+
+def test_websockets_json(api):
+    payload = {"Hello": "via websocket!"}
+
+    @api.route("/ws", websocket=True)
+    async def websocket(ws):
+        await ws.accept()
+        await ws.send_json(payload)
+        await ws.close()
+
+    client = StarletteTestClient(api)
+    with client.websocket_connect("ws://;/ws") as websocket:
+        data = websocket.receive_json()
+        assert data == payload
+
+
+def test_before_websockets(api):
+    payload = {"Hello": "via websocket!"}
+
+    @api.route("/ws", websocket=True)
+    async def websocket(ws):
+        await ws.send_json(payload)
+        await ws.close()
+
+    @api.before_request(websocket=True)
+    async def before_request(ws):
+        await ws.accept()
+        await ws.send_json({"before": "request"})
+
+    client = StarletteTestClient(api)
+    with client.websocket_connect("ws://;/ws") as websocket:
+        data = websocket.receive_json()
+        assert data == {"before": "request"}
+        data = websocket.receive_json()
+        assert data == payload
+
+
+def test_startup(api):
    who = [None]

    @api.route("/{greeting}")
@@ -512,19 +733,12 @@ def test_startup(api, session):
        resp.text = f"{greeting}, {who[0]}!"

    @api.on_event("startup")
-    async def asd():
+    async def run_startup():
        who[0] = "world"
-        print("startup")

-    @api.on_event("cleanup")
-    async def asd():
-        print("cleanup")
-
-    pool = concurrent.futures.ThreadPoolExecutor(max_workers=2)
-    f = pool.submit(api.run)
-
-    r = requests.get(f"http://localhost:5042/hello")
-    assert r.text == "hello, world!"
+    with api.requests as session:
+        r = session.get(f"http://;/hello")
+        assert r.text == "hello, world!"


 def test_redirects(api, session):
@@ -553,23 +767,29 @@ def test_session_thoroughly(api, session):
    r = session.get(api.url_for(get))
    assert r.json() == {"session": {"hello": "world"}}

-def test_before_response(api, session):

+def test_before_response(api, session):
    @api.route("/get")
    def get(req, resp):
        resp.media = req.session

+    @api.route(before_request=True)
+    async def async_before_request(req, resp):
+        resp.headers["x-pizza"] = "1"

    @api.route(before_request=True)
    def before_request(req, resp):
        resp.headers["x-pizza"] = "1"

    r = session.get(api.url_for(get))
-    assert 'x-pizza' in r.headers
+    assert "x-pizza" in r.headers

-def test_allowed_hosts():
+
+@pytest.mark.parametrize("enable_hsts", [True, False])
+@pytest.mark.parametrize("cors", [True, False])
+def test_allowed_hosts(enable_hsts, cors):
    api = responder.API(
-        allowed_hosts=[";", "tenant.;"]
+        allowed_hosts=[";", "tenant.;"], enable_hsts=enable_hsts, cors=cors
    )

    @api.route("/")
@@ -595,9 +815,7 @@ def test_allowed_hosts():
    r = api.session(base_url="http://unkown_tenant.;").get(api.url_for(get))
    assert r.status_code == 400

-    api = responder.API(
-        allowed_hosts=["*.;"]
-    )
+    api = responder.API(allowed_hosts=["*.;"])

    @api.route("/")
    def get(req, resp):
@@ -617,3 +835,186 @@ def test_allowed_hosts():
    api._session = None
    r = api.session(base_url="http://tenant2.;").get(api.url_for(get))
    assert r.status_code == 200
+
+
+def create_asset(static_dir, name=None, parent_dir=None):
+    if name is None:
+        name = random.choices(string.ascii_letters, k=6)
+        # :3
+        ext = random.choices(string.ascii_letters, k=2)
+        name = f"{name}.{ext}"
+
+    if parent_dir is None:
+        parent_dir = static_dir
+    else:
+        parent_dir = static_dir.mkdir(parent_dir)
+
+    asset = parent_dir.join(name)
+    asset.write("body { color: blue; }")
+    return asset
+
+
+@pytest.mark.parametrize("static_route", [None, "/static", "/custom/static/route"])
+def test_staticfiles(tmpdir, static_route):
+    static_dir = tmpdir.mkdir("static")
+
+    asset1 = create_asset(static_dir)
+    parent_dir = "css"
+    asset2 = create_asset(static_dir, name="asset2", parent_dir=parent_dir)
+
+    api = responder.API(static_dir=str(static_dir), static_route=static_route)
+    session = api.session()
+
+    static_route = api.static_route
+
+    # ok
+    r = session.get(f"{static_route}/{asset1.basename}")
+    assert r.status_code == api.status_codes.HTTP_200
+
+    r = session.get(f"{static_route}/{parent_dir}/{asset2.basename}")
+    assert r.status_code == api.status_codes.HTTP_200
+
+    # Asset not found
+    r = session.get(f"{static_route}/not_found.css")
+    assert r.status_code == api.status_codes.HTTP_404
+
+    # Not found on dir listing
+    r = session.get(f"{static_route}")
+    assert r.status_code == api.status_codes.HTTP_404
+
+    r = session.get(f"{static_route}/{parent_dir}")
+    assert r.status_code == api.status_codes.HTTP_404
+
+
+def test_staticfiles_none_dir(tmpdir):
+    api = responder.API(static_dir=None)
+    session = api.session()
+
+    static_dir = tmpdir.mkdir("static")
+
+    asset = create_asset(static_dir)
+
+    static_route = api.static_route
+
+    # ok
+    r = session.get(f"{static_route}/{asset.basename}")
+    assert r.status_code == api.status_codes.HTTP_404
+
+    # dir listing
+    r = session.get(f"{static_route}")
+    assert r.status_code == api.status_codes.HTTP_404
+
+    # SPA
+    with pytest.raises(Exception) as excinfo:
+        api.add_route("/spa", static=True)
+
+
+def test_response_html_property(api):
+    @api.route("/")
+    def view(req, resp):
+        resp.html = "<h1>Hello !</h1>"
+
+        assert resp.content == "<h1>Hello !</h1>"
+        assert resp.mimetype == "text/html"
+
+    r = api.requests.get(api.url_for(view))
+    assert r.content == b"<h1>Hello !</h1>"
+    assert r.headers["Content-Type"] == "text/html"
+
+
+def test_response_text_property(api):
+    @api.route("/")
+    def view(req, resp):
+        resp.text = "<h1>Hello !</h1>"
+
+        assert resp.content == "<h1>Hello !</h1>"
+        assert resp.mimetype == "text/plain"
+
+    r = api.requests.get(api.url_for(view))
+    assert r.content == b"<h1>Hello !</h1>"
+    assert r.headers["Content-Type"] == "text/plain"
+
+
+def test_stream(api, session):
+    async def shout_stream(who):
+        for c in who.upper():
+            yield c
+
+    @api.route("/{who}")
+    async def greeting(req, resp, *, who):
+
+        resp.stream(shout_stream, who)
+
+    r = session.get("/morocco")
+    assert r.text == "MOROCCO"
+
+    @api.route("/")
+    async def home(req, resp):
+        # Raise when it's not an async generator
+        with pytest.raises(AssertionError):
+
+            def foo():
+                pass
+
+            resp.stream(foo)
+
+        with pytest.raises(AssertionError):
+
+            async def foo():
+                pass
+
+            resp.stream(foo)
+
+        with pytest.raises(AssertionError):
+
+            def foo():
+                yield "oopsie"
+
+            resp.stream(foo)
+
+
+def test_empty_req_text(api):
+    content = "It's working"
+
+    @api.route("/")
+    async def home(req, resp):
+        await req.text
+        resp.text = content
+
+    r = api.requests.post("/")
+    assert r.text == content
+
+    def test_api_request_state(api, url):
+        class StateMiddleware(BaseHTTPMiddleware):
+            async def dispatch(self, request, call_next):
+                request.state.test1 = 42
+                request.state.test2 = "Foo"
+
+                response = await call_next(request)
+                return response
+
+        api.add_middleware(StateMiddleware)
+
+        @api.route("/")
+        def home(req, resp):
+            resp.text = "{}_{}".format(req.state.test2, req.state.test1)
+
+        assert api.requests.get(url("/")).text == "Foo_42"
+
+
+def test_path_matches_route(api):
+    @api.route("/hello")
+    def home(req, resp):
+        resp.text = "hello world!"
+
+    route = api.path_matches_route({"type": "http", "path": "/hello"})
+    assert route.endpoint_name == "home"
+
+    assert not api.path_matches_route({"type": "http", "path": "/foo"})
+
+
+def test_route_without_endpoint(api):
+    # test that a route without endpoint gets a default static response
+    api.add_route("/")
+    route = api.router.routes[0]
+    assert route.endpoint_name == "_static_response"
@@ -1,117 +0,0 @@
-import pytest
-from responder import routes
-
-
-def setup_function(function):
-    routes.Route.incoming_matches.cache_clear()
-
-
-@pytest.mark.parametrize(
-    "route, expected",
-    [
-        pytest.param("/", False, id="home path without params"),
-        pytest.param("/test_path", False, id="sub path without params"),
-        pytest.param("/{test_path}", True, id="path with params"),
-    ],
-)
-def test_parameter(route, expected):
-    r = routes.Route(route, "test_endpoint")
-    assert r.has_parameters is expected
-
-
-def test_url():
-    r = routes.Route("/{my_path}", "test_endpoint")
-    url = r.url(my_path="path")
-    assert url == "/path"
-
-
-def test_equal():
-    r = routes.Route("/{path_param}", "test_endpoint")
-    r2 = routes.Route("/{path_param}", "test_endpoint")
-    r3 = routes.Route("/test_path", "test_endpoint")
-
-    assert r == r2
-    assert r != r3
-
-
-def test_incoming_matches():
-    # Test Route with one param
-    r = routes.Route("/{greetings}", "test_endpoint")
-    assert r.incoming_matches("/hello") == {"greetings": "hello"}
-    assert r.incoming_matches("/foo") == {"greetings": "foo"}
-
-    # Test Route with two params
-    r = routes.Route("/{greetings}/{name}", "test_endpoint")
-    assert r.incoming_matches("/hi/john") == {"greetings": "hi", "name": "john"}
-    assert r.incoming_matches("/hello/jane") == {"greetings": "hello", "name": "jane"}
-
-    # Test Route with no param
-    r = routes.Route("/hello", "test_endpoint")
-    assert r.incoming_matches("/hello") == {}
-    assert r.incoming_matches("/bye") == {}
-
-
-def test_incoming_matches_cache():
-    r = routes.Route("/hello", "test_endpoint")
-    r.incoming_matches("/hello")
-    assert r.incoming_matches.cache_info().hits == 0
-    r.incoming_matches("/hello")
-    assert r.incoming_matches.cache_info().hits == 1
-
-
-def test_incoming_matches_with_concrete_path_no_match():
-    r = routes.Route("/concrete_path", "test_endpoint")
-    assert r.incoming_matches("hello") == {}
-
-
-@pytest.mark.parametrize(
-    "route, match, expected",
-    [
-        pytest.param(
-            "/{path_param}",
-            "/{path_param}",
-            True,
-            id="with both parametrized path match",
-        ),
-        pytest.param(
-            "/concrete", "/concrete", True, id="with both concrete path match"
-        ),
-        pytest.param("/concrete", "/no_match", False, id="with no match"),
-    ],
-)
-def test_does_match_with_route(route, match, expected):
-    r = routes.Route(route, "test_endpoint")
-    assert r.does_match(match) == expected
-
-
-@pytest.mark.parametrize(
-    "path_param, expected_weight",
-    [
-        pytest.param("/{greetings}", (True, True, -1), id="with one param"),
-        pytest.param(
-            "/{greetings}.{name}", (True, True, -2), id="with 2 params and dot in the middle"
-        ),
-        pytest.param("/{greetings}/{name}", (True, True, -2), id="with 2 param and subpath"),
-        pytest.param(
-            "/{greetings}/{name}/{hello}", (True, True, -3), id="with 3 param and subpath"
-        ),
-        pytest.param(
-            "/{greetings}_{name}", (True, True, -2), id="with 2 param and underscore"
-        ),
-        pytest.param("/{greetings}/9roda", (True, False, -1), id="with one param"),
-        pytest.param(
-            "/{greetings}.{name}/9roda", (True, False, -2), id="with 2 params and dot in the middle"
-        ),
-        pytest.param("/{greetings}/{name}/9roda", (True, False, -2), id="with 2 param and subpath"),
-        pytest.param(
-            "/{greetings}/{name}/{hello}/9roda", (True, False, -3), id="with 3 param and subpath"
-        ),
-        pytest.param(
-            "/{greetings}_{name}/9roda", (True, False, -2), id="with 2 param and underscore"
-        ),
-        pytest.param("/hello", (False, False, 0), id="with 2 param and underscore"),
-    ],
-)
-def test_weight(path_param, expected_weight):
-    r = routes.Route(path_param, "test_endpoint")
-    assert r._weight() == expected_weight
@@ -8,7 +8,7 @@ from responder import status_codes
        pytest.param(101, True, id="Normal 101"),
        pytest.param(199, True, id="Not actual status code but within 100"),
        pytest.param(0, False, id="Zero case (below 100)"),
-        pytest.param(200, False, id="Above 100")
+        pytest.param(200, False, id="Above 100"),
    ],
 )
 def test_is_100(status_code, expected):
@@ -21,7 +21,7 @@ def test_is_100(status_code, expected):
        pytest.param(201, True, id="Normal 201"),
        pytest.param(299, True, id="Not actual status code but within 200"),
        pytest.param(0, False, id="Zero case (below 200)"),
-        pytest.param(300, False, id="Above 200")
+        pytest.param(300, False, id="Above 200"),
    ],
 )
 def test_is_200(status_code, expected):
@@ -34,7 +34,7 @@ def test_is_200(status_code, expected):
        pytest.param(301, True, id="Normal 301"),
        pytest.param(399, True, id="Not actual status code but within 300"),
        pytest.param(0, False, id="Zero case (below 300)"),
-        pytest.param(400, False, id="Above 300")
+        pytest.param(400, False, id="Above 300"),
    ],
 )
 def test_is_300(status_code, expected):
@@ -47,7 +47,7 @@ def test_is_300(status_code, expected):
        pytest.param(401, True, id="Normal 401"),
        pytest.param(499, True, id="Not actual status code but within 400"),
        pytest.param(0, False, id="Zero case (below 400)"),
-        pytest.param(500, False, id="Above 400")
+        pytest.param(500, False, id="Above 400"),
    ],
 )
 def test_is_400(status_code, expected):
@@ -57,10 +57,10 @@ def test_is_400(status_code, expected):
@pytest.mark.parametrize(
    "status_code, expected",
    [
-        pytest.param(501, True, id="Normal 401"),
-        pytest.param(599, True, id="Not actual status code but within 400"),
-        pytest.param(0, False, id="Zero case (below 400)"),
-        pytest.param(600, False, id="Above 500")
+        pytest.param(501, True, id="Normal 501"),
+        pytest.param(599, True, id="Not actual status code but within 500"),
+        pytest.param(0, False, id="Zero case (below 500)"),
+        pytest.param(600, False, id="Above 500"),
    ],
 )
 def test_is_500(status_code, expected):