version bump

Merge pull request #218 from tomchristie/patch-1
Bring testominials in line with README
2026-06-05 23:00:17 +00:00 · 2018-11-11 16:58:07 -05:00 · 2018-11-10 17:48:29 -05:00 · 2018-11-09 18:25:53 +00:00 · 2018-11-07 17:25:14 -05:00 · 2018-11-07 17:25:02 -05:00
14 changed files with 307 additions and 145 deletions
@@ -1,3 +1,6 @@
+# v1.1.1
+- Run sync views in a threadpoolexecutor.
+
 # v1.1.0
 - Support for `before_request`.

@@ -32,10 +32,10 @@
        },
        "apispec": {
            "hashes": [
-                "sha256:c2e6ac6471aaf7c6ec6d12714821898910c6b3c87c189de9a2e3754786b86ada",
-                "sha256:fa7dfa8a292bae9b1e70c44a50bf61901805821726c5b804568c9f2501f57ebb"
+                "sha256:50b1cb8f0dc12db00a53e748b27ae601efdc210f1cb4358729173337b2e47354",
+                "sha256:648934f67aefa386cdde5d1d38ceb1c9fe9157c59824a6fb5499409a70dabab4"
            ],
-            "version": "==1.0.0b3"
+            "version": "==1.0.0b5"
        },
        "apistar": {
            "hashes": [
@@ -126,9 +126,10 @@
        },
        "itsdangerous": {
            "hashes": [
-                "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
+                "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
+                "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
            ],
-            "version": "==0.24"
+            "version": "==1.1.0"
        },
        "jinja2": {
            "hashes": [
@@ -139,16 +140,43 @@
        },
        "markupsafe": {
            "hashes": [
-                "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+                "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.0"
+            "version": "==1.1.0"
        },
        "marshmallow": {
            "hashes": [
-                "sha256:5e0053c86e3abaa72a03bbe0021ec97270c13fd6400b682eb1aeaf24b871bc8a",
-                "sha256:81884e930c1db72d8b8e3d8d2d090f2f43427e5c11c37f703b29879980491ab6"
+                "sha256:0a96d88418c4e7c50a39a734c4ed3d2a991a37e6b7a8970dbbdb8ccb7f08ecb0",
+                "sha256:5a65e5c7e9b4e050c989e09d7353eeb91d313d39dfcfa6540aa27f39bfb00b4e"
            ],
-            "version": "==3.0.0b19"
+            "version": "==3.0.0b20"
        },
        "parse": {
            "hashes": [
@@ -220,48 +248,48 @@
        },
        "starlette": {
            "hashes": [
-                "sha256:eac0f6cab6b48846a0c1af16615430ae0e7a95f669ee0841a7e2f242d51d8935"
+                "sha256:418f1f333529f9b9d5a7bffdaef7df43623b648b5c088ae5be1301c112435641"
            ],
-            "version": "==0.5.5"
+            "version": "==0.7.4"
        },
        "urllib3": {
            "hashes": [
-                "sha256:41c3db2fc01e5b907288010dec72f9d0a74e37d6994e6eb56849f59fea2265ae",
-                "sha256:8819bba37a02d143296a4d032373c4dd4aca11f6d4c9973335ca75f9c8475f59"
+                "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39",
+                "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"
            ],
-            "version": "==1.24"
+            "version": "==1.24.1"
        },
        "uvicorn": {
            "hashes": [
-                "sha256:e2b742fdaa0b52f4aac92fd2c078e7f1f17d11322bb3efb09d341d5c6998b4b5"
+                "sha256:38ae2c2d6438438aed08999bb9f7fb0bb12ac99aa9831b30a6045aab88f2cec1"
            ],
-            "version": "==0.3.16"
+            "version": "==0.3.20"
        },
        "websockets": {
            "hashes": [
-                "sha256:0e2f7d6567838369af074f0ef4d0b802d19fa1fee135d864acc656ceefa33136",
-                "sha256:2a16dac282b2fdae75178d0ed3d5b9bc3258dabfae50196cbb30578d84b6f6a6",
-                "sha256:5a1fa6072405648cb5b3688e9ed3b94be683ce4a4e5723e6f5d34859dee495c1",
-                "sha256:5c1f55a1274df9d6a37553fef8cff2958515438c58920897675c9bc70f5a0538",
-                "sha256:669d1e46f165e0ad152ed8197f7edead22854a6c90419f544e0f234cc9dac6c4",
-                "sha256:695e34c4dbea18d09ab2c258994a8bf6a09564e762655408241f6a14592d2908",
-                "sha256:6b2e03d69afa8d20253455e67b64de1a82ff8612db105113cccec35d3f8429f0",
-                "sha256:79ca7cdda7ad4e3663ea3c43bfa8637fc5d5604c7737f19a8964781abbd1148d",
-                "sha256:7fd2dd9a856f72e6ed06f82facfce01d119b88457cd4b47b7ae501e8e11eba9c",
-                "sha256:82c0354ac39379d836719a77ee360ef865377aa6fdead87909d50248d0f05f4d",
-                "sha256:8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c",
-                "sha256:91ec98640220ae05b34b79ee88abf27f97ef7c61cf525eec57ea8fcea9f7dddb",
-                "sha256:952be9540d83dba815569d5cb5f31708801e0bbfc3a8c5aef1890b57ed7e58bf",
-                "sha256:99ac266af38ba1b1fe13975aea01ac0e14bb5f3a3200d2c69f05385768b8568e",
-                "sha256:9fa122e7adb24232247f8a89f2d9070bf64b7869daf93ac5e19546b409e47e96",
-                "sha256:a0873eadc4b8ca93e2e848d490809e0123eea154aa44ecd0109c4d0171869584",
-                "sha256:cb998bd4d93af46b8b49ecf5a72c0a98e5cc6d57fdca6527ba78ad89d6606484",
-                "sha256:e02e57346f6a68523e3c43bbdf35dde5c440318d1f827208ae455f6a2ace446d",
-                "sha256:e79a5a896bcee7fff24a788d72e5c69f13e61369d055f28113e71945a7eb1559",
-                "sha256:ee55eb6bcf23ecc975e6b47c127c201b913598f38b6a300075f84eeef2d3baff",
-                "sha256:f1414e6cbcea8d22843e7eafdfdfae3dd1aba41d1945f6ca66e4806c07c4f454"
+                "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": "==6.0"
+            "version": "==7.0"
        },
        "whitenoise": {
            "hashes": [
@@ -407,12 +435,6 @@
            "index": "pypi",
            "version": "==1.0.2"
        },
-        "future": {
-            "hashes": [
-                "sha256:eb6d4df04f1fb538c99f69c9a28b255d1ee4e825d479b9c62fc38c0cf38065a4"
-            ],
-            "version": "==0.17.0"
-        },
        "idna": {
            "hashes": [
                "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
@@ -429,9 +451,10 @@
        },
        "itsdangerous": {
            "hashes": [
-                "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
+                "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
+                "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
            ],
-            "version": "==0.24"
+            "version": "==1.1.0"
        },
        "jinja2": {
            "hashes": [
@@ -442,16 +465,43 @@
        },
        "markupsafe": {
            "hashes": [
-                "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+                "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.0"
+            "version": "==1.1.0"
        },
        "marshmallow": {
            "hashes": [
-                "sha256:5e0053c86e3abaa72a03bbe0021ec97270c13fd6400b682eb1aeaf24b871bc8a",
-                "sha256:81884e930c1db72d8b8e3d8d2d090f2f43427e5c11c37f703b29879980491ab6"
+                "sha256:0a96d88418c4e7c50a39a734c4ed3d2a991a37e6b7a8970dbbdb8ccb7f08ecb0",
+                "sha256:5a65e5c7e9b4e050c989e09d7353eeb91d313d39dfcfa6540aa27f39bfb00b4e"
            ],
-            "version": "==3.0.0b19"
+            "version": "==3.0.0b20"
        },
        "mccabe": {
            "hashes": [
@@ -519,18 +569,18 @@
        },
        "pyparsing": {
            "hashes": [
-                "sha256:bc6c7146b91af3f567cf6daeaec360bc07d45ffec4cf5353f4d7a208ce7ca30a",
-                "sha256:d29593d8ebe7b57d6967b62494f8c72b03ac0262b1eed63826c6f788b3606401"
+                "sha256:40856e74d4987de5d01761a22d1621ae1c7f8774585acae358aa5c5936c6c90b",
+                "sha256:f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592"
            ],
-            "version": "==2.2.2"
+            "version": "==2.3.0"
        },
        "pytest": {
            "hashes": [
-                "sha256:212be78a6fa5352c392738a49b18f74ae9aeec1040f47c81cadbfd8d1233c310",
-                "sha256:6f6c1efc8d0ccc21f8f6c34d8330baca883cf109b66b3df954b0a117e5528fb4"
+                "sha256:630ff1dbe04f469ee78faa5660f712e58b953da7df22ea5d828c9012e134da43",
+                "sha256:a2b5232735dd0b736cbea9c0f09e5070d78fcaba2823a4f6f09d9a81bd19415c"
            ],
            "index": "pypi",
-            "version": "==3.9.2"
+            "version": "==3.10.0"
        },
        "pytest-cov": {
            "hashes": [
@@ -542,17 +592,17 @@
        },
        "pytz": {
            "hashes": [
-                "sha256:642253af8eae734d1509fc6ac9c1aee5e5b69d76392660889979b9870610a46b",
-                "sha256:91e3ccf2c344ffaa6defba1ce7f38f97026943f675b7703f44789768e4cb0ece"
+                "sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca",
+                "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6"
            ],
-            "version": "==2018.6"
+            "version": "==2018.7"
        },
        "readme-renderer": {
            "hashes": [
-                "sha256:219a02f5359b6631f5ab952f6906c6c105bdd8bc4bf19c1ec5ee8bd9ea2dc1eb",
-                "sha256:f8f122ad9fd6d138337531379575a01a0b6ca70aedca78f094cb833da38c8c0c"
+                "sha256:bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f",
+                "sha256:c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d"
            ],
-            "version": "==23.0"
+            "version": "==24.0"
        },
        "requests": {
            "hashes": [
@@ -621,10 +671,10 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:41c3db2fc01e5b907288010dec72f9d0a74e37d6994e6eb56849f59fea2265ae",
-                "sha256:8819bba37a02d143296a4d032373c4dd4aca11f6d4c9973335ca75f9c8475f59"
+                "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39",
+                "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"
            ],
-            "version": "==1.24"
+            "version": "==1.24.1"
        },
        "webencodings": {
            "hashes": [
@@ -23,7 +23,6 @@ This gets you a ASGI app, with a production static files server pre-installed, j

 > "I love that you are exploring new patterns. Go go go!" — Danny Greenfield, author of [Two Scoops of Django]()

-> "Love what I have seen while it's in progress! Many features of Responder are from my wishlist for Flask, and it's even faster and even easier than Flask!" — Luna C.

 ## More Examples

@@ -11,9 +11,10 @@ Assuming existing ``api.py`` and ``Pipfile.lock`` containing ``responder``.
 ``Dockerfile``::

    FROM kennethreitz/pipenv
-
+    ENV PORT '80'
    COPY . /app
    CMD python3 api.py
+    EXPOSE 80

 That's it!

@@ -45,7 +45,7 @@ Features
 --------

 - A pleasant API, with a single import statement.
- Class-based views without inheritence.
+- Class-based views without inheritance.
 - ASGI framework, the future of Python web services.
 - The ability to mount any ASGI / WSGI app at a subroute.
 - *f-string syntax* route declaration.
@@ -80,18 +80,8 @@ Testimonials
    — Danny Greenfield, author of `Two Scoops of Django`_


-..
-
-
-   “The most ambitious crossover event in history.”
-
-    —Pablo Cabezas, `on Tom Christie joining the project`_
-
-
-.. _APIStar: https://github.com/encode/apistar
 .. _Django REST Framework: https://www.django-rest-framework.org/
-.. _Two Scoops of Django:
-.. _on Tom Christie joining the project: https://twitter.com/pabloteleco/status/1050841098321620992?s=20
+.. _Two Scoops of Django: https://www.twoscoopspress.com/products/two-scoops-of-django-1-11

 User Guides
 -----------
@@ -61,7 +61,7 @@ Responder comes with built-in support for OpenAPI / marshmallow::
    import responder
    from marshmallow import Schema, fields

-    api = responder.API(title="Web Service", version="1.0", openapi="3.0")
+    api = responder.API(title="Web Service", version="1.0", openapi="3.0.0")


    @api.schema("Pet")
@@ -81,7 +81,7 @@ Responder comes with built-in support for OpenAPI / marshmallow::
                    schema:
                        $ref = "#/components/schemas/Pet"
        """
-        resp.media = PetSchema().dump({"name": "little orange"})
+        resp.media = PetSchema().dump({"name": "little orange"}).data


 ::
@@ -112,7 +112,7 @@ Interactive Documentation

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

-    api = responder.API(title="Web Service", version="1.0", openapi="3.0", docs_route="/docs")
+    api = responder.API(title="Web Service", version="1.0", openapi="3.0.0", docs_route="/docs")

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

@@ -240,3 +240,22 @@ In order to set custom parameters, you need to set the ``cors_params`` argument
 * ``allow_credentials`` - Indicate that cookies should be supported for cross-origin requests. Defaults to ``False``.
 * ``expose_headers`` - Indicate any response headers that should be made accessible to the browser. Defaults to ``[]``.
 * ``max_age`` - Sets a maximum time in seconds for browsers to cache CORS responses. Defaults to ``60``.
+
+Trusted Hosts
+-------------
+
+Make sure that all the incoming requests headers have a valid ``host``, that matches one of the provided patterns in the ``allowed_hosts`` attribute, in order to prevent HTTP Host Header attacks.
+
+A 400 response will be raised, if a request does not match any of the provided patterns in the ``allowed_hosts`` attribute.
+
+::
+
+    api = responder.API(allowed_hosts=[example.com, tenant.example.com])
+
+* ``allowed_hosts`` - A list of allowed hostnames. 
+
+Note:
+
+* By default, all hostnames are allowed.
+* Wildcard domains such as ``*.example.com`` are supported.
+* To allow any hostname use ``allowed_hosts=["*"]``.
@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.1.2"
@@ -13,12 +13,12 @@ import yaml
 from apispec import APISpec, yaml_utils
 from apispec.ext.marshmallow import MarshmallowPlugin
 from asgiref.wsgi import WsgiToAsgi
-from starlette.debug import DebugMiddleware
 from starlette.exceptions import ExceptionMiddleware
 from starlette.lifespan import LifespanHandler
 from starlette.middleware.cors import CORSMiddleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware
+from starlette.middleware.trustedhost import TrustedHostMiddleware
 from starlette.routing import Router
 from starlette.staticfiles import StaticFiles
 from starlette.testclient import TestClient
@@ -66,7 +66,10 @@ class API:
        enable_hsts=False,
        docs_route=None,
        cors=False,
+        cors_params=DEFAULT_CORS_PARAMS,
+        allowed_hosts=None,
    ):
+        self.background = BackgroundQueue()

        self.secret_key = secret_key
        self.title = title
@@ -86,7 +89,16 @@ class API:

        self.hsts_enabled = enable_hsts
        self.cors = cors
-        self.cors_params = DEFAULT_CORS_PARAMS
+        self.cors_params = cors_params
+
+        if not allowed_hosts:
+            # if not debug:
+            #     raise RuntimeError(
+            #         "You need to specify `allowed_hosts` when debug is set to False"
+            #     )
+            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)
@@ -107,7 +119,6 @@ class API:

        # Cached requests session.
        self._session = None
-        self.background = BackgroundQueue()

        if self.openapi_version:
            self.add_route(openapi_route, self.schema_response)
@@ -118,11 +129,12 @@ class API:
        self.default_endpoint = None
        self.app = self.dispatch
        self.add_middleware(GZipMiddleware)
-        if debug:
-            self.add_middleware(DebugMiddleware)

        if self.hsts_enabled:
            self.add_middleware(HTTPSRedirectMiddleware)
+
+        self.add_middleware(TrustedHostMiddleware, allowed_hosts=self.allowed_hosts)
+
        self.lifespan_handler = LifespanHandler()

        if self.cors:
@@ -169,10 +181,10 @@ class API:
                operations = yaml_utils.load_operations_from_docstring(
                    self.routes[route].description
                )
-                spec.add_path(path=route, operations=operations)
+                spec.path(path=route, operations=operations)

        for name, schema in self.schemas.items():
-            spec.definition(name, schema=schema)
+            spec.components.schema(name, schema=schema)

        return spec

@@ -279,7 +291,6 @@ class API:
        # Get the route.
        route = self.path_matches_route(req.url.path)
        route = self.routes.get(route)
-
        if route:
            if route.uses_websocket:
                resp = WebSocket(**options)
@@ -308,17 +319,18 @@ class API:
            try:
                try:
                    # Run the view.
-                    r = route.endpoint(req, resp, **params)
+
+                    r = self.background(route.endpoint, req, resp, **params)
                    # If it's async, await it.
                    if hasattr(r, "cr_running"):
                        await r
                except TypeError as e:
                    cont = True
            except Exception:
-                self.default_response(req, resp, error=True)
+                self.background(self.default_response, req, resp, error=True)
                raise

-        elif route.is_class_based or cont:
+        if route.is_class_based or cont:
            try:
                view = route.endpoint(**params)
            except TypeError:
@@ -326,29 +338,32 @@ class API:
                    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)(req, resp, **params)
+                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:
-                self.default_response(req, resp, error=True)
+                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)(req, resp, **params)
+                r = getattr(view, f"on_{method}", self.no_response)
+                r = self.background(r, req, resp, **params)
                # If it's async, await it.
                if hasattr(r, "send"):
                    await r
            except Exception as e:
-
-                self.default_response(req, resp, error=True)
+                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.
@@ -504,7 +519,7 @@ class API:
        """

        if self._session is None:
-            self._session = TestClient(self)
+            self._session = TestClient(self, base_url=base_url)
        return self._session

    def _route_for(self, endpoint):
@@ -586,7 +601,7 @@ class API:
        template = self.jinja_env.from_string(s_)
        return template.render(**values)

-    def run(self, address=None, port=None, debug=False, **options):
+    def serve(self, *, address=None, port=None, debug=False, **options):
        """Runs the application with uvicorn. If the ``PORT`` environment
        variable is set, requests will be served on that port automatically to all
        known hosts.
@@ -611,3 +626,6 @@ class API:
            uvicorn.run(self, host=address, port=port, debug=debug, **options)

        spawn()
+
+    def run(self, **kwargs):
+        self.serve(**kwargs)
@@ -1,6 +1,8 @@
-import traceback
-import multiprocessing
+import asyncio
+import functools
 import concurrent.futures
+import multiprocessing
+import traceback


 class BackgroundQueue:
@@ -33,3 +35,11 @@ class BackgroundQueue:
            return result

        return do_task
+
+    async def __call__(self, func, *args, **kwargs) -> None:
+        if asyncio.iscoroutinefunction(func):
+            return await asyncio.ensure_future(func(*args, **kwargs))
+        else:
+            fn = functools.partial(func, *args, **kwargs)
+            loop = asyncio.get_event_loop()
+            return await loop.run_in_executor(None, fn)
@@ -266,10 +266,10 @@ class Response:

    @property
    async def body(self):
-        if self.content:
+        if self.content is not None:
            return (self.content, {})

-        if self.text:
+        if self.text is not None:
            return (self.text.encode(self.encoding), {"Encoding": self.encoding})

        for format in self.formats:
@@ -1,17 +1,8 @@
 import re
+import functools
 from parse import parse


-def memoize(f):
-    def helper(self, s):
-        memoize_key = f"{f.__name__}:{s}"
-        if memoize_key not in self._memo:
-            self._memo[memoize_key] = f(self, s)
-        return self._memo[memoize_key]
-
-    return helper
-
-
 class Route:
    _param_pattern = re.compile(r"{([^{}]*)}")

@@ -20,7 +11,6 @@ class Route:
        self.endpoint = endpoint
        self.uses_websocket = websocket
        self.before_request = before_request
-        self._memo = {}

    def __repr__(self):
        return f"<Route {self.route!r}={self.endpoint!r}>"
@@ -45,7 +35,7 @@ class Route:
    def has_parameters(self):
        return bool(self._param_pattern.search(self.route))

-    @memoize
+    @functools.lru_cache(maxsize=None)
    def does_match(self, s):
        if s == self.route:
            return True
@@ -53,7 +43,7 @@ class Route:
        named = self.incoming_matches(s)
        return bool(len(named))

-    @memoize
+    @functools.lru_cache(maxsize=None)
    def incoming_matches(self, s):
        results = parse(self.route, s)
        return results.named if results else {}
@@ -64,7 +54,8 @@ class Route:
    def _weight(self):
        params = set(self._param_pattern.findall(self.route))
        params_count = len(params)
-        return params_count != 0, -params_count
+        w = len(self.route.rsplit('}', 1)[-1].strip('/'))
+        return params_count != 0, w == 0, -params_count

    @property
    def is_class_based(self):
@@ -75,3 +66,11 @@ class Route:
        code = hasattr(self.endpoint, "__code__")
        kwdefaults = hasattr(self.endpoint, "__kwdefaults__")
        return all((callable(self.endpoint), code, kwdefaults))
+
+    def __hash__(self):
+        return (
+            hash(self.route)
+            ^ hash(self.endpoint)
+            ^ hash(self.uses_websocket)
+            ^ hash(self.before_request)
+        )
@@ -18,7 +18,10 @@ def current_dir():

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


@pytest.fixture
@@ -333,7 +333,11 @@ def test_schema_generation():
    import responder
    from marshmallow import Schema, fields

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

    @api.schema("Pet")
    class PetSchema(Schema):
@@ -364,7 +368,12 @@ def test_documentation():
    import responder
    from marshmallow import Schema, fields

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

    @api.schema("Pet")
    class PetSchema(Schema):
@@ -527,7 +536,7 @@ def test_redirects(api, session):
    def one(req, resp):
        resp.text = "redirected"

-    assert session.get("/1").url == "http://testserver/1"
+    assert session.get("/1").url == "http://;/1"


 def test_session_thoroughly(api, session):
@@ -541,12 +550,10 @@ def test_session_thoroughly(api, session):
        resp.media = {"session": req.session}

    r = session.get(api.url_for(set))
-    print(r.headers)
    r = session.get(api.url_for(get))
-    print(r.request.headers)
    assert r.json() == {"session": {"hello": "world"}}

-def test_before_responpse(api, session):
+def test_before_response(api, session):

    @api.route("/get")
    def get(req, resp):
@@ -559,3 +566,54 @@ def test_before_responpse(api, session):

    r = session.get(api.url_for(get))
    assert 'x-pizza' in r.headers
+
+def test_allowed_hosts():
+    api = responder.API(
+        allowed_hosts=[";", "tenant.;"]
+    )
+
+    @api.route("/")
+    def get(req, resp):
+        pass
+
+    # Exact match
+    r = api.requests.get(api.url_for(get))
+    assert r.status_code == 200
+
+    # Reset the session
+    api._session = None
+    r = api.session(base_url="http://tenant.;").get(api.url_for(get))
+    assert r.status_code == 200
+
+    # Reset the session
+    api._session = None
+    r = api.session(base_url="http://unkownhost").get(api.url_for(get))
+    assert r.status_code == 400
+
+    # Reset the session
+    api._session = None
+    r = api.session(base_url="http://unkown_tenant.;").get(api.url_for(get))
+    assert r.status_code == 400
+
+    api = responder.API(
+        allowed_hosts=["*.;"]
+    )
+
+    @api.route("/")
+    def get(req, resp):
+        pass
+
+    # Wildcard domains
+    # Using http://;
+    r = api.requests.get(api.url_for(get))
+    assert r.status_code == 400
+
+    # Reset the session
+    api._session = None
+    r = api.session(base_url="http://tenant1.;").get(api.url_for(get))
+    assert r.status_code == 200
+
+    # Reset the session
+    api._session = None
+    r = api.session(base_url="http://tenant2.;").get(api.url_for(get))
+    assert r.status_code == 200
@@ -2,6 +2,10 @@ import pytest
 from responder import routes


+def setup_function(function):
+    routes.Route.incoming_matches.cache_clear()
+
+
@pytest.mark.parametrize(
    "route, expected",
    [
@@ -36,26 +40,23 @@ def test_incoming_matches():
    assert r.incoming_matches("/hello") == {"greetings": "hello"}
    assert r.incoming_matches("/foo") == {"greetings": "foo"}

-    assert r._memo == {
-        "incoming_matches:/hello": {"greetings": "hello"},
-        "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
-    assert r._memo == {
-        "incoming_matches:/hi/john": {"greetings": "hi", "name": "john"},
-        "incoming_matches:/hello/jane": {"greetings": "hello", "name": "jane"},
-    }
-
    r = routes.Route("/hello", "test_endpoint")
    assert r.incoming_matches("/hello") == {}
    assert r.incoming_matches("/bye") == {}
-    assert r._memo == {"incoming_matches:/hello": {}, "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():
@@ -86,18 +87,29 @@ def test_does_match_with_route(route, match, expected):
@pytest.mark.parametrize(
    "path_param, expected_weight",
    [
-        pytest.param("/{greetings}", (True, -1), id="with one param"),
+        pytest.param("/{greetings}", (True, True, -1), id="with one param"),
        pytest.param(
-            "/{greetings}.{name}", (True, -2), id="with 2 params and dot in the middle"
+            "/{greetings}.{name}", (True, True, -2), id="with 2 params and dot in the middle"
        ),
-        pytest.param("/{greetings}/{name}", (True, -2), id="with 2 param and subpath"),
+        pytest.param("/{greetings}/{name}", (True, True, -2), id="with 2 param and subpath"),
        pytest.param(
-            "/{greetings}/{name}/{hello}", (True, -3), id="with 3 param and subpath"
+            "/{greetings}/{name}/{hello}", (True, True, -3), id="with 3 param and subpath"
        ),
        pytest.param(
-            "/{greetings}_{name}", (True, -2), id="with 2 param and underscore"
+            "/{greetings}_{name}", (True, True, -2), id="with 2 param and underscore"
        ),
-        pytest.param("/hello", (False, 0), id="with 2 param and underscore"),
+        pytest.param("/{greetings}/9roda", (True, False, -1), id="with one param"),
+        pytest.param(
+            "/{greetings}.{name}/9roda", (True, False, -2), id="with 2 params and dot in the middle"
+        ),
+        pytest.param("/{greetings}/{name}/9roda", (True, False, -2), id="with 2 param and subpath"),
+        pytest.param(
+            "/{greetings}/{name}/{hello}/9roda", (True, False, -3), id="with 3 param and subpath"
+        ),
+        pytest.param(
+            "/{greetings}_{name}/9roda", (True, False, -2), id="with 2 param and underscore"
+        ),
+        pytest.param("/hello", (False, False, 0), id="with 2 param and underscore"),
    ],
 )
 def test_weight(path_param, expected_weight):
Author	SHA1	Message	Date
kennethreitz	a6bd179726	version bump	2018-11-11 16:58:07 -05:00
kennethreitz	aac7b5117b	Merge pull request #218 from tomchristie/patch-1 Bring testominials in line with README	2018-11-10 17:48:29 -05:00
Tom Christie	8e8e99ed2e	Bring testominials in line with README	2018-11-09 18:25:53 +00:00
kennethreitz	078ac23b20	Merge pull request #213 from mmanhertz/fix-212 fix for #212	2018-11-07 17:25:14 -05:00
kennethreitz	8e61df6b6a	Merge pull request #207 from taoufik07/await_backgroundtask_raise Await for background task and raise	2018-11-07 17:25:02 -05:00
mmanhertz	cf7fb56653	fix for #212	2018-11-07 17:05:18 +01:00
taoufik07	da20d13c49	Await for background task and raise	2018-11-06 17:27:04 +01:00
kennethreitz	7a250aa8fc	Merge branch 'master' of github.com:kennethreitz/responder	2018-11-06 05:46:25 -05:00
kennethreitz	af28ecb82d	fix for #200	2018-11-06 05:46:17 -05:00
kennethreitz	39a0e52a2a	Merge pull request #201 from mmanhertz/patch-1 Fix OpenAPI version in examples	2018-11-06 05:12:51 -05:00
Matthias Manhertz	a4f5a111c7	Fix OpenAPI version in examples The example for "OpenAPI Schema Support" and "Interactive Documentation had `openapi="3.0"` which would cause the following error when swagger UI tried to render the schema: ``` Unable to render this definition The provided definition does not specify a valid version field. Please indicate a valid Swagger or OpenAPI version field. Supported version fields are swagger: "2.0" and those that match openapi: 3.0.n (for example, openapi: 3.0.0). ```	2018-11-06 10:46:30 +01:00
kennethreitz	c65e585493	Merge pull request #192 from vlcinsky/fix_doc_typo Fixed missing `.data` on Marshmallow dump	2018-11-05 17:40:06 -05:00
kennethreitz	c9e94561aa	Merge pull request #196 from xyb/patch-1 fix Dockerfile	2018-11-05 14:09:13 -05:00
Xie Yanbo	1daa4c202b	fix Dockerfile	2018-11-06 00:47:09 +08:00
kennethreitz	83ff361672	Merge pull request #195 from taoufik07/fix/routes_conflict Fix/routes conflict	2018-11-05 09:01:15 -05:00
taoufik07	2c686f107d	Tests	2018-11-05 14:52:08 +01:00
taoufik07	ac8ec3d5ef	cleanup	2018-11-05 14:51:56 +01:00
taoufik07	21e70ef913	Fix tests	2018-11-05 14:48:34 +01:00
taoufik07	c4f5b0e7c2	Fix routes conflict	2018-11-05 14:47:46 +01:00
Jan Vlcinsky	45d6c1389d	Fixed missing `.data` on Marshmallow dump	2018-11-04 22:06:54 +01:00
kennethreitz	0c9bc5a3af	fix	2018-11-04 07:22:03 -05:00
kennethreitz	5b67d5a04a	Merge branch 'master' of github.com:kennethreitz/responder	2018-11-04 07:20:41 -05:00
kennethreitz	f3396a5573	fix for #188	2018-11-04 07:20:30 -05:00
kennethreitz	e9f48788a3	Merge pull request #184 from rparrapy/change-route-cache Replace memoize decorator by functools.lru_cache	2018-11-02 07:09:08 -04:00
Rodrigo Parra	6993a1ea46	Replace memoize decorator by functools.lru_cache	2018-11-02 06:32:01 -03:00
kennethreitz	8bcfb4585b	cleanup testimonials	2018-11-01 05:38:22 -04:00
kennethreitz	db45251f7f	Merge pull request #182 from rparrapy/patch-1 Fix typo	2018-10-31 17:39:02 -04:00
kennethreitz	5582667b4f	deployment	2018-10-31 17:37:13 -04:00
Rodrigo Parra	2c898aaf23	Fix typo	2018-10-31 14:36:40 -03:00
kennethreitz	e0999ffcdd	Merge branch 'master' of github.com:kennethreitz/responder	2018-10-31 06:10:49 -04:00
kennethreitz	03811768bb	depoloyment	2018-10-31 06:10:40 -04:00
kennethreitz	fbef577c9f	Merge pull request #179 from taoufik07/patch-16 Typo :3	2018-10-30 21:56:18 -04:00
Taoufik	9434510ce9	Typo :3	2018-10-31 01:04:25 +01:00
kennethreitz	354130c151	.serve	2018-10-30 19:08:57 -04:00
kennethreitz	3e3cba016a	Merge pull request #177 from tomchristie/patch-1 Update api.py	2018-10-30 10:37:38 -04:00
Tom Christie	f75e120bef	Update api.py Refs https://github.com/kennethreitz/responder/issues/174 You don't need both to use both DebugMiddleware and ExceptionMiddleware, just one or the other. Currently errors will cause a traceback 500 page, then re-raise, then attempt to generate another traceback 500 page, resulting in the behavior commented on in #174	2018-10-30 14:34:10 +00:00
kennethreitz	1d0294e430	merge	2018-10-30 05:01:25 -04:00
kennethreitz	f786dd8254	apispec	2018-10-30 04:59:24 -04:00
kennethreitz	cd9d09fd53	Merge pull request #175 from taoufik07/patch-15 Set debug to False in tests	2018-10-29 19:04:32 -04:00
kennethreitz	7471bbcd4e	Merge pull request #173 from taoufik07/patch-14 Trusted hosts docs	2018-10-29 19:04:19 -04:00
Taoufik	43b04eccbd	Set debug to False in tests	2018-10-29 22:53:56 +01:00
Taoufik	6a5d0b5e9f	Trusted hosts docs	2018-10-29 21:56:54 +01:00
kennethreitz	359d366de4	Merge pull request #172 from taoufik07/trustedhost_starlette starlette's TrustedhostMiddleware	2018-10-29 16:33:35 -04:00
taoufik07	556d9f3a7b	Update starlette	2018-10-29 21:08:38 +01:00
taoufik07	2cab2dcec0	Tests	2018-10-29 20:54:38 +01:00
taoufik07	99d4e78dc9	Use starlette TrustedHostMiddleware	2018-10-29 20:48:51 +01:00
kennethreitz	9aa99869ae	next version	2018-10-29 08:00:44 -04:00
kennethreitz	08e0d87347	Merge branch 'master' of github.com:kennethreitz/responder	2018-10-29 07:57:19 -04:00
kennethreitz	3f9e4057d3	run sync tasks in threadpoolexecutor	2018-10-29 07:54:59 -04:00
kennethreitz	a29e40353c	Merge pull request #170 from taoufik07/trusted_hosts Trusted hosts support	2018-10-28 14:47:28 -04:00
taoufik07	778cb2dd0f	Add Tests	2018-10-28 18:26:42 +00:00
taoufik07	f7d5514b94	Fix test base_url	2018-10-28 18:12:21 +00:00
taoufik07	954637f7b3	Pass base_url to the TestClient	2018-10-28 18:09:52 +00:00
taoufik07	1ab46104c8	Allow all hosts by default	2018-10-28 14:51:24 +00:00
kennethreitz	815776d473	Merge branch 'master' of github.com:kennethreitz/responder	2018-10-28 05:25:56 -04:00
kennethreitz	8db1a7be90	Merge pull request #169 from taoufik07/patch-13 typo	2018-10-28 05:23:56 -04:00
taoufik07	7b11fa24dd	Silence for now	2018-10-28 01:38:17 +01:00
taoufik07	1f0f2318d5	cleanup	2018-10-28 01:34:26 +01:00
taoufik07	029b3e2a52	Tests	2018-10-28 00:46:50 +01:00
taoufik07	4fff823def	Trusted host	2018-10-28 00:46:39 +01:00
Taoufik	cab78275f4	typo	2018-10-27 22:25:11 +01:00