Packaging: Use versioningit for maintaining the package version

The Debian package builder has been saved to `bin/mkdeb.py` for now. It
needs to be refurbished into a `poethepoet` task subsequently.

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/test.yaml

@@ -0,0 +1,41 @@
+name: "Tests"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request: ~
+  workflow_dispatch:
+
+# Cancel redundant in-progress jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: "Python ${{ matrix.python-version }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [
+          "ubuntu-latest",
+          "macos-12",
+          "macos-latest",
+        ]
+        python-version: [
+          "3.10",
+          "3.11",
+          "3.12",
+          "3.13",
+          "pypy3.10",
+        ]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - uses: yezz123/setup-uv@v4
+    - run: uv pip install --editable '.[graphql,develop,test]' --system
+    - run: poe check

.gitignore

@@ -1,3 +1,4 @@
+.venv*
 .vscode/
 .cache
 .idea

.travis.yml

@@ -1,13 +0,0 @@
-language: python
-python:
-  - "3.6"
-
-# command to install dependencies
-install:
-  - "pip install pipenv --upgrade-strategy=only-if-needed"
-  - "pipenv install --dev"
-
-# command to run the dependencies
-script:
-  - "pytest"
-  - "black responder tests setup.py --check"

CHANGELOG.md

@@ -1,115 +1,381 @@
-# v1.3.0
+# Changelog
 
-## Fixed
+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
+### Added
+
 - Stream support via `resp.stream`.
 - Cookie directives via `resp.set_cookie`.
 - Add `resp.html` to send HTML.
 - Other improvements.
 
-# v1.1.1
+## [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
+
+### Changed
+
+- Improved exceptions.
+
+## [v0.3.2] - 2018-10-25
+
+### Changed
 
-# v0.3.2
 - 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
+
+### Changed
+
+- Improvements to sequential media reading.
+
+## [v0.1.4] - 2018-10-19
+
+### Fixed
 
-# v0.1.4
 - 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
 
-# v0.0.6:
- - Ability to mount WSGI apps.
- - Supply content-type when serving up the schema.
+### Changed
 
-# v0.0.5:
- - OpenAPI Schema support.
- - Safe load/dump yaml.
+- Immutable Request object.
 
-# v0.0.4:
- - Asynchronous support for data uploads.
- - Bug fixes.
+## [v0.0.6] - 2018-10-16
+
+### Added
+
+- Ability to mount WSGI apps.
+- Supply content-type when serving up the schema.
+
+## [v0.0.5] - 2018-10-15
+
+### Added
+
+- OpenAPI Schema support.
+- Safe load/dump yaml.
+
+## [v0.0.4] - 2018-10-15
+
+### Added
+
+- Asynchronous support for data uploads.
+
+### Fixed
 
-# v0.0.3:
 - 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

DEVELOP.md

@@ -0,0 +1,33 @@
+# Development Sandbox
+
+## Setup
+
+Acquire sources and install project in editable mode.
+```shell
+git clone https://github.com/kennethreitz/responder
+cd responder
+python3 -m venv .venv
+source .venv/bin/activate
+pip install --editable '.[graphql,develop,release,test]'
+```
+
+## Operations
+
+Invoke linter and software tests.
+```shell
+poe check
+```
+
+Format code.
+```shell
+poe format
+```
+
+
+## Release
+
+```shell
+git tag v2.1.0
+git push --tags
+poe release
+```

LICENSE

@@ -1,13 +1,178 @@
-Copyright 2018 Kenneth Reitz
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

Pipfile

@@ -1,23 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-responder = {editable = true, path = "."}
-
-[dev-packages]
-pytest = "*"
-"flake8" = "*"
-black = "*"
-twine = "*"
-flask = "*"
-sphinx = "*"
-marshmallow = "*"
-pytest-cov = "*"
-
-[requires]
-python_version = "3.7"
-
-[pipenv]
-allow_prereleases = true

Pipfile.lock

