Static dir 2075 (#2076)

* Add support for nested static directories * Add support for nested static directories * Bump version 21.3.1
sanic-org · Mar 21, 2021 · 938d2b5 · 938d2b5
1 parent 13630a7
commit 938d2b5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 2 deletions.
diff --git a/examples/static/favicon.ico b/examples/static/favicon.ico
diff --git a/examples/static/images/logo.png b/examples/static/images/logo.png
diff --git a/examples/static/robots.txt b/examples/static/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/examples/static_assets.py b/examples/static_assets.py
@@ -0,0 +1,6 @@
+from sanic import Sanic
+
+
+app = Sanic(__name__)
+
+app.static("/", "./static")
diff --git a/sanic/__version__.py b/sanic/__version__.py
@@ -1 +1 @@
-__version__ = "21.3.0"
+__version__ = "21.3.1"
diff --git a/sanic/mixins/routes.py b/sanic/mixins/routes.py
@@ -776,7 +776,7 @@ def _register_static(
         # If we're not trying to match a file directly,
         # serve from the folder
         if not path.isfile(file_or_directory):
-            uri += "/<__file_uri__>"
+            uri += "/<__file_uri__:path>"
 
         # special prefix for static files
         # if not static.name.startswith("_static_"):

diff --git a/tests/static/nested/dir/foo.txt b/tests/static/nested/dir/foo.txt
@@ -0,0 +1 @@
+foo
diff --git a/tests/test_static.py b/tests/test_static.py
@@ -445,3 +445,12 @@ def test_static_name(app, static_file_directory, static_name, file_name):
     request, response = app.test_client.get(f"/static/{file_name}")
 
     assert response.status == 200
+
+
+def test_nested_dir(app, static_file_directory):
+    app.static("/static", static_file_directory)
+
+    request, response = app.test_client.get("/static/nested/dir/foo.txt")
+
+    assert response.status == 200
+    assert response.text == "foo\n"