@@ -1,751 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "7bbe1f0addd73250027de73d6fb749aa2be3149af9744b107820c5e10498428e"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.7"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "aiofiles": {
-            "hashes": [
-                "sha256:021ea0ba314a86027c166ecc4b4c07f2d40fc0f4b3a950d1868a0f2571c2bbee",
-                "sha256:1e644c2573f953664368de28d2aa4c89dfd64550429d0c27c4680ccd3aa4985d"
-            ],
-            "version": "==0.4.0"
-        },
-        "aniso8601": {
-            "hashes": [
-                "sha256:7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802",
-                "sha256:94f90871fcd314a458a3d4eca1c84448efbd200e86f55fe4c733c7a40149ef50"
-            ],
-            "version": "==3.0.2"
-        },
-        "apispec": {
-            "hashes": [
-                "sha256:57a7b81fd19fff0663a7e5ffd196eaea79b5364151ed2b65533be36d55e0229c",
-                "sha256:b45def53903516e67e8584ee41f34bc60c3e4acace6892b69340293ea20f3caa"
-            ],
-            "version": "==1.0.0"
-        },
-        "apistar": {
-            "hashes": [
-                "sha256:4338b24468b49526ceac4a8f84046056081ee747f373ca8d0647bd6b2344c895"
-            ],
-            "version": "==0.6.0"
-        },
-        "asgiref": {
-            "hashes": [
-                "sha256:9b05dcd41a6a89ca8c6e7f7e4089c3f3e76b5af60aebb81ae6d455ad81989c97",
-                "sha256:b21dc4c43d7aba5a844f4c48b8f49d56277bc34937fd9f9cb93ec97fde7e3082"
-            ],
-            "version": "==2.3.2"
-        },
-        "async-timeout": {
-            "hashes": [
-                "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f",
-                "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"
-            ],
-            "version": "==3.0.1"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7",
-                "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033"
-            ],
-            "version": "==2018.11.29"
-        },
-        "chardet": {
-            "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
-            ],
-            "version": "==3.0.4"
-        },
-        "click": {
-            "hashes": [
-                "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13",
-                "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"
-            ],
-            "version": "==7.0"
-        },
-        "docopt": {
-            "hashes": [
-                "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
-            ],
-            "version": "==0.6.2"
-        },
-        "graphene": {
-            "hashes": [
-                "sha256:b8ec446d17fa68721636eaad3d6adc1a378cb6323e219814c8f98c9928fc9642",
-                "sha256:faa26573b598b22ffd274e2fd7a4c52efa405dcca96e01a62239482246248aa3"
-            ],
-            "version": "==2.1.3"
-        },
-        "graphql-core": {
-            "hashes": [
-                "sha256:889e869be5574d02af77baf1f30b5db9ca2959f1c9f5be7b2863ead5a3ec6181",
-                "sha256:9462e22e32c7f03b667373ec0a84d95fba10e8ce2ead08f29fbddc63b671b0c1"
-            ],
-            "version": "==2.1"
-        },
-        "graphql-relay": {
-            "hashes": [
-                "sha256:2716b7245d97091af21abf096fabafac576905096d21ba7118fba722596f65db"
-            ],
-            "version": "==0.4.5"
-        },
-        "graphql-server-core": {
-            "hashes": [
-                "sha256:e5f82add4b3d5580aa1f1e7d9f00e944ad3abe1b65eb337e611d6a77cc20f231"
-            ],
-            "version": "==1.1.1"
-        },
-        "h11": {
-            "hashes": [
-                "sha256:acca6a44cb52a32ab442b1779adf0875c443c689e9e028f8d831a3769f9c5208",
-                "sha256:f2b1ca39bfed357d1f19ac732913d5f9faa54a5062eca7d2ec3a916cfb7ae4c7"
-            ],
-            "version": "==0.8.1"
-        },
-        "httptools": {
-            "hashes": [
-                "sha256:04c7703bbef0e8ca28b09811547352b8c7c20549eab70dc24e536bb24fd2b7c5"
-            ],
-            "version": "==0.0.11"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
-                "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
-            ],
-            "version": "==2.8"
-        },
-        "itsdangerous": {
-            "hashes": [
-                "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
-                "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
-            ],
-            "version": "==1.1.0"
-        },
-        "jinja2": {
-            "hashes": [
-                "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
-                "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
-            ],
-            "version": "==2.10"
-        },
-        "markupsafe": {
-            "hashes": [
-                "sha256:048ef924c1623740e70204aa7143ec592504045ae4429b59c30054cb31e3c432",
-                "sha256:130f844e7f5bdd8e9f3f42e7102ef1d49b2e6fdf0d7526df3f87281a532d8c8b",
-                "sha256:19f637c2ac5ae9da8bfd98cef74d64b7e1bb8a63038a3505cd182c3fac5eb4d9",
-                "sha256:1b8a7a87ad1b92bd887568ce54b23565f3fd7018c4180136e1cf412b405a47af",
-                "sha256:1c25694ca680b6919de53a4bb3bdd0602beafc63ff001fea2f2fc16ec3a11834",
-                "sha256:1f19ef5d3908110e1e891deefb5586aae1b49a7440db952454b4e281b41620cd",
-                "sha256:1fa6058938190ebe8290e5cae6c351e14e7bb44505c4a7624555ce57fbbeba0d",
-                "sha256:31cbb1359e8c25f9f48e156e59e2eaad51cd5242c05ed18a8de6dbe85184e4b7",
-                "sha256:3e835d8841ae7863f64e40e19477f7eb398674da6a47f09871673742531e6f4b",
-                "sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3",
-                "sha256:525396ee324ee2da82919f2ee9c9e73b012f23e7640131dd1b53a90206a0f09c",
-                "sha256:52b07fbc32032c21ad4ab060fec137b76eb804c4b9a1c7c7dc562549306afad2",
-                "sha256:52ccb45e77a1085ec5461cde794e1aa037df79f473cbc69b974e73940655c8d7",
-                "sha256:5c3fbebd7de20ce93103cb3183b47671f2885307df4a17a0ad56a1dd51273d36",
-                "sha256:5e5851969aea17660e55f6a3be00037a25b96a9b44d2083651812c99d53b14d1",
-                "sha256:5edfa27b2d3eefa2210fb2f5d539fbed81722b49f083b2c6566455eb7422fd7e",
-                "sha256:7d263e5770efddf465a9e31b78362d84d015cc894ca2c131901a4445eaa61ee1",
-                "sha256:83381342bfc22b3c8c06f2dd93a505413888694302de25add756254beee8449c",
-                "sha256:857eebb2c1dc60e4219ec8e98dfa19553dae33608237e107db9c6078b1167856",
-                "sha256:98e439297f78fca3a6169fd330fbe88d78b3bb72f967ad9961bcac0d7fdd1550",
-                "sha256:bf54103892a83c64db58125b3f2a43df6d2cb2d28889f14c78519394feb41492",
-                "sha256:d9ac82be533394d341b41d78aca7ed0e0f4ba5a2231602e2f05aa87f25c51672",
-                "sha256:e982fe07ede9fada6ff6705af70514a52beb1b2c3d25d4e873e82114cf3c5401",
-                "sha256:edce2ea7f3dfc981c4ddc97add8a61381d9642dc3273737e756517cc03e84dd6",
-                "sha256:efdc45ef1afc238db84cb4963aa689c0408912a0239b0721cb172b4016eb31d6",
-                "sha256:f137c02498f8b935892d5c0172560d7ab54bc45039de8805075e19079c639a9c",
-                "sha256:f82e347a72f955b7017a39708a3667f106e6ad4d10b25f237396a7115d8ed5fd",
-                "sha256:fb7c206e01ad85ce57feeaaa0bf784b97fa3cad0d4a5737bc5295785f5c613a1"
-            ],
-            "version": "==1.1.0"
-        },
-        "marshmallow": {
-            "hashes": [
-                "sha256:7f9aba737a59dd3c6c6c79846f1df2fbfe036c17f038bbc2c83911b7304a90e1",
-                "sha256:b41cc52fe0491bdb8aa3e2186ca57d478d9ef69dba87fe37d309aa8a08fd30dd"
-            ],
-            "version": "==3.0.0rc4"
-        },
-        "parse": {
-            "hashes": [
-                "sha256:870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2"
-            ],
-            "version": "==1.11.1"
-        },
-        "promise": {
-            "hashes": [
-                "sha256:2ebbfc10b7abf6354403ed785fe4f04b9dfd421eb1a474ac8d187022228332af",
-                "sha256:348f5f6c3edd4fd47c9cd65aed03ac1b31136d375aa63871a57d3e444c85655c"
-            ],
-            "version": "==2.2.1"
-        },
-        "python-multipart": {
-            "hashes": [
-                "sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"
-            ],
-            "version": "==0.0.5"
-        },
-        "pyyaml": {
-            "hashes": [
-                "sha256:254bf6fda2b7c651837acb2c718e213df29d531eebf00edb54743d10bcb694eb",
-                "sha256:3108529b78577327d15eec243f0ff348a0640b0c3478d67ad7f5648f93bac3e2",
-                "sha256:3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76",
-                "sha256:8d6d96001aa7f0a6a4a95e8143225b5d06e41b1131044913fecb8f85a125714b",
-                "sha256:c8a88edd93ee29ede719080b2be6cb2333dfee1dccba213b422a9c8e97f2967b"
-            ],
-            "version": "==4.2b4"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
-                "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
-            ],
-            "version": "==2.21.0"
-        },
-        "requests-toolbelt": {
-            "hashes": [
-                "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f",
-                "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"
-            ],
-            "version": "==0.9.1"
-        },
-        "responder": {
-            "editable": true,
-            "path": "."
-        },
-        "rfc3986": {
-            "hashes": [
-                "sha256:5ad82677b02b88c8d24f6511b4ee9baa5e7da675599b479fbbc5c9c578b5b737",
-                "sha256:bc3ae4b7cd88a99eff2d3900fcb858d44562fd7f273fc07aeef568b9bb6fc4e1"
-            ],
-            "version": "==1.2.0"
-        },
-        "rx": {
-            "hashes": [
-                "sha256:7e6919a3159d6c6cee266fdeeb48783118bab20177e38fa5d6a8ebd24a132f72",
-                "sha256:e7ccf18bb8e76f8a44557febd5c149c2ad36df19442f678be529c710b0553d85"
-            ],
-            "version": "==3.0.0a2"
-        },
-        "six": {
-            "hashes": [
-                "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
-                "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
-            ],
-            "version": "==1.12.0"
-        },
-        "starlette": {
-            "hashes": [
-                "sha256:8bc2e41f7638290379ae91450413796f92d6c97b88a6b754f3c1a7f8bc7a07d6"
-            ],
-            "version": "==0.10.7"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39",
-                "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"
-            ],
-            "version": "==1.24.1"
-        },
-        "uvicorn": {
-            "hashes": [
-                "sha256:f27889a332ee5c55b4841b11b2392d00dac079f39063fabc1e13e18ada3eb7ba"
-            ],
-            "version": "==0.4.5"
-        },
-        "uvloop": {
-            "hashes": [
-                "sha256:198fe0c196056930ec6c4a0a878e531a66d15467ca7c74a875aa90271f0c6e3f",
-                "sha256:1c175f47d34b84e33c0e312f4987c927ea004afc3a5f05d2f0f610d71d0e4c89",
-                "sha256:1c47f197be8f0a3c651dd20be1e1bd43268186246f246d4e86c91e95a89e4865",
-                "sha256:3fd4943570d20e8cd4d9f0a3190ebd5cf040e5610b685e05c878128a11f7ad14",
-                "sha256:435e232869923fd2248e4ca0ad73e24a5b4debf40bed9dcde133cfe1bef98a7a",
-                "sha256:9cfdb966ae804c46b96c92207dfd2174935ffc70e706e42e1c94c60d16dbe860",
-                "sha256:a585781443eeb2edb858f8c08c503aac237a5f1bebf0c84ea8340cc337afa408",
-                "sha256:b296493e033846e46488a6aa227a75c790091f5ee5456ec637bb0badad1e8851",
-                "sha256:c684047c6cf6d697ba37872fb1b4489012ea91f3f802c8fbb9c367c4902e88dc",
-                "sha256:da5a59d8812188b57b5783c7fb78891d14dd1050b6259680e0dbd4253d7d0f64"
-            ],
-            "version": "==0.12.1"
-        },
-        "websockets": {
-            "hashes": [
-                "sha256:04b42a1b57096ffa5627d6a78ea1ff7fad3bc2c0331ffc17bc32a4024da7fea0",
-                "sha256:08e3c3e0535befa4f0c4443824496c03ecc25062debbcf895874f8a0b4c97c9f",
-                "sha256:10d89d4326045bf5e15e83e9867c85d686b612822e4d8f149cf4840aab5f46e0",
-                "sha256:232fac8a1978fc1dead4b1c2fa27c7756750fb393eb4ac52f6bc87ba7242b2fa",
-                "sha256:4bf4c8097440eff22bc78ec76fe2a865a6e658b6977a504679aaf08f02c121da",
-                "sha256:51642ea3a00772d1e48fb0c492f0d3ae3b6474f34d20eca005a83f8c9c06c561",
-                "sha256:55d86102282a636e195dad68aaaf85b81d0bef449d7e2ef2ff79ac450bb25d53",
-                "sha256:564d2675682bd497b59907d2205031acbf7d3fadf8c763b689b9ede20300b215",
-                "sha256:5d13bf5197a92149dc0badcc2b699267ff65a867029f465accfca8abab95f412",
-                "sha256:5eda665f6789edb9b57b57a159b9c55482cbe5b046d7db458948370554b16439",
-                "sha256:5edb2524d4032be4564c65dc4f9d01e79fe8fad5f966e5b552f4e5164fef0885",
-                "sha256:79691794288bc51e2a3b8de2bc0272ca8355d0b8503077ea57c0716e840ebaef",
-                "sha256:7fcc8681e9981b9b511cdee7c580d5b005f3bb86b65bde2188e04a29f1d63317",
-                "sha256:8e447e05ec88b1b408a4c9cde85aa6f4b04f06aa874b9f0b8e8319faf51b1fee",
-                "sha256:90ea6b3e7787620bb295a4ae050d2811c807d65b1486749414f78cfd6fb61489",
-                "sha256:9e13239952694b8b831088431d15f771beace10edfcf9ef230cefea14f18508f",
-                "sha256:d40f081187f7b54d7a99d8a5c782eaa4edc335a057aa54c85059272ed826dc09",
-                "sha256:e1df1a58ed2468c7b7ce9a2f9752a32ad08eac2bcd56318625c3647c2cd2da6f",
-                "sha256:e98d0cec437097f09c7834a11c69d79fe6241729b23f656cfc227e93294fc242",
-                "sha256:f8d59627702d2ff27cb495ca1abdea8bd8d581de425c56e93bff6517134e0a9b",
-                "sha256:fc30cdf2e949a2225b012a7911d1d031df3d23e99b7eda7dfc982dc4a860dae9"
-            ],
-            "version": "==7.0"
-        },
-        "whitenoise": {
-            "hashes": [
-                "sha256:118ab3e5f815d380171b100b05b76de2a07612f422368a201a9ffdeefb2251c1",
-                "sha256:42133ddd5229eeb6a0c9899496bdbe56c292394bf8666da77deeb27454c0456a"
-            ],
-            "version": "==4.1.2"
-        }
-    },
-    "develop": {
-        "alabaster": {
-            "hashes": [
-                "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359",
-                "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"
-            ],
-            "version": "==0.7.12"
-        },
-        "appdirs": {
-            "hashes": [
-                "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92",
-                "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"
-            ],
-            "version": "==1.4.3"
-        },
-        "atomicwrites": {
-            "hashes": [
-                "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4",
-                "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"
-            ],
-            "version": "==1.3.0"
-        },
-        "attrs": {
-            "hashes": [
-                "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69",
-                "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb"
-            ],
-            "version": "==18.2.0"
-        },
-        "babel": {
-            "hashes": [
-                "sha256:6778d85147d5d85345c14a26aada5e478ab04e39b078b0745ee6870c2b5cf669",
-                "sha256:8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"
-            ],
-            "version": "==2.6.0"
-        },
-        "black": {
-            "hashes": [
-                "sha256:817243426042db1d36617910df579a54f1afd659adb96fc5032fcf4b36209739",
-                "sha256:e030a9a28f542debc08acceb273f228ac422798e5215ba2a791a6ddeaaca22a5"
-            ],
-            "index": "pypi",
-            "version": "==18.9b0"
-        },
-        "bleach": {
-            "hashes": [
-                "sha256:213336e49e102af26d9cde77dd2d0397afabc5a6bf2fed985dc35b5d1e285a16",
-                "sha256:3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"
-            ],
-            "version": "==3.1.0"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7",
-                "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033"
-            ],
-            "version": "==2018.11.29"
-        },
-        "chardet": {
-            "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
-            ],
-            "version": "==3.0.4"
-        },
-        "click": {
-            "hashes": [
-                "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13",
-                "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"
-            ],
-            "version": "==7.0"
-        },
-        "coverage": {
-            "hashes": [
-                "sha256:029c69deaeeeae1b15bc6c59f0ffa28aa8473721c614a23f2c2976dec245cd12",
-                "sha256:02abbbebc6e9d5abe13cd28b5e963dedb6ffb51c146c916d17b18f141acd9947",
-                "sha256:1bbfe5b82a3921d285e999c6d256c1e16b31c554c29da62d326f86c173d30337",
-                "sha256:210c02f923df33a8d0e461c86fdcbbb17228ff4f6d92609fc06370a98d283c2d",
-                "sha256:2d0807ba935f540d20b49d5bf1c0237b90ce81e133402feda906e540003f2f7a",
-                "sha256:35d7a013874a7c927ce997350d314144ffc5465faf787bb4e46e6c4f381ef562",
-                "sha256:3636f9d0dcb01aed4180ef2e57a4e34bb4cac3ecd203c2a23db8526d86ab2fb4",
-                "sha256:42f4be770af2455a75e4640f033a82c62f3fb0d7a074123266e143269d7010ef",
-                "sha256:48440b25ba6cda72d4c638f3a9efa827b5b87b489c96ab5f4ff597d976413156",
-                "sha256:4dac8dfd1acf6a3ac657475dfdc66c621f291b1b7422a939cc33c13ac5356473",
-                "sha256:4e8474771c69c2991d5eab65764289a7dd450bbea050bc0ebb42b678d8222b42",
-                "sha256:551f10ddfeff56a1325e5a34eff304c5892aa981fd810babb98bfee77ee2fb17",
-                "sha256:5b104982f1809c1577912519eb249f17d9d7e66304ad026666cb60a5ef73309c",
-                "sha256:5c62aef73dfc87bfcca32cee149a1a7a602bc74bac72223236b0023543511c88",
-                "sha256:633151f8d1ad9467b9f7e90854a7f46ed8f2919e8bc7d98d737833e8938fc081",
-                "sha256:772207b9e2d5bf3f9d283b88915723e4e92d9a62c83f44ec92b9bd0cd685541b",
-                "sha256:7d5e02f647cd727afc2659ec14d4d1cc0508c47e6cfb07aea33d7aa9ca94d288",
-                "sha256:a9798a4111abb0f94584000ba2a2c74841f2cfe5f9254709756367aabbae0541",
-                "sha256:b38ea741ab9e35bfa7015c93c93bbd6a1623428f97a67083fc8ebd366238b91f",
-                "sha256:b6a5478c904236543c0347db8a05fac6fc0bd574c870e7970faa88e1d9890044",
-                "sha256:c6248bfc1de36a3844685a2e10ba17c18119ba6252547f921062a323fb31bff1",
-                "sha256:c705ab445936457359b1424ef25ccc0098b0491b26064677c39f1d14a539f056",
-                "sha256:d95a363d663ceee647291131dbd213af258df24f41350246842481ec3709bd33",
-                "sha256:e27265eb80cdc5dab55a40ef6f890e04ecc618649ad3da5265f128b141f93f78",
-                "sha256:ebc276c9cb5d917bd2ae959f84ffc279acafa9c9b50b0fa436ebb70bbe2166ea",
-                "sha256:f4d229866d030863d0fe3bf297d6d11e6133ca15bbb41ed2534a8b9a3d6bd061",
-                "sha256:f95675bd88b51474d4fe5165f3266f419ce754ffadfb97f10323931fa9ac95e5",
-                "sha256:f95bc54fb6d61b9f9ff09c4ae8ff6a3f5edc937cda3ca36fc937302a7c152bf1",
-                "sha256:fd0f6be53de40683584e5331c341e65a679dbe5ec489a0697cec7c2ef1a48cda"
-            ],
-            "version": "==5.0a4"
-        },
-        "docutils": {
-            "hashes": [
-                "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
-                "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
-                "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
-            ],
-            "version": "==0.14"
-        },
-        "entrypoints": {
-            "hashes": [
-                "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
-                "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"
-            ],
-            "version": "==0.3"
-        },
-        "flake8": {
-            "hashes": [
-                "sha256:6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048",
-                "sha256:6eab21c6e34df2c05416faa40d0c59963008fff29b6f0ccfe8fa28152ab3e383"
-            ],
-            "index": "pypi",
-            "version": "==3.7.6"
-        },
-        "flask": {
-            "hashes": [
-                "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48",
-                "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05"
-            ],
-            "index": "pypi",
-            "version": "==1.0.2"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
-                "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
-            ],
-            "version": "==2.8"
-        },
-        "imagesize": {
-            "hashes": [
-                "sha256:3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8",
-                "sha256:f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"
-            ],
-            "version": "==1.1.0"
-        },
-        "itsdangerous": {
-            "hashes": [
-                "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
-                "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
-            ],
-            "version": "==1.1.0"
-        },
-        "jinja2": {
-            "hashes": [
-                "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
-                "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
-            ],
-            "version": "==2.10"
-        },
-        "markupsafe": {
-            "hashes": [
-                "sha256:048ef924c1623740e70204aa7143ec592504045ae4429b59c30054cb31e3c432",
-                "sha256:130f844e7f5bdd8e9f3f42e7102ef1d49b2e6fdf0d7526df3f87281a532d8c8b",
-                "sha256:19f637c2ac5ae9da8bfd98cef74d64b7e1bb8a63038a3505cd182c3fac5eb4d9",
-                "sha256:1b8a7a87ad1b92bd887568ce54b23565f3fd7018c4180136e1cf412b405a47af",
-                "sha256:1c25694ca680b6919de53a4bb3bdd0602beafc63ff001fea2f2fc16ec3a11834",
-                "sha256:1f19ef5d3908110e1e891deefb5586aae1b49a7440db952454b4e281b41620cd",
-                "sha256:1fa6058938190ebe8290e5cae6c351e14e7bb44505c4a7624555ce57fbbeba0d",
-                "sha256:31cbb1359e8c25f9f48e156e59e2eaad51cd5242c05ed18a8de6dbe85184e4b7",
-                "sha256:3e835d8841ae7863f64e40e19477f7eb398674da6a47f09871673742531e6f4b",
-                "sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3",
-                "sha256:525396ee324ee2da82919f2ee9c9e73b012f23e7640131dd1b53a90206a0f09c",
-                "sha256:52b07fbc32032c21ad4ab060fec137b76eb804c4b9a1c7c7dc562549306afad2",
-                "sha256:52ccb45e77a1085ec5461cde794e1aa037df79f473cbc69b974e73940655c8d7",
-                "sha256:5c3fbebd7de20ce93103cb3183b47671f2885307df4a17a0ad56a1dd51273d36",
-                "sha256:5e5851969aea17660e55f6a3be00037a25b96a9b44d2083651812c99d53b14d1",
-                "sha256:5edfa27b2d3eefa2210fb2f5d539fbed81722b49f083b2c6566455eb7422fd7e",
-                "sha256:7d263e5770efddf465a9e31b78362d84d015cc894ca2c131901a4445eaa61ee1",
-                "sha256:83381342bfc22b3c8c06f2dd93a505413888694302de25add756254beee8449c",
-                "sha256:857eebb2c1dc60e4219ec8e98dfa19553dae33608237e107db9c6078b1167856",
-                "sha256:98e439297f78fca3a6169fd330fbe88d78b3bb72f967ad9961bcac0d7fdd1550",
-                "sha256:bf54103892a83c64db58125b3f2a43df6d2cb2d28889f14c78519394feb41492",
-                "sha256:d9ac82be533394d341b41d78aca7ed0e0f4ba5a2231602e2f05aa87f25c51672",
-                "sha256:e982fe07ede9fada6ff6705af70514a52beb1b2c3d25d4e873e82114cf3c5401",
-                "sha256:edce2ea7f3dfc981c4ddc97add8a61381d9642dc3273737e756517cc03e84dd6",
-                "sha256:efdc45ef1afc238db84cb4963aa689c0408912a0239b0721cb172b4016eb31d6",
-                "sha256:f137c02498f8b935892d5c0172560d7ab54bc45039de8805075e19079c639a9c",
-                "sha256:f82e347a72f955b7017a39708a3667f106e6ad4d10b25f237396a7115d8ed5fd",
-                "sha256:fb7c206e01ad85ce57feeaaa0bf784b97fa3cad0d4a5737bc5295785f5c613a1"
-            ],
-            "version": "==1.1.0"
-        },
-        "marshmallow": {
-            "hashes": [
-                "sha256:7f9aba737a59dd3c6c6c79846f1df2fbfe036c17f038bbc2c83911b7304a90e1",
-                "sha256:b41cc52fe0491bdb8aa3e2186ca57d478d9ef69dba87fe37d309aa8a08fd30dd"
-            ],
-            "version": "==3.0.0rc4"
-        },
-        "mccabe": {
-            "hashes": [
-                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
-                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
-            ],
-            "version": "==0.6.1"
-        },
-        "more-itertools": {
-            "hashes": [
-                "sha256:0125e8f60e9e031347105eb1682cef932f5e97d7b9a1a28d9bf00c22a5daef40",
-                "sha256:590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1"
-            ],
-            "markers": "python_version > '2.7'",
-            "version": "==6.0.0"
-        },
-        "packaging": {
-            "hashes": [
-                "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af",
-                "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3"
-            ],
-            "version": "==19.0"
-        },
-        "pkginfo": {
-            "hashes": [
-                "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb",
-                "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"
-            ],
-            "version": "==1.5.0.1"
-        },
-        "pluggy": {
-            "hashes": [
-                "sha256:8ddc32f03971bfdf900a81961a48ccf2fb677cf7715108f85295c67405798616",
-                "sha256:980710797ff6a041e9a73a5787804f848996ecaa6f8a1b1e08224a5894f2074a"
-            ],
-            "version": "==0.8.1"
-        },
-        "py": {
-            "hashes": [
-                "sha256:bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694",
-                "sha256:e76826342cefe3c3d5f7e8ee4316b80d1dd8a300781612ddbc765c17ba25a6c6"
-            ],
-            "version": "==1.7.0"
-        },
-        "pycodestyle": {
-            "hashes": [
-                "sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56",
-                "sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"
-            ],
-            "version": "==2.5.0"
-        },
-        "pyflakes": {
-            "hashes": [
-                "sha256:5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d",
-                "sha256:f277f9ca3e55de669fba45b7393a1449009cff5a37d1af10ebb76c52765269cd"
-            ],
-            "version": "==2.1.0"
-        },
-        "pygments": {
-            "hashes": [
-                "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a",
-                "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"
-            ],
-            "version": "==2.3.1"
-        },
-        "pyparsing": {
-            "hashes": [
-                "sha256:66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a",
-                "sha256:f6c5ef0d7480ad048c054c37632c67fca55299990fff127850181659eea33fc3"
-            ],
-            "version": "==2.3.1"
-        },
-        "pytest": {
-            "hashes": [
-                "sha256:067a1d4bf827ffdd56ad21bd46674703fce77c5957f6c1eef731f6146bfcef1c",
-                "sha256:9687049d53695ad45cf5fdc7bbd51f0c49f1ea3ecfc4b7f3fde7501b541f17f4"
-            ],
-            "index": "pypi",
-            "version": "==4.3.0"
-        },
-        "pytest-cov": {
-            "hashes": [
-                "sha256:0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33",
-                "sha256:230ef817450ab0699c6cc3c9c8f7a829c34674456f2ed8df1fe1d39780f7c87f"
-            ],
-            "index": "pypi",
-            "version": "==2.6.1"
-        },
-        "pytz": {
-            "hashes": [
-                "sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9",
-                "sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"
-            ],
-            "version": "==2018.9"
-        },
-        "readme-renderer": {
-            "hashes": [
-                "sha256:bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f",
-                "sha256:c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d"
-            ],
-            "version": "==24.0"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
-                "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
-            ],
-            "version": "==2.21.0"
-        },
-        "requests-toolbelt": {
-            "hashes": [
-                "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f",
-                "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"
-            ],
-            "version": "==0.9.1"
-        },
-        "six": {
-            "hashes": [
-                "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
-                "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
-            ],
-            "version": "==1.12.0"
-        },
-        "snowballstemmer": {
-            "hashes": [
-                "sha256:919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128",
-                "sha256:9f3bcd3c401c3e862ec0ebe6d2c069ebc012ce142cce209c098ccb5b09136e89"
-            ],
-            "version": "==1.2.1"
-        },
-        "sphinx": {
-            "hashes": [
-                "sha256:230af939a2f678ab4f2a0a948c3b24a822a0d280821859caaefb750ef7413003",
-                "sha256:835c701420102a0a71ba2ed54a5bada2da6fd01263bf6dc8c5c80c798e27709c"
-            ],
-            "index": "pypi",
-            "version": "==2.0.0b1"
-        },
-        "sphinxcontrib-applehelp": {
-            "hashes": [
-                "sha256:edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897",
-                "sha256:fb8dee85af95e5c30c91f10e7eb3c8967308518e0f7488a2828ef7bc191d0d5d"
-            ],
-            "version": "==1.0.1"
-        },
-        "sphinxcontrib-devhelp": {
-            "hashes": [
-                "sha256:6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34",
-                "sha256:9512ecb00a2b0821a146736b39f7aeb90759834b07e81e8cc23a9c70bacb9981"
-            ],
-            "version": "==1.0.1"
-        },
-        "sphinxcontrib-htmlhelp": {
-            "hashes": [
-                "sha256:0d691ca8edf5995fbacfe69b191914256071a94cbad03c3688dca47385c9206c",
-                "sha256:e31c8271f5a8f04b620a500c0442a7d5cfc1a732fa5c10ec363f90fe72af0cb8"
-            ],
-            "version": "==1.0.1"
-        },
-        "sphinxcontrib-jsmath": {
-            "hashes": [
-                "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178",
-                "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"
-            ],
-            "version": "==1.0.1"
-        },
-        "sphinxcontrib-qthelp": {
-            "hashes": [
-                "sha256:18ec9f74ea2c92fd512d5f3b532d6ab4ac2be76b12cc2490f7729842ba2a60c9",
-                "sha256:f39159b45de6d3d86c30874a3220be4f8e75ed12c71aff50cb8b2cac46e240f0"
-            ],
-            "version": "==1.0.1"
-        },
-        "sphinxcontrib-serializinghtml": {
-            "hashes": [
-                "sha256:01d9b2617d7e8ddf7a00cae091f08f9fa4db587cc160b493141ee56710810932",
-                "sha256:392187ac558863b8aff0d76dc78e0731fed58f3b06e2b00e22995dcdb630f213"
-            ],
-            "version": "==1.1.1"
-        },
-        "toml": {
-            "hashes": [
-                "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c",
-                "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"
-            ],
-            "version": "==0.10.0"
-        },
-        "tqdm": {
-            "hashes": [
-                "sha256:d385c95361699e5cf7622485d9b9eae2d4864b21cd5a2374a9c381ffed701021",
-                "sha256:e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05"
-            ],
-            "version": "==4.31.1"
-        },
-        "twine": {
-            "hashes": [
-                "sha256:0fb0bfa3df4f62076cab5def36b1a71a2e4acb4d1fa5c97475b048117b1a6446",
-                "sha256:d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc"
-            ],
-            "index": "pypi",
-            "version": "==1.13.0"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39",
-                "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"
-            ],
-            "version": "==1.24.1"
-        },
-        "webencodings": {
-            "hashes": [
-                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
-                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
-            ],
-            "version": "==0.5.1"
-        },
-        "werkzeug": {
-            "hashes": [
-                "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",
-                "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b"
-            ],
-            "version": "==0.14.1"
-        }
-    }
-}

README.md

@@ -1,53 +1,62 @@
 # 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)
-[![Documentation Status](https://readthedocs.org/projects/mybinder/badge/?version=latest)](https://responder.readthedocs.io/en/latest/)
+[![Build Status](https://github.com/kennethreitz/responder/actions/workflows/test.yaml/badge.svg)](https://github.com/kennethreitz/responder/actions/workflows/test.yaml)
+[![Documentation Status](https://github.com/kennethreitz/responder/actions/workflows/pages/pages-build-deployment/badge.svg)](https://responder.kennethreitz.org/)
 [![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)
+[![PyPI Downloads](https://pepy.tech/badge/responder/month)](https://pepy.tech/project/responder/)
+[![Status](https://img.shields.io/pypi/status/responder.svg)](https://pypi.org/project/responder/)
+[![License](https://img.shields.io/pypi/l/responder.svg)](https://pypi.org/project/responder/)
 
-[![](https://farm2.staticflickr.com/1959/43750081370_a4e20752de_o_d.png)](https://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](https://responder.readthedocs.io).
 
-Powered by [Starlette](https://www.starlette.io/). That `async` declaration is optional. [View documentation](https://python-responder.org).
-
-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.
-
+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.
 
 ## Testimonials
 
-> "Pleasantly very taken with python-responder. [@kennethreitz](https://twitter.com/kennethreitz) at his absolute best." —Rudraksh M.K.
+> "Pleasantly very taken with python-responder.
+> [@kennethreitz](https://twitter.com/kennethreitz) at his absolute best." —Rudraksh
+> M.K.
 
-> "ASGI is going to enable all sorts of new high-performance web services. It's awesome to see Responder starting to take advantage of that." — Tom Christie author of [Django REST Framework](https://www.django-rest-framework.org/)
-
-> "I love that you are exploring new patterns. Go go go!" — Danny Greenfield, author of [Two Scoops of Django]()
+> "ASGI is going to enable all sorts of new high-performance web services. It's awesome
+> to see Responder starting to take advantage of that." — Tom Christie author of
+> [Django REST Framework](https://www.django-rest-framework.org/)
 
+> "I love that you are exploring new patterns. Go go go!" — Danny Greenfield, author of
+> [Two Scoops of Django]()
 
 ## More Examples
 
-See [the documentation's feature tour](https://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 most recent stable release:
 
+    pip install --upgrade responder
 
-    $ pipenv install responder --pre
-    ✨🍰✨
+Or, install directly from the repository:
 
-
-Or, install from the development branch:
-
-    $ pipenv install -e git+https://github.com/kennethreitz/responder.git#egg=responder
+    pip install 'responder @ git+https://github.com/kennethreitz/responder.git'
 
 Only **Python 3.6+** is supported.
 
-
 # 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.
+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.content` sends back bytes.
 - Setting `resp.text` sends back unicode, while setting `resp.html` sends back HTML.
@@ -55,21 +64,28 @@ The primary concept here is to bring the niceties that are brought forth from bo
 - 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.
-- 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.
+- 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.
 - **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.
+- 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 file 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 unnecessary in production.
-- GraphQL support, via Graphene. The goal here is to have any GraphQL query exposable at any route, magically.
+- 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.
 
+## Development
 
-----------
-
-[![hacktoberfest](https://hacktoberfest.digitalocean.com/assets/hacktoberfest-2018-social-card-c8d2e1489f647f2e0a26e6f598adeb760872818905b34cd437afc7ac2857ceab.png)](https://hacktoberfest.digitalocean.com/)
+See [Development Sandbox](DEVELOP.md).

bin/mkdeb.py

@@ -0,0 +1,37 @@
+# ruff: noqa: S605, S607
+"""
+Build and publish a .deb package.
+https://pypi.python.org/pypi/stdeb/0.8.5#quickstart-2-just-tell-me-the-fastest-way-to-make-a-deb
+"""
+
+import os
+from shutil import rmtree
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+def get_version():
+    import responder
+
+    return responder.__version__
+
+
+def run():
+    version = get_version()
+    try:
+        print("Removing previous builds")
+        rmtree(os.path.join(here, "deb_dist"))
+    except FileNotFoundError:
+        pass
+    print("Creating Debian package manifest")
+    os.system(
+        "python setup.py --command-packages=stdeb.command sdist_dsc "
+        "-z artful --package3=pipenv --depends3=python3-virtualenv-clone"
+    )
+    print("Building .deb")
+    os.chdir(f"deb_dist/pipenv-{version}")
+    os.system("dpkg-buildpackage -rfakeroot -uc -us")
+
+
+if __name__ == "__main__":
+    run()

docs/requirements.txt

@@ -1,48 +1,6 @@
-alabaster==0.7.12
-appdirs==1.4.3
-atomicwrites==1.2.1
-attrs==18.2.0
-babel==2.6.0
-black==18.9b0
-bleach==3.0.2
-certifi==2018.8.24
-cffi==1.11.5
-chardet==3.0.4
-click==7.0
-cmarkgfm==0.4.2
-colorama==0.4.0 ; sys_platform == 'win32'
-docutils==0.14
-flake8==3.5.0
-flask==1.0.2
-future==0.16.0
-idna==2.7
-imagesize==1.1.0
-itsdangerous==0.24
-jinja2==2.10
-markupsafe==1.0
-mccabe==0.6.1
-more-itertools==4.3.0
-packaging==18.0
-pkginfo==1.4.2
-pluggy==0.7.1
-py==1.7.0
-pycodestyle==2.3.1
-pycparser==2.19
-pyflakes==1.6.0
-pygments==2.2.0
-pyparsing==2.2.2
-pytest==3.8.2
-pytz==2018.5
-readme-renderer==22.0
-requests-toolbelt==0.8.0
-requests==2.19.1
-six==1.11.0
-snowballstemmer==1.2.1
-sphinx==1.8.1
-sphinxcontrib-websupport==1.1.0
-toml==0.10.0
-tqdm==4.26.0
-twine==1.12.1
-urllib3==1.23
-webencodings==0.5.1
-werkzeug==0.14.1
+alabaster<0.8
+jinja2<3.2
+markupsafe<4
+readme-renderer<45
+sphinx>=5,<9
+sphinxcontrib-websupport<2.1

docs/source/_static/custom.css

@@ -1,7 +1,7 @@
 /* Hide module name and default value for environment variable section */
-div[id$='environment-variables'] code.descclassname {
-    display: none;
+div[id$="environment-variables"] code.descclassname {
+  display: none;
 }
-div[id$='environment-variables'] em.property {
-    display: none;
+div[id$="environment-variables"] em.property {
+  display: none;
 }

docs/source/_static/konami.js

@@ -10,142 +10,152 @@
  */
 
 var Konami = function (callback) {
-    var konami = {
-        addEvent: function (obj, type, fn, ref_obj) {
-            if (obj.addEventListener)
-                obj.addEventListener(type, fn, false);
-            else if (obj.attachEvent) {
-                // IE
-                obj["e" + type + fn] = fn;
-                obj[type + fn] = function () {
-                    obj["e" + type + fn](window.event, ref_obj);
-                }
-                obj.attachEvent("on" + type, obj[type + fn]);
-            }
-        },
-        removeEvent: function (obj, eventName, eventCallback) {
-            if (obj.removeEventListener) {
-                obj.removeEventListener(eventName, eventCallback);
-            } else if (obj.attachEvent) {
-                obj.detachEvent(eventName);
-            }
-        },
-        input: "",
-        pattern: "38384040373937396665",
-        keydownHandler: function (e, ref_obj) {
-            if (ref_obj) {
-                konami = ref_obj;
-            } // IE
-            konami.input += e ? e.keyCode : event.keyCode;
-            if (konami.input.length > konami.pattern.length) {
-                konami.input = konami.input.substr((konami.input.length - konami.pattern.length));
-            }
-            if (konami.input === konami.pattern) {
-                konami.code(konami._currentLink);
-                konami.input = '';
-                e.preventDefault();
-                return false;
-            }
-        },
-        load: function (link) {
-            this._currentLink = link;
-            this.addEvent(document, "keydown", this.keydownHandler, this);
-            this.iphone.load(link);
-        },
-        unload: function () {
-            this.removeEvent(document, 'keydown', this.keydownHandler);
-            this.iphone.unload();
-        },
-        code: function (link) {
-            window.location = link
-        },
-        iphone: {
-            start_x: 0,
-            start_y: 0,
-            stop_x: 0,
-            stop_y: 0,
-            tap: false,
-            capture: false,
-            orig_keys: "",
-            keys: ["UP", "UP", "DOWN", "DOWN", "LEFT", "RIGHT", "LEFT", "RIGHT", "TAP", "TAP"],
-            input: [],
-            code: function (link) {
-                konami.code(link);
-            },
-            touchmoveHandler: function (e) {
-                if (e.touches.length === 1 && konami.iphone.capture === true) {
-                    var touch = e.touches[0];
-                    konami.iphone.stop_x = touch.pageX;
-                    konami.iphone.stop_y = touch.pageY;
-                    konami.iphone.tap = false;
-                    konami.iphone.capture = false;
-                    konami.iphone.check_direction();
-                }
-            },
-            touchendHandler: function () {
-                konami.iphone.input.push(konami.iphone.check_direction());
-                
-                if (konami.iphone.input.length > konami.iphone.keys.length) konami.iphone.input.shift();
-                
-                if (konami.iphone.input.length === konami.iphone.keys.length) {
-                    var match = true;
-                    for (var i = 0; i < konami.iphone.keys.length; i++) {
-                        if (konami.iphone.input[i] !== konami.iphone.keys[i]) {
-                            match = false;
-                        }
-                    }
-                    if (match) {
-                        konami.iphone.code(konami._currentLink);
-                    }
-                }
-            },
-            touchstartHandler: function (e) {
-                konami.iphone.start_x = e.changedTouches[0].pageX;
-                konami.iphone.start_y = e.changedTouches[0].pageY;
-                konami.iphone.tap = true;
-                konami.iphone.capture = true;
-            },
-            load: function (link) {
-                this.orig_keys = this.keys;
-                konami.addEvent(document, "touchmove", this.touchmoveHandler);
-                konami.addEvent(document, "touchend", this.touchendHandler, false);
-                konami.addEvent(document, "touchstart", this.touchstartHandler);
-            },
-            unload: function () {
-                konami.removeEvent(document, 'touchmove', this.touchmoveHandler);
-                konami.removeEvent(document, 'touchend', this.touchendHandler);
-                konami.removeEvent(document, 'touchstart', this.touchstartHandler);
-            },
-            check_direction: function () {
-                x_magnitude = Math.abs(this.start_x - this.stop_x);
-                y_magnitude = Math.abs(this.start_y - this.stop_y);
-                x = ((this.start_x - this.stop_x) < 0) ? "RIGHT" : "LEFT";
-                y = ((this.start_y - this.stop_y) < 0) ? "DOWN" : "UP";
-                result = (x_magnitude > y_magnitude) ? x : y;
-                result = (this.tap === true) ? "TAP" : result;
-                return result;
-            }
+  var konami = {
+    addEvent: function (obj, type, fn, ref_obj) {
+      if (obj.addEventListener) obj.addEventListener(type, fn, false);
+      else if (obj.attachEvent) {
+        // IE
+        obj["e" + type + fn] = fn;
+        obj[type + fn] = function () {
+          obj["e" + type + fn](window.event, ref_obj);
+        };
+        obj.attachEvent("on" + type, obj[type + fn]);
+      }
+    },
+    removeEvent: function (obj, eventName, eventCallback) {
+      if (obj.removeEventListener) {
+        obj.removeEventListener(eventName, eventCallback);
+      } else if (obj.attachEvent) {
+        obj.detachEvent(eventName);
+      }
+    },
+    input: "",
+    pattern: "38384040373937396665",
+    keydownHandler: function (e, ref_obj) {
+      if (ref_obj) {
+        konami = ref_obj;
+      } // IE
+      konami.input += e ? e.keyCode : event.keyCode;
+      if (konami.input.length > konami.pattern.length) {
+        konami.input = konami.input.substr(konami.input.length - konami.pattern.length);
+      }
+      if (konami.input === konami.pattern) {
+        konami.code(konami._currentLink);
+        konami.input = "";
+        e.preventDefault();
+        return false;
+      }
+    },
+    load: function (link) {
+      this._currentLink = link;
+      this.addEvent(document, "keydown", this.keydownHandler, this);
+      this.iphone.load(link);
+    },
+    unload: function () {
+      this.removeEvent(document, "keydown", this.keydownHandler);
+      this.iphone.unload();
+    },
+    code: function (link) {
+      window.location = link;
+    },
+    iphone: {
+      start_x: 0,
+      start_y: 0,
+      stop_x: 0,
+      stop_y: 0,
+      tap: false,
+      capture: false,
+      orig_keys: "",
+      keys: [
+        "UP",
+        "UP",
+        "DOWN",
+        "DOWN",
+        "LEFT",
+        "RIGHT",
+        "LEFT",
+        "RIGHT",
+        "TAP",
+        "TAP",
+      ],
+      input: [],
+      code: function (link) {
+        konami.code(link);
+      },
+      touchmoveHandler: function (e) {
+        if (e.touches.length === 1 && konami.iphone.capture === true) {
+          var touch = e.touches[0];
+          konami.iphone.stop_x = touch.pageX;
+          konami.iphone.stop_y = touch.pageY;
+          konami.iphone.tap = false;
+          konami.iphone.capture = false;
+          konami.iphone.check_direction();
         }
-    }
+      },
+      touchendHandler: function () {
+        konami.iphone.input.push(konami.iphone.check_direction());
 
-    typeof callback === "string" && konami.load(callback);
-    if (typeof callback === "function") {
-        konami.code = callback;
-        konami.load();
-    }
+        if (konami.iphone.input.length > konami.iphone.keys.length)
+          konami.iphone.input.shift();
 
-    return konami;
+        if (konami.iphone.input.length === konami.iphone.keys.length) {
+          var match = true;
+          for (var i = 0; i < konami.iphone.keys.length; i++) {
+            if (konami.iphone.input[i] !== konami.iphone.keys[i]) {
+              match = false;
+            }
+          }
+          if (match) {
+            konami.iphone.code(konami._currentLink);
+          }
+        }
+      },
+      touchstartHandler: function (e) {
+        konami.iphone.start_x = e.changedTouches[0].pageX;
+        konami.iphone.start_y = e.changedTouches[0].pageY;
+        konami.iphone.tap = true;
+        konami.iphone.capture = true;
+      },
+      load: function (link) {
+        this.orig_keys = this.keys;
+        konami.addEvent(document, "touchmove", this.touchmoveHandler);
+        konami.addEvent(document, "touchend", this.touchendHandler, false);
+        konami.addEvent(document, "touchstart", this.touchstartHandler);
+      },
+      unload: function () {
+        konami.removeEvent(document, "touchmove", this.touchmoveHandler);
+        konami.removeEvent(document, "touchend", this.touchendHandler);
+        konami.removeEvent(document, "touchstart", this.touchstartHandler);
+      },
+      check_direction: function () {
+        x_magnitude = Math.abs(this.start_x - this.stop_x);
+        y_magnitude = Math.abs(this.start_y - this.stop_y);
+        x = this.start_x - this.stop_x < 0 ? "RIGHT" : "LEFT";
+        y = this.start_y - this.stop_y < 0 ? "DOWN" : "UP";
+        result = x_magnitude > y_magnitude ? x : y;
+        result = this.tap === true ? "TAP" : result;
+        return result;
+      },
+    },
+  };
+
+  typeof callback === "string" && konami.load(callback);
+  if (typeof callback === "function") {
+    konami.code = callback;
+    konami.load();
+  }
+
+  return konami;
 };
 
-
-if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-        module.exports = Konami;
+if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
+  module.exports = Konami;
 } else {
-        if (typeof define === 'function' && define.amd) {
-                define([], function() {
-                        return Konami;
-                });
-        } else {
-                window.Konami = Konami;
-        }
+  if (typeof define === "function" && define.amd) {
+    define([], function () {
+      return Konami;
+    });
+  } else {
+    window.Konami = Konami;
+  }
 }

docs/source/_templates/hacks.html

@@ -1,5 +1,11 @@
-<link rel="stylesheet" type="text/css" href="https://cloud.typography.com/7584432/7586812/css/fonts.css" />
-<script type="text/javascript">$('#searchbox').hide(0);</script>
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cloud.typography.com/7584432/7586812/css/fonts.css"
+/>
+<script type="text/javascript">
+  $("#searchbox").hide(0);
+</script>
 <!--Alabaster (krTheme++) Hacks -->
 
 <!-- CSS Adjustments (I'm very picky.) -->
@@ -39,9 +45,7 @@
   }
 
   .method {
-
     margin-bottom: 2em;
-
   }
 
   .si,
@@ -80,8 +84,6 @@
     margin-top: -1em;
   }
 
-
-
   /* "Quick Search" should be not be shown for now. */
   div#searchbox h3 {
     display: none;
@@ -118,10 +120,12 @@
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-127383416-1"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
-  function gtag() { dataLayer.push(arguments); }
-  gtag('js', new Date());
+  function gtag() {
+    dataLayer.push(arguments);
+  }
+  gtag("js", new Date());
 
-  gtag('config', 'UA-127383416-1');
+  gtag("config", "UA-127383416-1");
 </script>
 
 <!-- There are no more hacks. -->
@@ -130,7 +134,10 @@
 
 <script src="{{ pathto('_static/', 1) }}/konami.js"></script>
 <script>
-  var easter_egg = new Konami('https://www.myfortunecookie.co.uk/fortunes/' + (Math.floor(Math.random() * 152) + 1));
+  var easter_egg = new Konami(
+    "https://www.myfortunecookie.co.uk/fortunes/" +
+      (Math.floor(Math.random() * 152) + 1)
+  );
 </script>
 
 <style>
@@ -140,67 +147,94 @@
 </style>
 
 <!-- GitHub Logo -->
-<a href="https://github.com/kennethreitz/responder" class="github-corner" aria-label="View source on GitHub">
-  <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;"
-    aria-hidden="true">
+<a
+  href="https://github.com/kennethreitz/responder"
+  class="github-corner"
+  aria-label="View source on GitHub"
+>
+  <svg
+    width="80"
+    height="80"
+    viewBox="0 0 250 250"
+    style="fill: #151513; color: #fff; position: absolute; top: 0; border: 0; right: 0"
+    aria-hidden="true"
+  >
     <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
-    <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
-      fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
-    <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
-      fill="currentColor" class="octo-body"></path>
+    <path
+      d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
+      fill="currentColor"
+      style="transform-origin: 130px 106px"
+      class="octo-arm"
+    ></path>
+    <path
+      d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
+      fill="currentColor"
+      class="octo-body"
+    ></path>
   </svg>
 </a>
 <style>
   .github-corner:hover .octo-arm {
-    animation: octocat-wave 560ms ease-in-out
+    animation: octocat-wave 560ms ease-in-out;
   }
 
   @keyframes octocat-wave {
-
     0%,
     100% {
-      transform: rotate(0)
+      transform: rotate(0);
     }
 
     20%,
     60% {
-      transform: rotate(-25deg)
+      transform: rotate(-25deg);
     }
 
     40%,
     80% {
-      transform: rotate(10deg)
+      transform: rotate(10deg);
     }
   }
 
-  @media (max-width:500px) {
+  @media (max-width: 500px) {
     .github-corner:hover .octo-arm {
-      animation: none
+      animation: none;
     }
 
     .github-corner .octo-arm {
-      animation: octocat-wave 560ms ease-in-out
+      animation: octocat-wave 560ms ease-in-out;
     }
   }
 </style>
 
-
 <!-- That was not a hack. That was art.
 
 <!-- UserVoice JavaScript SDK (only needed once on a page) -->
-<script>(function () { var uv = document.createElement('script'); uv.type = 'text/javascript'; uv.async = true; uv.src = '//widget.uservoice.com/f4AQraEfwInlMzkexfRLg.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(uv, s) })()</script>
+<script>
+  (function () {
+    var uv = document.createElement("script");
+    uv.type = "text/javascript";
+    uv.async = true;
+    uv.src = "//widget.uservoice.com/f4AQraEfwInlMzkexfRLg.js";
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(uv, s);
+  })();
+</script>
 
 <!-- A tab to launch the Classic Widget -->
 <script>
   UserVoice = window.UserVoice || [];
-  UserVoice.push(['showTab', 'classic_widget', {
-    mode: 'feedback',
-    primary_color: '#fa8c28',
-    link_color: '#0a8cc6',
-    forum_id: 913660,
-    tab_label: 'Got feedback?',
-    tab_color: '#00994f',
-    tab_position: 'bottom-left',
-    tab_inverted: true
-  }]);
+  UserVoice.push([
+    "showTab",
+    "classic_widget",
+    {
+      mode: "feedback",
+      primary_color: "#fa8c28",
+      link_color: "#0a8cc6",
+      forum_id: 913660,
+      tab_label: "Got feedback?",
+      tab_color: "#00994f",
+      tab_position: "bottom-left",
+      tab_inverted: true,
+    },
+  ]);
 </script>

docs/source/_templates/sidebarintro.html

@@ -1,33 +1,93 @@
 <p class="logo">
   <a href="{{ pathto(master_doc) }}">
-    <img class="logo" src="{{ pathto('_static/responder.png', 1) }}" title="https://kennethreitz.org/tattoos" />
+    <img
+      class="logo"
+      src="{{ pathto('_static/responder.png', 1) }}"
+      title="https://kennethreitz.org/tattoos"
+    />
   </a>
 </p>
 
 <p>
-  <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>
+  <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.
-</p>
+<p><strong>Responder</strong> is a web service framework, written for human beings.</p>
 
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 
-<p><iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=true" allowtransparency="true"
-    frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
-
-<p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow
-    @kennethreitz</a>
-  <script>!function (d, s, id) { var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https'; if (!d.getElementById(id)) { js = d.createElement(s); js.id = id; js.src = p + '://platform.twitter.com/widgets.js'; fjs.parentNode.insertBefore(js, fjs); } }(document, 'script', 'twitter-wjs');</script>
+<p>
+  <iframe
+    src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=true"
+    allowtransparency="true"
+    frameborder="0"
+    scrolling="0"
+    width="200"
+    height="20"
+  ></iframe>
 </p>
 
+<p>
+  <a
+    href="https://twitter.com/kennethreitz"
+    class="twitter-follow-button"
+    data-show-count="false"
+    >Follow @kennethreitz</a
+  >
+  <script>
+    !(function (d, s, id) {
+      var js,
+        fjs = d.getElementsByTagName(s)[0],
+        p = /^http:/.test(d.location) ? "http" : "https";
+      if (!d.getElementById(id)) {
+        js = d.createElement(s);
+        js.id = id;
+        js.src = p + "://platform.twitter.com/widgets.js";
+        fjs.parentNode.insertBefore(js, fjs);
+      }
+    })(document, "script", "twitter-wjs");
+  </script>
+</p>
 
 <h3>Useful Links</h3>
 <ul>
-
   <li><a href="http://github.com/kennethreitz/responder">Responder @ GitHub</a></li>
   <li><a href="http://pypi.python.org/pypi/responder">Responder @ PyPI</a></li>
   <li><a href="http://github.com/kennethreitz/responder/issues">Issue Tracker</a></li>

docs/source/_templates/sidebarlogo.html

@@ -1,33 +1,93 @@
 <p class="logo">
   <a href="{{ pathto(master_doc) }}">
-    <img class="logo" src="{{ pathto('_static/responder.png', 1) }}" title="https://kennethreitz.org/tattoos" />
+    <img
+      class="logo"
+      src="{{ pathto('_static/responder.png', 1) }}"
+      title="https://kennethreitz.org/tattoos"
+    />
   </a>
 </p>
 
 <p>
-  <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>
+  <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.
-</p>
+<p><strong>Responder</strong> is a web service framework, written for human beings.</p>
 
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 
-<p><iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=true" allowtransparency="true"
-    frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
-
-<p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow
-    @kennethreitz</a>
-  <script>!function (d, s, id) { var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https'; if (!d.getElementById(id)) { js = d.createElement(s); js.id = id; js.src = p + '://platform.twitter.com/widgets.js'; fjs.parentNode.insertBefore(js, fjs); } }(document, 'script', 'twitter-wjs');</script>
+<p>
+  <iframe
+    src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=true"
+    allowtransparency="true"
+    frameborder="0"
+    scrolling="0"
+    width="200"
+    height="20"
+  ></iframe>
 </p>
 
+<p>
+  <a
+    href="https://twitter.com/kennethreitz"
+    class="twitter-follow-button"
+    data-show-count="false"
+    >Follow @kennethreitz</a
+  >
+  <script>
+    !(function (d, s, id) {
+      var js,
+        fjs = d.getElementsByTagName(s)[0],
+        p = /^http:/.test(d.location) ? "http" : "https";
+      if (!d.getElementById(id)) {
+        js = d.createElement(s);
+        js.id = id;
+        js.src = p + "://platform.twitter.com/widgets.js";
+        fjs.parentNode.insertBefore(js, fjs);
+      }
+    })(document, "script", "twitter-wjs");
+  </script>
+</p>
 
 <h3>Useful Links</h3>
 <ul>
-
   <li><a href="http://github.com/kennethreitz/responder">Responder @ GitHub</a></li>
   <li><a href="http://pypi.python.org/pypi/responder">Responder @ PyPI</a></li>
   <li><a href="http://github.com/kennethreitz/responder/issues">Issue Tracker</a></li>

docs/source/conf.py

@@ -20,23 +20,11 @@
 # -- Project information -----------------------------------------------------
 
 project = "responder"
-copyright = "2018, A Kenneth Reitz project"
+copyright = "2024, A Kenneth Reitz project"
 author = "Kenneth Reitz"
 
 # The short X.Y version
-import os
-
-# Path hackery to get current version number.
-here = os.path.abspath(os.path.dirname(__file__))
-
-about = {}
-with open(os.path.join(here, "..", "..", "responder", "__version__.py")) as f:
-    exec(f.read(), about)
-
-version = about["__version__"]
-# The full version, including alpha/beta/rc tags
-release = about["__version__"]
-
+version = ""
 
 # -- General configuration ---------------------------------------------------
 
@@ -76,7 +64,7 @@ master_doc = "index"
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

docs/source/deployment.rst

@@ -31,7 +31,7 @@ The basics::
 
 Install Responder::
 
-    $ pipenv install responder --pre
+    $ pipenv install responder
     ...
 
 Write out an ``api.py``::

docs/source/index.rst

@@ -8,8 +8,8 @@ A familiar HTTP Service Framework
 
 |Build Status| |image1| |image2| |image3| |image4| |image5|
 
-.. |Build Status| image:: https://travis-ci.org/kennethreitz/responder.svg?branch=master
-   :target: https://travis-ci.org/kennethreitz/responder
+.. |Build Status| image:: https://github.com/kennethreitz/responder/actions/workflows/test.yaml/badge.svg
+   :target: https://github.com/kennethreitz/responder/actions/workflows/test.yaml
 .. |image1| image:: https://img.shields.io/pypi/v/responder.svg
    :target: https://pypi.org/project/responder/
 .. |image2| image:: https://img.shields.io/pypi/l/responder.svg
@@ -36,20 +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!
@@ -82,7 +83,7 @@ Testimonials
 
 
 .. _Django REST Framework: https://www.django-rest-framework.org/
-.. _Two Scoops of Django: https://www.twoscoopspress.com/products/two-scoops-of-django-1-11
+.. _Two Scoops of Django: https://www.feldroy.com/two-scoops-press#two-scoops-of-django
 
 User Guides
 -----------
@@ -102,7 +103,7 @@ Installing Responder
 
 .. code-block:: shell
 
-    $ pipenv install responder --pre
+    $ pipenv install responder
     ✨🍰✨
 
 Only **Python 3.6+** is supported.
@@ -129,7 +130,7 @@ Ideas
 - 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 unnecessary 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.
 
 

docs/source/quickstart.rst

@@ -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.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)

docs/source/tour.rst

@@ -58,13 +58,64 @@ You can make use of Responder's Request and Response objects in your GraphQL res
 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
+
+    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,
+    )
+
+    @schema.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"})
+
+
+Old way *It's recommended to use the code above* ::
 
     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",
@@ -79,19 +130,16 @@ Responder comes with built-in support for OpenAPI / marshmallow::
         title="Web Service",
         version="1.0",
         openapi="3.0.2",
-        docs_route='/docs',
-        description=description,
-        terms_of_service=terms_of_service,
+        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.
@@ -101,46 +149,88 @@ 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"})
 
-
 ::
 
     >>> 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::
 
@@ -184,7 +274,7 @@ To set cookies directives, you should use `resp.set_cookie`::
 
 Supported directives:
 
-* ``key`` - **Reduired**
+* ``key`` - **Required**
 * ``value`` - [OPTIONAL] - Defaults to ``""``. 
 * ``expires`` - Defaults to ``None``.
 * ``max_age`` - Defaults to ``None``.
@@ -193,7 +283,7 @@ Supported directives:
 * ``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>`_
+For more information see `directives <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie>`_
 
 
 Using Cookie-Based Sessions
@@ -225,6 +315,13 @@ 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
 -----------------
 
@@ -319,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. 
 

examples/helloworld.py

@@ -0,0 +1,12 @@
+import responder
+
+api = responder.API()
+
+
+@api.route("/{greeting}")
+async def greet_world(req, resp, *, greeting):
+    resp.text = f"{greeting}, world!"
+
+
+if __name__ == "__main__":
+    api.run()

pyproject.toml

@@ -0,0 +1,121 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = [
+  "setuptools>=42", # At least v42 of setuptools required.
+  "versioningit",
+]
+
+[tool.ruff]
+line-length = 90
+
+extend-exclude = [
+  "bin/mkdeb.py",
+  "docs/source/conf.py",
+  "setup.py",
+]
+
+lint.select = [
+  # Builtins
+  "A",
+  # Bugbear
+  "B",
+  # comprehensions
+  "C4",
+  # Pycodestyle
+  "E",
+  # eradicate
+  "ERA",
+  # Pyflakes
+  "F",
+  # isort
+  "I",
+  # pandas-vet
+  "PD",
+  # return
+  "RET",
+  # Bandit
+  "S",
+  # print
+  "T20",
+  "W",
+  # flake8-2020
+  "YTT",
+]
+
+lint.extend-ignore = [
+  "S101", #  Allow use of `assert`.
+]
+
+lint.per-file-ignores."tests/*" = [
+  "ERA001", # Found commented-out code.
+  "S101",   # Allow use of `assert`, and `print`.
+]
+
+[tool.pytest.ini_options]
+addopts = """
+  -rfEXs -p pytester --strict-markers --verbosity=3
+  --cov --cov-report=term-missing --cov-report=xml
+  """
+filterwarnings = [
+  "error::UserWarning",
+]
+log_level = "DEBUG"
+log_cli_level = "DEBUG"
+log_format = "%(asctime)-15s [%(name)-36s] %(levelname)-8s: %(message)s"
+minversion = "2.0"
+testpaths = [
+  "responder",
+  "tests",
+]
+markers = [
+]
+xfail_strict = true
+
+[tool.versioningit]
+
+[tool.poe.tasks]
+
+check = [
+  "lint",
+  "test",
+]
+
+docs-autobuild = [
+  { cmd = "sphinx-autobuild --open-browser --watch docs/source docs/build" },
+]
+docs-html = [
+  { cmd = "sphinx-build -W --keep-going docs/source docs/build" },
+]
+docs-linkcheck = [
+  { cmd = "sphinx-build -W --keep-going -b linkcheck docs/source docs/build" },
+]
+
+format = [
+  { cmd = "ruff format ." },
+  # Configure Ruff not to auto-fix (remove!):
+  # unused imports (F401), unused variables (F841), `print` statements (T201), and commented-out code (ERA001).
+  { cmd = "ruff check --fix --ignore=ERA --ignore=F401 --ignore=F841 --ignore=T20 --ignore=ERA001 ." },
+  { cmd = "pyproject-fmt --keep-full-version pyproject.toml" },
+]
+
+lint = [
+  { cmd = "ruff format --check ." },
+  { cmd = "ruff check ." },
+  { cmd = "validate-pyproject pyproject.toml" },
+  # { cmd = "mypy" },
+]
+
+release = [
+  { cmd = "python -m build" },
+  { cmd = "twine upload --skip-existing dist/*" },
+]
+
+[tool.poe.tasks.test]
+cmd = "pytest"
+help = "Invoke software tests"
+
+[tool.poe.tasks.test.args.expression]
+options = [ "-k" ]
+
+[tool.poe.tasks.test.args.marker]
+options = [ "-m" ]

pytest.ini

@@ -1,4 +0,0 @@
-[pytest]
-;addopts= -rsxX -s -v --strict
-filterwarnings =
-    error::UserWarning

readthedocs.yml

@@ -1,5 +1,5 @@
 build:
-    image: latest
+  image: latest
 
 python:
-    version: 3.6
+  version: 3.6

responder/__init__.py

@@ -1,2 +1,17 @@
-from .core import *
+from importlib.metadata import PackageNotFoundError, version
+
 from . import ext
+from .core import API, Request, Response
+
+try:
+    __version__ = version("responder")
+except PackageNotFoundError:  # pragma: no cover
+    __version__ = "unknown"
+
+__all__ = [
+    "API",
+    "Request",
+    "Response",
+    "ext",
+    "__version__",
+]

responder/__main__.py

@@ -1,4 +0,0 @@
-from .cli import main
-
-if __name__ == "__main__":
-    main()

responder/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.3.0"

responder/api.py

@@ -1,58 +1,35 @@
-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.middleware.errors import ServerErrorMiddleware
+from starlette.exceptions import ExceptionMiddleware
 from starlette.middleware.cors import CORSMiddleware
+from starlette.middleware.errors import ServerErrorMiddleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware
-from starlette.middleware.lifespan import LifespanMiddleware
+from starlette.middleware.sessions import SessionMiddleware
 from starlette.middleware.trustedhost import TrustedHostMiddleware
-from starlette.routing import Router, LifespanHandler
-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 . import status_codes
 from .background import BackgroundQueue
+from .ext.schema import OpenAPISchema as OpenAPISchema
 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 .staticfiles import StaticFiles
+from .statics import DEFAULT_CORS_PARAMS, DEFAULT_OPENAPI_THEME, DEFAULT_SECRET_KEY
+from .templates import Templates
 
 
-# TODO: consider moving status codes here
 class API:
     """The primary web-service class.
 
-        :param static_dir: The directory to use for static files. Will be created for you if it doesn't already exist.
-        :param templates_dir: The directory to use for templates. Will be created for you if it doesn't already exist.
-        :param auto_escape: If ``True``, HTML and XML templates will automatically be escaped.
-        :param enable_hsts: If ``True``, send all responses to HTTPS URLs.
-        :param title: The title of the application (OpenAPI Info Object)
-        :param version: The version of the OpenAPI document (OpenAPI Info Object)
-        :param description: The description of the OpenAPI document (OpenAPI Info Object)
-        :param terms_of_service: A URL to the Terms of Service for the API (OpenAPI Info Object)
-        :param contact: The contact dictionary of the application (OpenAPI Contact Object)
-        :param license: The license information of the exposed API (OpenAPI License Object)
-    """
+    :param static_dir: The directory to use for static files. Will be created for you if it doesn't already exist.
+    :param templates_dir: The directory to use for templates. Will be created for you if it doesn't already exist.
+    :param auto_escape: If ``True``, HTML and XML templates will automatically be escaped.
+    :param enable_hsts: If ``True``, send all responses to HTTPS URLs.
+    :param openapi_theme: OpenAPI documentation theme, must be one of ``elements``, ``rapidoc``, ``redoc``, ``swagger_ui``
+    """  # noqa: E501
 
     status_codes = status_codes
 
@@ -65,7 +42,7 @@ class API:
         description=None,
         terms_of_service=None,
         contact=None,
-        license=None,
+        license=None,  # noqa: A002
         openapi=None,
         openapi_route="/schema.yml",
         static_dir="static",
@@ -78,28 +55,21 @@ class API:
         cors=False,
         cors_params=DEFAULT_CORS_PARAMS,
         allowed_hosts=None,
+        openapi_theme=DEFAULT_OPENAPI_THEME,
     ):
         self.background = BackgroundQueue()
 
         self.secret_key = secret_key
-        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.static_dir = Path(os.path.abspath(static_dir))
-        self.static_route = f"/{static_route.strip('/')}"
-        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.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.hsts_enabled = enable_hsts
         self.cors = cors
@@ -110,39 +80,23 @@ class API:
             # if not debug:
             #     raise RuntimeError(
             #         "You need to specify `allowed_hosts` when debug is set to False"
-            #     )
+            #     )  # noqa: ERA001
             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._notfound_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:
@@ -150,164 +104,61 @@ class API:
 
         self.add_middleware(TrustedHostMiddleware, allowed_hosts=self.allowed_hosts)
 
-        self.lifespan_handler = LifespanMiddleware(LifespanHandler)
-
         if self.cors:
             self.add_middleware(CORSMiddleware, **self.cors_params)
         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,
+                openapi_theme=openapi_theme,
+            )
+
+        # 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(environ, start_response):
-        pass
-
-    @staticmethod
-    def _notfound_wsgi_app(environ, start_response):
-        start_response("404 NOT FOUND", [("Content-Type", "text/plain")])
-        return [b"Not Found."]
-
     @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):
-
-        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=[MarshmallowPlugin()],
-            info=info,
-        )
-
-        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
-
-            if scope["type"] == "lifespan":
-                return self.lifespan_handler(scope)
-            elif scope["type"] == "websocket":
-                ws = WebSocket(scope=scope, receive=receive, send=send)
-                await self._dispatch_ws(ws)
-            else:
-                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
-
-    async def _dispatch_ws(self, ws):
-        route = self.path_matches_route(ws.url.path)
-        route = self.routes.get(route)
-
-        try:
-            try:
-                # Run the view.
-                r = self.background(route.endpoint, ws)
-                # If it's async, await it.
-                if hasattr(r, "cr_running"):
-                    await r
-            except TypeError as e:
-                cont = True
-        except Exception:
-            await self.background(
-                self.default_response, websocket=route.uses_websocket, error=True
-            )
-            raise
-
-    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
@@ -316,113 +167,12 @@ class API:
         """Given a path portion of a URL, tests that it matches against any registered route.
 
         :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):
+        """  # noqa: E501 (Line too long)
+        for route in self.router.routes:
+            match, _ = route.matches(path)
+            if match:
                 return route
-
-    @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:
-            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=req, resp=resp, notfound=True)
-        self.default_response(req=req, resp=resp)
-
-        self._prepare_session(resp)
-
-        return resp
-
-    async def _execute_route(self, *, route, req, resp, **options):
-
-        params = route.incoming_matches(req.url.path)
-
-        cont = True
-
-        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:
-                await 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:
-                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)
+        return None
 
     def add_route(
         self,
@@ -430,7 +180,7 @@ class API:
         endpoint=None,
         *,
         default=False,
-        static=False,
+        static=True,
         check_existing=True,
         websocket=False,
         before_request=False,
@@ -440,53 +190,29 @@ class API:
         :param route: A string representation of the route.
         :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}"
+        :param static: If ``True``, and no endpoint was passed, render "static/index.html".
+                       Also, it will become a default route.
+        """  # noqa: E501
 
-        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=None, resp=None, websocket=False, notfound=False, error=False
-    ):
-        if websocket:
-            return
+    async def _static_response(self, req, resp):
+        assert self.static_dir is not None
 
-        if resp.status_code is None:
-            resp.status_code = 200
-
-        if self.default_endpoint and notfound:
-            self.default_endpoint(req=req, resp=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.html = self.docs
-
-    def static_response(self, req, resp):
         index = (self.static_dir / "index.html").resolve()
         if os.path.exists(index):
             with open(index, "r") as f:
@@ -495,32 +221,21 @@ class API:
             resp.status_code = status_codes.HTTP_404
             resp.text = "Not found."
 
-    def schema_response(self, req, resp):
-        resp.status_code = status_codes.HTTP_200
-        resp.headers["Content-Type"] = "application/x-yaml"
-        resp.content = self.openapi
-
     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.
+        :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::
 
@@ -528,11 +243,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():
                 ...
 
@@ -544,6 +255,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.add_event_handler(event_type, handler)
+
     def route(self, route=None, **options):
         """Decorator for creating new routes around function and class definitions.
 
@@ -564,13 +284,15 @@ class API:
     def mount(self, route, app):
         """Mounts an WSGI / ASGI application at a given route.
 
-        :param route: String representation of the route to be used (shouldn't be parameterized).
+        :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.
+        """Testing HTTP client. Returns a Requests session object,
+        able to send HTTP requests to the Responder application.
 
         :param base_url: The URL to mount the connection adaptor to.
         """
@@ -579,11 +301,6 @@ class API:
             self._session = TestClient(self, base_url=base_url)
         return self._session
 
-    def _route_for(self, endpoint):
-        for route_object in self.routes.values():
-            if endpoint in (route_object.endpoint, route_object.endpoint_name):
-                return route_object
-
     def url_for(self, endpoint, **params):
         # TODO: Absolute_url
         """Given an endpoint, returns a rendered URL for its route.
@@ -591,69 +308,27 @@ class API:
         :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 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.
-        """
-        # Prepopulate values with base
-        values = {**self.jinja_values_base, **values}
+        :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.
+        """  # noqa: E501
+        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.
-        """
-        # Prepopulate values with base
-        values = {**self.jinja_values_base, **values}
-
-        template = self.jinja_env.from_string(s_)
-        return template.render(**values)
+        :param source: The template to use.
+        :param *args: Data to pass into the template.
+        :param **kwargs: Data to pass into the template.
+        """  # noqa: E501
+        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
@@ -662,13 +337,13 @@ class API:
 
         :param address: The address to bind to.
         :param port: The port to bind to. If none is provided, one will be selected at random.
-        :param debug: Run uvicorn server in debug mode.
+        :param debug: Whether to run application in debug mode.
         :param options: Additional keyword arguments to send to ``uvicorn.run()``.
-        """
+        """  # noqa: E501
 
         if "PORT" in os.environ:
             if address is None:
-                address = "0.0.0.0"
+                address = "0.0.0.0"  # noqa: S104
             port = int(os.environ["PORT"])
 
         if address is None:
@@ -685,3 +360,6 @@ class API:
         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)

responder/background.py

@@ -1,8 +1,8 @@
 import asyncio
-import functools
 import concurrent.futures
 import multiprocessing
 import traceback
+
 from starlette.concurrency import run_in_threadpool
 
 
@@ -27,7 +27,7 @@ class BackgroundQueue:
         def on_future_done(fs):
             try:
                 fs.result()
-            except:
+            except Exception:
                 traceback.print_exc()
 
         def do_task(*args, **kwargs):
@@ -40,5 +40,4 @@ class BackgroundQueue:
     async def __call__(self, func, *args, **kwargs) -> None:
         if asyncio.iscoroutinefunction(func):
             return await asyncio.ensure_future(func(*args, **kwargs))
-        else:
-            return await run_in_threadpool(func, *args, **kwargs)
+        return await run_in_threadpool(func, *args, **kwargs)

responder/cli.py

@@ -1,43 +0,0 @@
-"""Responder.
-
-Usage:
-  responder
-  responder run [--build] [--debug] <module>
-  responder build
-  responder --version
-
-Options:
-  -h --help     Show this screen.
-  -v --version  Show version.
-
-"""
-
-import os
-
-import docopt
-from .__version__ import __version__
-
-
-def cli():
-    args = docopt.docopt(
-        __doc__, argv=None, help=True, version=__version__, options_first=False
-    )
-
-    module = args["<module>"]
-    build = args["build"] or args["--build"]
-    run = args["run"]
-
-    if build:
-        os.system("npm run build")
-
-    if run:
-        split_module = module.split(":")
-
-        if len(split_module) > 1:
-            module = split_module[0]
-            prop = split_module[1]
-        else:
-            prop = "api"
-
-        app = __import__(module)
-        getattr(app, prop).run()

responder/core.py

@@ -1,3 +1,8 @@
 from .api import API
 from .models import Request, Response
-from .cli import cli
+
+__all__ = [
+    "API",
+    "Request",
+    "Response",
+]

responder/ext/__init__.py

@@ -1 +0,0 @@
-from .graphql import GraphQLView

responder/ext/graphql.py

@@ -1,65 +0,0 @@
-import json
-from functools import partial
-
-from graphql_server import default_format_error, encode_execution_results, json_encode
-
-from ..templates import GRAPHIQL
-
-
-class GraphQLView:
-    def __init__(self, *, api, schema):
-        self.api = api
-        self.schema = schema
-
-    @staticmethod
-    async def _resolve_graphql_query(req):
-        # TODO: Get variables and operation_name from form data, params, request text?
-
-        if "json" in req.mimetype:
-            json_media = await req.media("json")
-            return (
-                json_media["query"],
-                json_media.get("variables"),
-                json_media.get("operationName"),
-            )
-
-        # Support query/q in form data.
-        # Form data is awaiting https://github.com/encode/starlette/pull/102
-        # if "query" in req.media("form"):
-        #     return req.media("form")["query"], None, None
-        # if "q" in req.media("form"):
-        #     return req.media("form")["q"], None, None
-
-        # Support query/q in params.
-        if "query" in req.params:
-            return req.params["query"], None, None
-        if "q" in req.params:
-            return req.params["q"], None, None
-
-        # Otherwise, the request text is used (typical).
-        # TODO: Make some assertions about content-type here.
-        return req.text, None, None
-
-    async def graphql_response(self, req, resp, schema):
-        show_graphiql = req.method == "get" and req.accepts("text/html")
-
-        if show_graphiql:
-            resp.content = self.api.template_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, context=context
-        )
-        result, status_code = encode_execution_results(
-            [result],
-            is_batch=False,
-            format_error=default_format_error,
-            encode=partial(json_encode, pretty=False),
-        )
-        resp.media = json.loads(result)
-        return (query, result, status_code)
-
-    async def on_request(self, req, resp):
-        await self.graphql_response(req, resp, self.schema)

responder/ext/schema/__init__.py

@@ -0,0 +1,138 @@
+from pathlib import Path
+
+from apispec import APISpec, yaml_utils
+from apispec.ext.marshmallow import MarshmallowPlugin
+
+from responder import status_codes
+from responder.statics import API_THEMES, DEFAULT_OPENAPI_THEME
+from responder.templates import Templates
+
+
+class OpenAPISchema:
+    def __init__(
+        self,
+        app,
+        title,
+        version,
+        plugins=None,
+        description=None,
+        terms_of_service=None,
+        contact=None,
+        license=None,  # noqa: A002
+        openapi=None,
+        openapi_route="/schema.yml",
+        docs_route="/docs/",
+        static_route="/static",
+        openapi_theme=DEFAULT_OPENAPI_THEME,
+    ):
+        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 = (
+            openapi_theme if openapi_theme in API_THEMES else DEFAULT_OPENAPI_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(__file__).parent / "docs").resolve()
+        self.templates = Templates(directory=theme_path)
+
+        self.static_route = static_route
+
+    @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 marshmallow 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):
+        return self.templates.render(
+            f"{self.docs_theme}.html",
+            title=self.title,
+            version=self.version,
+            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

responder/ext/schema/docs/elements.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <title>{{ title }} {{ version }}</title>
+    <!-- Embed elements Elements via Web Component -->
+    <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"></script>
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/@stoplight/elements/styles.min.css"
+    />
+  </head>
+  <body>
+    <elements-api
+      apiDescriptionUrl="{{ schema_url }}"
+      router="hash"
+      layout="sidebar"
+    />
+  </body>
+</html>

responder/ext/schema/docs/rapidoc.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<!-- Important: must specify -->
+<html>
+  <head>
+    <title>{{ title }} {{ version }}</title>
+    <meta charset="utf-8" />
+    <!-- Important: rapi-doc uses utf8 characters -->
+    <script
+      type="module"
+      src="https://unpkg.com/rapidoc/dist/rapidoc-min.js"
+    ></script>
+  </head>
+  <body>
+    <rapi-doc spec-url="{{ schema_url }}" show-header="false"> </rapi-doc>
+  </body>
+</html>

responder/ext/schema/docs/redoc.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ title }} {{ version }}</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link
+      href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700"
+      rel="stylesheet"
+    />
+
+    <style>
+      body {
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <redoc spec-url="{{ schema_url }}"></redoc>
+    <script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"></script>
+  </body>
+</html>

responder/ext/schema/docs/swagger_ui.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>{{ title }} {{ version }}</title>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/swagger-ui-dist/swagger-ui.css"
+    />
+    <style>
+      html {
+        box-sizing: border-box;
+        overflow: -moz-scrollbars-vertical;
+        overflow-y: scroll;
+      }
+
+      *,
+      *:before,
+      *:after {
+        box-sizing: inherit;
+      }
+
+      body {
+        margin: 0;
+        background: #fafafa;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="swagger-ui"></div>
+
+    <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+    <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-standalone-preset.js"></script>
+    <script>
+      window.onload = function () {
+        const ui = SwaggerUIBundle({
+          url: "{{ schema_url }}",
+          dom_id: "#swagger-ui",
+          deepLinking: true,
+          presets: [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset],
+          plugins: [SwaggerUIBundle.plugins.DownloadUrl],
+          layout: "BaseLayout",
+        });
+      };
+    </script>
+  </body>
+</html>

responder/formats.py

@@ -1,4 +1,5 @@
 import json
+from urllib.parse import urlencode
 
 import yaml
 from requests_toolbelt.multipart import decoder
@@ -8,60 +9,72 @@ from .models import QueryDict
 
 async def format_form(r, encode=False):
     if encode:
-        pass
-    else:
-        return QueryDict(await r.text)
+        return None
+    if "multipart/form-data" in r.headers.get("Content-Type"):
+        decode = decoder.MultipartDecoder(await r.content, r.mimetype)
+        queries = []
+        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]
+                    queries.append((key, text))
+
+        content = urlencode(queries)
+        return QueryDict(content)
+    return QueryDict(await r.text)
 
 
 async def format_yaml(r, encode=False):
     if encode:
         r.headers.update({"Content-Type": "application/x-yaml"})
         return yaml.safe_dump(r.media)
-    else:
-        return yaml.safe_load(await r.content)
+    return yaml.safe_load(await r.content)
 
 
 async def format_json(r, encode=False):
     if encode:
         r.headers.update({"Content-Type": "application/json"})
         return json.dumps(r.media)
-    else:
-        return json.loads(await r.content)
+    return json.loads(await r.content)
 
 
 async def format_files(r, encode=False):
     if encode:
-        pass
-    else:
-        decoded = decoder.MultipartDecoder(await r.content, r.mimetype)
-        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
+        return None
+    decoded = decoder.MultipartDecoder(await r.content, r.mimetype)
+    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(";")]:
-                split = section.split("=")
-                if len(split) > 1:
-                    key = split[0]
-                    value = split[1]
+        for section in [h.strip() for h in header.split(";")]:
+            split = section.split("=")
+            if len(split) > 1:
+                key = split[0]
+                value = split[1]
 
-                    value = value[1:-1]
+                value = value[1:-1]
 
-                    if key == "filename":
-                        filename = value
-                    elif key == "name":
-                        formname = value
+                if key == "filename":
+                    filename = value
+                elif key == "name":
+                    formname = value
 
-            if mimetype is None:
-                dump[formname] = part.content
-            else:
-                dump[formname] = {
-                    "filename": filename,
-                    "content": part.content,
-                    "content-type": mimetype.decode("utf-8"),
-                }
-        return dump
+        if mimetype is None:
+            dump[formname] = part.content
+        else:
+            dump[formname] = {
+                "filename": filename,
+                "content": part.content,
+                "content-type": mimetype.decode("utf-8"),
+            }
+    return dump
 
 
 def get_formats():

responder/models.py

@@ -1,29 +1,24 @@
 import functools
-import io
 import inspect
-import json
-import gzip
-from base64 import b64decode
+import typing as t
 from http.cookies import SimpleCookie
-
+from urllib.parse import parse_qs
 
 import chardet
 import rfc3986
-import graphene
-import yaml
-from requests.structures import CaseInsensitiveDict
 from requests.cookies import RequestsCookieJar
-from starlette.datastructures import MutableHeaders
+from requests.structures import CaseInsensitiveDict
 from starlette.requests import Request as StarletteRequest
+from starlette.requests import State
 from starlette.responses import (
     Response as StarletteResponse,
+)
+from starlette.responses import (
     StreamingResponse as StarletteStreamingResponse,
 )
 
-from urllib.parse import parse_qs
-
-from .status_codes import HTTP_200
 from .statics import DEFAULT_ENCODING
+from .status_codes import HTTP_301
 
 
 class QueryDict(dict):
@@ -105,9 +100,9 @@ class Request:
         "_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
@@ -122,14 +117,7 @@ class Request:
     @property
     def session(self):
         """The session data, in dict form, from the Request."""
-        if self.api.session_cookie 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):
@@ -178,6 +166,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."""
@@ -185,13 +186,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):
@@ -213,6 +208,7 @@ class Request:
     async def declared_encoding(self):
         if "Encoding" in self.headers:
             return self.headers["Encoding"]
+        return None
 
     @property
     async def apparent_encoding(self):
@@ -221,8 +217,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,20 +228,20 @@ class Request:
         """Returns ``True`` if the incoming Request accepts the given ``content_type``."""
         return content_type in self.headers.get("Accept", [])
 
-    async def media(self, format=None):
+    async def media(self, format: t.Union[str, t.Callable] = None):  # noqa: A001, A002
         """Renders incoming json/yaml/form data as Python objects. Must be awaited.
 
-        :param format: The name of the format being used. Alternatively accepts a custom callable for the format type.
+        :param format: The name of the format being used.
+                       Alternatively, accepts a custom callable for the format type.
         """
 
         if format is None:
-            format = "yaml" if "yaml" in self.mimetype or "" else "json"
-            format = "form" if "form" in self.mimetype or "" else format
+            format = "yaml" if "yaml" in self.mimetype or "" else "json"  # noqa: A001
+            format = "form" if "form" in self.mimetype or "" else format  # noqa: A001
 
         if format in self.formats:
             return await self.formats[format](self)
-        else:
-            return await format(self)
+        return await format(self)
 
 
 def content_setter(mimetype):
@@ -283,17 +279,15 @@ class Response:
         self.content = None  #: A bytes representation of the response body.
         self.mimetype = None
         self.encoding = DEFAULT_ENCODING
-        self.media = (
-            None
-        )  #: A Python object that will be content-negotiated and sent back to the client. Typically, in JSON formatting.
+        self.media = None  #: A Python object that will be content-negotiated and
+        #: sent back to the client. Typically, in JSON formatting.
         self._stream = None
-        self.headers = (
-            {}
-        )  #: A Python dictionary of ``{key: value}``, representing the headers of the response.
+        self.headers = {}  #: A Python dictionary of ``{key: value}``,
+        #: representing the headers of the response.
         self.formats = formats
         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
@@ -304,6 +298,12 @@ class Response:
 
         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._stream is not None:
@@ -319,9 +319,9 @@ class Response:
                 content = content.encode(self.encoding)
             return (content, headers)
 
-        for format in self.formats:
-            if self.req.accepts(format):
-                return (await self.formats[format](self, encode=True)), {}
+        for format_ in self.formats:
+            if self.req.accepts(format_):
+                return (await self.formats[format_](self, encode=True)), {}
 
         # Default to JSON anyway.
         return (
@@ -360,7 +360,7 @@ class Response:
         )
         starlette_response.raw_headers.extend(cookie_header)
 
-    async def __call__(self, receive, send):
+    async def __call__(self, scope, receive, send):
         body, headers = await self.body
         if self.headers:
             headers.update(self.headers)
@@ -373,4 +373,8 @@ class Response:
         response = response_cls(body, status_code=self.status_code, headers=headers)
         self._prepare_cookies(response)
 
-        await response(receive, send)
+        await response(scope, receive, send)
+
+    @property
+    def ok(self):
+        return 200 <= self.status_code < 300

responder/routes.py

@@ -1,28 +1,74 @@
-import re
-import functools
+import asyncio
 import inspect
-from parse import parse
+import re
+import traceback
+from collections import defaultdict
+
+from starlette.concurrency import run_in_threadpool
+from starlette.exceptions import HTTPException
+from starlette.middleware.wsgi import WSGIMiddleware
+from starlette.websockets import WebSocket, WebSocketClose
+
+from . import status_codes
+from .formats import get_formats
+from .models import Request, Response
+
+_CONVERTORS = {
+    "int": (int, r"\d+"),
+    "str": (str, r"[^/]+"),
+    "float": (float, r"\d+(.\d+)?"),
+}
+
+PARAM_RE = re.compile("{([a-zA-Z_][a-zA-Z0-9_]*)(:[a-zA-Z_][a-zA-Z0-9_]*)?}")
 
 
-class Route:
-    _param_pattern = re.compile(r"{([^{}]*)}")
+def compile_path(path):
+    path_re = "^"
+    param_convertors = {}
+    idx = 0
 
-    def __init__(self, route, endpoint, *, websocket=False, before_request=False):
+    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):
@@ -32,46 +78,279 @@ 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 as ex:
+                if on_request is None:
+                    raise HTTPException(status_code=status_codes.HTTP_405) from ex
+        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 inspect.isclass(self.endpoint)
+    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.before_requests = (
+            {"http": [], "ws": []} if before_requests is None else before_requests
+        )
+        self.events = defaultdict(list)
+
+    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 add_event_handler(self, event_type, handler):
+        assert event_type in (
+            "startup",
+            "shutdown",
+        ), f"Only 'startup' and 'shutdown' events are supported, not {event_type}."
+        self.events[event_type].append(handler)
+
+    async def trigger_event(self, event_type):
+        for handler in self.events.get(event_type, []):
+            if asyncio.iscoroutinefunction(handler):
+                await handler()
+            else:
+                handler()
+
+    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
+
+        # FIXME: Please review!
+        request = Request(scope, receive)
+        response = Response(request, formats=get_formats())  # noqa: F841
+
+        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 lifespan(self, scope, receive, send):
+        message = await receive()
+        assert message["type"] == "lifespan.startup"
+
+        try:
+            await self.trigger_event("startup")
+        except BaseException:
+            msg = traceback.format_exc()
+            await send({"type": "lifespan.startup.failed", "message": msg})
+            raise
+
+        await send({"type": "lifespan.startup.complete"})
+        message = await receive()
+        assert message["type"] == "lifespan.shutdown"
+        await self.trigger_event("shutdown")
+        await send({"type": "lifespan.shutdown.complete"})
+
+    async def __call__(self, scope, receive, send):
+        assert scope["type"] in ("http", "websocket", "lifespan")
+
+        if scope["type"] == "lifespan":
+            await self.lifespan(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_endpoint(scope, receive, send)

responder/staticfiles.py

@@ -0,0 +1,20 @@
+from starlette.staticfiles import StaticFiles as StarletteStaticFiles
+
+
+class StaticFiles(StarletteStaticFiles):
+    """
+    Extension to Starlette's `StaticFiles`.
+
+    I've created an issue to discuss allowing multiple directories in
+    Starlette'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)]

responder/statics.py

@@ -1,7 +1,8 @@
+API_THEMES = ["elements", "rapidoc", "redoc", "swagger_ui"]
 DEFAULT_ENCODING = "utf-8"
-DEFAULT_API_THEME = "swaggerui"
+DEFAULT_OPENAPI_THEME = "swagger_ui"
 DEFAULT_SESSION_COOKIE = "Responder-Session"
-DEFAULT_SECRET_KEY = "NOTASECRET"
+DEFAULT_SECRET_KEY = "NOTASECRET"  # noqa: S105
 
 DEFAULT_CORS_PARAMS = {
     "allow_origins": (),

responder/templates.py

@@ -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,  # noqa: S701
+            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.
+        """  # noqa: E501
+        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.
+        """  # noqa: E501
+        template = self._env.from_string(source)
+        return template.render(*args, **kwargs)

responder/templates/__init__.py

@@ -1,145 +0,0 @@
-GRAPHIQL = """
-{% set GRAPHIQL_VERSION = '0.12.0' %}
-
-<!--
- *  Copyright (c) Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the license found in the
- *  LICENSE file in the root directory of this source tree.
--->
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      body {
-        height: 100%;
-        margin: 0;
-        width: 100%;
-        overflow: hidden;
-      }
-      #graphiql {
-        height: 100vh;
-      }
-    </style>
-
-    <!--
-      This GraphiQL example depends on Promise and fetch, which are available in
-      modern browsers, but can be "polyfilled" for older browsers.
-      GraphiQL itself depends on React DOM.
-      If you do not want to rely on a CDN, you can host these files locally or
-      include them directly in your favored resource bunder.
-    -->
-    <link href="//cdn.jsdelivr.net/npm/graphiql@{{ GRAPHIQL_VERSION }}/graphiql.css" rel="stylesheet"/>
-    <script src="//cdn.jsdelivr.net/npm/whatwg-fetch@2.0.3/fetch.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/react@16.2.0/umd/react.production.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/react-dom@16.2.0/umd/react-dom.production.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/graphiql@{{ GRAPHIQL_VERSION }}/graphiql.min.js"></script>
-  </head>
-  <body>
-    <div id="graphiql">Loading...</div>
-    <script>
-
-      /**
-       * This GraphiQL example illustrates how to use some of GraphiQL's props
-       * in order to enable reading and updating the URL parameters, making
-       * link sharing of queries a little bit easier.
-       *
-       * This is only one example of this kind of feature, GraphiQL exposes
-       * various React params to enable interesting integrations.
-       */
-
-      // Parse the search string to get url parameters.
-      var search = window.location.search;
-      var parameters = {};
-      search.substr(1).split('&').forEach(function (entry) {
-        var eq = entry.indexOf('=');
-        if (eq >= 0) {
-          parameters[decodeURIComponent(entry.slice(0, eq))] =
-            decodeURIComponent(entry.slice(eq + 1));
-        }
-      });
-
-      // if variables was provided, try to format it.
-      if (parameters.variables) {
-        try {
-          parameters.variables =
-            JSON.stringify(JSON.parse(parameters.variables), null, 2);
-        } catch (e) {
-          // Do nothing, we want to display the invalid JSON as a string, rather
-          // than present an error.
-        }
-      }
-
-      // When the query and variables string is edited, update the URL bar so
-      // that it can be easily shared
-      function onEditQuery(newQuery) {
-        parameters.query = newQuery;
-        updateURL();
-      }
-
-      function onEditVariables(newVariables) {
-        parameters.variables = newVariables;
-        updateURL();
-      }
-
-      function onEditOperationName(newOperationName) {
-        parameters.operationName = newOperationName;
-        updateURL();
-      }
-
-      function updateURL() {
-        var newSearch = '?' + Object.keys(parameters).filter(function (key) {
-          return Boolean(parameters[key]);
-        }).map(function (key) {
-          return encodeURIComponent(key) + '=' +
-            encodeURIComponent(parameters[key]);
-        }).join('&');
-        history.replaceState(null, null, newSearch);
-      }
-
-      // Defines a GraphQL fetcher using the fetch API. You're not required to
-      // use fetch, and could instead implement graphQLFetcher however you like,
-      // as long as it returns a Promise or Observable.
-      function graphQLFetcher(graphQLParams) {
-        // This example expects a GraphQL server at the path /graphql.
-        // Change this to point wherever you host your GraphQL server.
-        return fetch('{{ endpoint }}', {
-          method: 'post',
-          headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify(graphQLParams),
-          credentials: 'include',
-        }).then(function (response) {
-          return response.text();
-        }).then(function (responseBody) {
-          try {
-            return JSON.parse(responseBody);
-          } catch (error) {
-            return responseBody;
-          }
-        });
-      }
-
-      // Render <GraphiQL /> into the body.
-      // See the README in the top level of this module to learn more about
-      // how you can customize GraphiQL by providing different values or
-      // additional child elements.
-      ReactDOM.render(
-        React.createElement(GraphiQL, {
-          fetcher: graphQLFetcher,
-          query: parameters.query,
-          variables: parameters.variables,
-          operationName: parameters.operationName,
-          onEditQuery: onEditQuery,
-          onEditVariables: onEditVariables,
-          onEditOperationName: onEditOperationName
-        }),
-        document.getElementById('graphiql')
-      );
-    </script>
-  </body>
-</html>
-""".strip()

setup.py

@@ -2,156 +2,65 @@
 # -*- coding: utf-8 -*-
 import codecs
 import os
-import sys
-from shutil import rmtree
 
-from setuptools import find_packages, setup, Command
+from setuptools import find_packages, setup
+from versioningit import get_cmdclasses
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 with codecs.open(os.path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = "\n" + f.read()
 
-about = {}
-
-with open(os.path.join(here, "responder", "__version__.py")) as f:
-    exec(f.read(), about)
-
-if sys.argv[-1] == "publish":
-    os.system("python setup.py sdist bdist_wheel upload")
-    sys.exit()
-
 required = [
-    "starlette==0.10.*",
-    "uvicorn",
     "aiofiles",
-    "pyyaml",
-    "requests",
-    "graphene",
-    "graphql-server-core>=1.1",
-    "jinja2",
-    "parse",
-    "uvloop; sys_platform != 'win32'",
-    "rfc3986",
-    "python-multipart",
-    "chardet",
     "apispec>=1.0.0b1",
+    "chardet",
+    "docopt-ng",
     "marshmallow",
-    "asgiref",
-    "whitenoise",
-    "docopt",
-    "itsdangerous",
+    "requests",
     "requests-toolbelt",
-    "apistar",
+    "rfc3986",
+    "starlette[full]",
+    "uvicorn[standard]",
+    "whitenoise",
 ]
 
-
-# https://pypi.python.org/pypi/stdeb/0.8.5#quickstart-2-just-tell-me-the-fastest-way-to-make-a-deb
-class DebCommand(Command):
-    """Support for setup.py deb"""
-
-    description = "Build and publish the .deb package."
-    user_options = []
-
-    @staticmethod
-    def status(s):
-        """Prints things in bold."""
-        print("\033[1m{0}\033[0m".format(s))
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        try:
-            self.status("Removing previous builds…")
-            rmtree(os.path.join(here, "deb_dist"))
-        except FileNotFoundError:
-            pass
-        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"
-        )
-        self.status(u"Building .deb…")
-        os.chdir("deb_dist/pipenv-{0}".format(about["__version__"]))
-        os.system("dpkg-buildpackage -rfakeroot -uc -us")
-
-
-class UploadCommand(Command):
-    """Support setup.py publish."""
-
-    description = "Build and publish the package."
-    user_options = []
-
-    @staticmethod
-    def status(s):
-        """Prints things in bold."""
-        print("\033[1m{0}\033[0m".format(s))
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        try:
-            self.status("Removing previous builds…")
-            rmtree(os.path.join(here, "dist"))
-        except FileNotFoundError:
-            pass
-        self.status("Building Source distribution…")
-        os.system("{0} setup.py sdist bdist_wheel".format(sys.executable))
-        self.status("Uploading the package to PyPI via Twine…")
-        os.system("twine upload dist/*")
-        self.status("Pushing git tags…")
-        os.system("git tag v{0}".format(about["__version__"]))
-        os.system("git push --tags")
-        sys.exit()
-
-
 setup(
     name="responder",
-    version=about["__version__"],
-    description="A sorta familiar HTTP framework.",
+    description="A familiar HTTP Service Framework for Python.",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author="Kenneth Reitz",
     author_email="me@kennethreitz.org",
     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",
-        #     ],
-    },
-    python_requires=">=3.6",
+    package_data={},
+    python_requires=">=3.10",
     setup_requires=[],
     install_requires=required,
-    extras_require={},
+    extras_require={
+        "develop": ["poethepoet", "pyproject-fmt", "ruff", "validate-pyproject"],
+        "graphql": ["graphene"],
+        "release": ["build", "twine"],
+        "test": ["pytest", "pytest-cov", "pytest-mock", "flask"],
+    },
     include_package_data=True,
     license="Apache 2.0",
     classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Internet :: WWW/HTTP",
     ],
-    cmdclass={"upload": UploadCommand, "deb": DebCommand},
+    cmdclass=get_cmdclasses(),
 )

tests/conftest.py

@@ -1,9 +1,8 @@
-import graphene
-import responder
 from pathlib import Path
+
 import pytest
-import multiprocessing
-import concurrent.futures
+
+import responder
 
 
 @pytest.fixture
@@ -48,11 +47,9 @@ def flask():
 
 
 @pytest.fixture
-def schema():
-    class Query(graphene.ObjectType):
-        hello = graphene.String(name=graphene.String(default_value="stranger"))
-
-        def resolve_hello(self, info, name):
-            return f"Hello {name}"
-
-    return graphene.Schema(query=Query)
+def template_path(tmpdir):
+    # create a Jinja template file on the filesystem
+    template_name = "test.html"
+    template_file = tmpdir.mkdir("static").join(template_name)
+    template_file.write("{{ var }}")
+    return template_file

tests/test_encodings.py

@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_custom_encoding(api, session):
     data = "hi alex!"
 
@@ -9,7 +6,7 @@ def test_custom_encoding(api, session):
         req.encoding = "ascii"
         resp.text = await req.text
 
-    r = session.get(api.url_for(route), data=data)
+    r = session.post(api.url_for(route), data=data)
     assert r.text == data
 
 
@@ -20,5 +17,5 @@ def test_bytes_encoding(api, session):
     async def route(req, resp):
         resp.text = (await req.content).decode("utf-8")
 
-    r = session.get(api.url_for(route), data=data)
+    r = session.post(api.url_for(route), data=data)
     assert r.content == data

tests/test_models.py

@@ -1,9 +1,9 @@
 import inspect
+
 import pytest
 
 from responder import models
 
-
 _default_query = "q=%7b%20hello%20%7d&name=myname&user_name=test_user"
 
 

tests/test_responder.py

@@ -1,14 +1,14 @@
-import concurrent
+import random
+import string
 
 import pytest
 import yaml
-import random
-import responder
-import requests
-import string
-import io
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.testclient import TestClient as StarletteTestClient
 
-from starlette.responses import PlainTextResponse
+import responder
+from responder.routes import Route, WebSocketRoute
+from responder.templates import Templates
 
 
 def test_api_basic_route(api):
@@ -17,6 +17,45 @@ 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):
@@ -27,39 +66,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):
@@ -72,10 +79,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):
@@ -83,14 +90,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):
@@ -125,14 +132,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
-
-
-def test_graphql_schema_query_querying(api, schema):
-    api.add_route("/", responder.ext.GraphQLView(schema=schema, api=api))
-
-    r = api.requests.get("http://;/?q={ hello }", headers={"Accept": "json"})
-    assert r.json() == {"data": {"hello": "Hello stranger"}}
+    assert yaml.load(r.content, Loader=yaml.FullLoader) == dump  # noqa: S506
 
 
 def test_argumented_routing(api):
@@ -189,14 +189,16 @@ def test_query_params(api, url):
 
 
 # Requires https://github.com/encode/starlette/pull/102
-def test_form_data(api):
-    @api.route("/")
-    async def route(req, resp):
-        resp.media = {"form": await req.media("form")}
+# def test_form_data(api):
 
-    dump = {"q": "q"}
-    r = api.requests.get(api.url_for(route), data=dump)
-    assert r.json()["form"] == dump
+#     @api.route("/")
+#     async def route(req, resp):
+#         resp.media = {"form": await req.media("form")}
+
+#     dump = {"q": "q"}
+
+#     r = api.requests.get(api.url_for(route), params=dump)
+#     assert r.json()["form"] == dump
 
 
 def test_async_function(api):
@@ -221,7 +223,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):
@@ -237,7 +239,7 @@ def test_background(api):
         api.text = "ok"
 
     r = api.requests.get(api.url_for(route))
-    assert r.ok
+    assert r.status_code < 300
 
 
 def test_multiple_routes(api):
@@ -256,21 +258,6 @@ def test_multiple_routes(api):
     assert r.text == "2"
 
 
-def test_graphql_schema_json_query(api, schema):
-    api.add_route("/", responder.ext.GraphQLView(schema=schema, api=api))
-
-    r = api.requests.post("http://;/", json={"query": "{ hello }"})
-    assert r.ok
-
-
-def test_graphiql(api, schema):
-    api.add_route("/", responder.ext.GraphQLView(schema=schema, api=api))
-
-    r = api.requests.get("http://;/", headers={"Accept": "text/html"})
-    assert r.ok
-    assert "GraphiQL" in r.text
-
-
 def test_json_uploads(api):
     @api.route("/")
     async def route(req, resp):
@@ -304,6 +291,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"}
@@ -312,9 +304,7 @@ def test_json_downloads(api):
     def route(req, resp):
         resp.media = dump
 
-    r = api.requests.get(
-        api.url_for(route), headers={"Content-Type": "application/json"}
-    )
+    r = api.requests.get(api.url_for(route), headers={"Content-Type": "application/json"})
     assert r.json() == dump
 
 
@@ -331,13 +321,47 @@ def test_yaml_downloads(api):
     assert yaml.safe_load(r.content) == dump
 
 
-def test_schema_generation():
+def test_schema_generation_explicit():
+    import marshmallow
+
     import responder
+    from responder.ext.schema import OpenAPISchema as OpenAPISchema
+
+    api = responder.API()
+
+    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):
+        """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_schema_generation():
     from marshmallow import Schema, fields
 
-    api = responder.API(
-        title="Web Service", openapi="3.0.2", allowed_hosts=["testserver", ";"]
-    )
+    import responder
+
+    api = responder.API(title="Web Service", openapi="3.0.2")
 
     @api.schema("Pet")
     class PetSchema(Schema):
@@ -353,7 +377,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"})
 
@@ -364,9 +388,11 @@ def test_schema_generation():
     assert dump["openapi"] == "3.0.2"
 
 
-def test_documentation():
+def test_documentation_explicit():
+    import marshmallow
+
     import responder
-    from marshmallow import Schema, fields
+    from responder.ext.schema import OpenAPISchema as OpenAPISchema
 
     description = "This is a sample server for a pet store."
     terms_of_service = "http://example.com/terms/"
@@ -375,7 +401,60 @@ def test_documentation():
         "url": "http://www.example.com/support",
         "email": "support@example.com",
     }
-    license = {
+    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():
+    from marshmallow import Schema, fields
+
+    import responder
+
+    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",
     }
@@ -388,7 +467,7 @@ def test_documentation():
         description=description,
         terms_of_service=terms_of_service,
         contact=contact,
-        license=license,
+        license=license_,
         allowed_hosts=["testserver", ";"],
     )
 
@@ -406,7 +485,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"})
 
@@ -422,7 +501,7 @@ def test_mount_wsgi_app(api, flask):
     api.mount("/flask", flask)
 
     r = api.requests.get("http://;/flask")
-    assert r.ok
+    assert r.status_code < 300
 
 
 def test_async_class_based_views(api):
@@ -472,13 +551,12 @@ def test_sessions(api):
 
     r = api.requests.get(api.url_for(view))
     assert (
-        r.cookies[api.session_cookie]
-        == '{"hello": "world"}.r3EB04hEEyLYIJaAXCEq3d4YEbs'
+        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")
@@ -487,20 +565,53 @@ 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")
         result = {}
         result["hello"] = files["hello"]["content"].decode("utf-8")
-        result["not-a-file"] = files["not-a-file"].decode("utf-8")
+        # result["not-a-file"] = files["not-a-file"].decode("utf-8")
         resp.media = {"files": result}
 
-    world = io.StringIO("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", "not-a-file": "data only"}}
+    # # world = io.StringIO("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", "not-a-file": "data only"}}
 
 
 def test_500(api):
@@ -512,7 +623,7 @@ def test_500(api):
         api, base_url="http://;", raise_server_exceptions=False
     )
     r = dumb_client.get(api.url_for(view))
-    assert not r.ok
+    assert r.status_code >= 300
     assert r.status_code == responder.status_codes.HTTP_500
 
 
@@ -522,13 +633,71 @@ 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 ws:
+        data = ws.receive_text()
+        assert data == payload
+
+
+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 ws:
+        data = ws.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 ws:
+        data = ws.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 ws:
+        data = ws.receive_json()
+        assert data == {"before": "request"}
+        data = ws.receive_json()
+        assert data == payload
+
 
 def test_startup(api):
     who = [None]
@@ -542,7 +711,7 @@ def test_startup(api):
         who[0] = "world"
 
     with api.requests as session:
-        r = session.get(f"http://;/hello")
+        r = session.get("http://;/hello")
         assert r.text == "hello, world!"
 
 
@@ -555,21 +724,21 @@ def test_redirects(api, session):
     def one(req, resp):
         resp.text = "redirected"
 
-    assert session.get("/1").url == "http://;/1"
+    assert session.get("/2").url == "http://;/1"
 
 
 def test_session_thoroughly(api, session):
     @api.route("/set")
-    def set(req, resp):
+    def setter(req, resp):
         resp.session["hello"] = "world"
         api.redirect(resp, location="/get")
 
     @api.route("/get")
-    def get(req, resp):
+    def getter(req, resp):
         resp.media = {"session": req.session}
 
-    r = session.get(api.url_for(set))
-    r = session.get(api.url_for(get))
+    r = session.get(api.url_for(setter))
+    r = session.get(api.url_for(getter))
     assert r.json() == {"session": {"hello": "world"}}
 
 
@@ -578,6 +747,10 @@ def test_before_response(api, session):
     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"
@@ -586,8 +759,12 @@ def test_before_response(api, session):
     assert "x-pizza" in r.headers
 
 
-def test_allowed_hosts():
-    api = responder.API(allowed_hosts=[";", "tenant.;"])
+@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.;"], enable_hsts=enable_hsts, cors=cors
+    )
 
     @api.route("/")
     def get(req, resp):
@@ -636,9 +813,9 @@ def test_allowed_hosts():
 
 def create_asset(static_dir, name=None, parent_dir=None):
     if name is None:
-        name = random.choices(string.ascii_letters, k=6)
+        name = random.choices(string.ascii_letters, k=6)  # noqa: S311
         # :3
-        ext = random.choices(string.ascii_letters, k=2)
+        ext = random.choices(string.ascii_letters, k=2)  # noqa: S311
         name = f"{name}.{ext}"
 
     if parent_dir is None:
@@ -651,14 +828,15 @@ def create_asset(static_dir, name=None, parent_dir=None):
     return asset
 
 
-def test_staticfiles(tmpdir):
+@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))
+    api = responder.API(static_dir=str(static_dir), static_route=static_route)
     session = api.session()
 
     static_route = api.static_route
@@ -682,32 +860,28 @@ def test_staticfiles(tmpdir):
     assert r.status_code == api.status_codes.HTTP_404
 
 
-def test_staticfiles_custom_route(tmpdir):
-    static_dir = tmpdir.mkdir("static")
-    static_route = "custom/static/route/"
-
-    asset = create_asset(static_dir)
-
-    api = responder.API(static_dir=str(static_dir), static_route=static_route)
+def test_staticfiles_none_dir(tmpdir):
+    api = responder.API(static_dir=None)
     session = api.session()
 
-    # Check
-    assert api.static_route == "/custom/static/route"
+    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_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
+    # dir listing
     r = session.get(f"{static_route}")
     assert r.status_code == api.status_codes.HTTP_404
 
+    # SPA
+    with pytest.raises(Exception):  # noqa: B017
+        api.add_route("/spa", static=True)
+
 
 def test_response_html_property(api):
     @api.route("/")
@@ -742,7 +916,6 @@ def test_stream(api, session):
 
     @api.route("/{who}")
     async def greeting(req, resp, *, who):
-
         resp.stream(shout_stream, who)
 
     r = session.get("/morocco")
@@ -756,18 +929,64 @@ def test_stream(api, session):
             def foo():
                 pass
 
-            res.stream(foo)
+            resp.stream(foo)
 
         with pytest.raises(AssertionError):
 
             async def foo():
                 pass
 
-            res.stream(foo)
+            resp.stream(foo)
 
         with pytest.raises(AssertionError):
 
             def foo():
                 yield "oopsie"
 
-            res.stream(foo)
+            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"
+
+                return await call_next(request)
+
+        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"

tests/test_routes.py

@@ -1,133 +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 params and subpath"
-        ),
-        pytest.param(
-            "/{greetings}/{name}/{hello}",
-            (True, True, -3),
-            id="with 3 params and subpath",
-        ),
-        pytest.param(
-            "/{greetings}_{name}", (True, True, -2), id="with 2 params and underscore"
-        ),
-        pytest.param("/{greetings}/test", (True, False, -1), id="with one param"),
-        pytest.param(
-            "/{greetings}.{name}/test",
-            (True, False, -2),
-            id="with 2 params and dot in the middle",
-        ),
-        pytest.param(
-            "/{greetings}/{name}/test",
-            (True, False, -2),
-            id="with 2 params and subpath",
-        ),
-        pytest.param(
-            "/{greetings}/{name}/{hello}/test",
-            (True, False, -3),
-            id="with 3 params and subpath",
-        ),
-        pytest.param(
-            "/{greetings}_{name}/test",
-            (True, False, -2),
-            id="with 2 params and underscore",
-        ),
-        pytest.param("/hello", (False, False, 0), id="without params"),
-    ],
-)
-def test_weight(path_param, expected_weight):
-    r = routes.Route(path_param, "test_endpoint")
-    assert r._weight() == expected_weight

tests/test_status_codes.py

@@ -1,4 +1,5 @@
 import pytest
+
 from responder import status_codes