🐛 Root path on mount endpoints

Author: perdy

flama/resources/routing.py

@@ -18,7 +18,7 @@ def __init__(
         self,
         path: str,
         resource: t.Union["Resource", type["Resource"]],
-        tags: t.Optional[dict[str, dict[str, t.Any]]] = None,
+        tags: t.Optional[dict[str, t.Any]] = None,
     ):
         tags = tags or {}
 

flama/routing/routes/mount.py

@@ -41,7 +41,7 @@ def __init__(
 
             app = Router(routes=routes, components=components)
 
-        super().__init__(url.Path(path.rstrip("/")), app, name=name, tags=tags)
+        super().__init__(path, app, name=name, tags=tags)
 
     async def __call__(self, scope: types.Scope, receive: types.Receive, send: types.Send) -> None:
         if scope["type"] in ("http", "websocket") or (
@@ -111,8 +111,8 @@ def route_scope(self, scope: types.Scope) -> types.Scope:
             match = self.path.match(path)
             result.update(
                 {
-                    "root_path": "" if is_flama else str(url.Path(scope.get("root_path", "")) / match.matched),
-                    "path": str(url.Path("/") / match.unmatched),
+                    "root_path": "" if is_flama else str(url.Path(scope.get("root_path", "")) / (match.matched or "")),
+                    "path": str(url.Path("/") / (match.unmatched or "")),
                 }
             )
 

flama/url.py

@@ -271,7 +271,7 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return self.path.__repr__()
 
-    def __truediv__(self, other) -> "Path":
+    def __truediv__(self, other: t.Union["Path", str]) -> "Path":
         if isinstance(other, Path):
             a, b = self.path.rstrip("/"), other.path.lstrip("/")
         elif isinstance(other, str):
@@ -281,7 +281,7 @@ def __truediv__(self, other) -> "Path":
 
         return Path(f"{a}/{b}")
 
-    def __rtruediv__(self, other) -> "Path":
+    def __rtruediv__(self, other: t.Union["Path", str]) -> "Path":
         if isinstance(other, Path):
             a, b = other.path.rstrip("/"), self.path.lstrip("/")  # pragma: no cover # covered by __truediv__
         elif isinstance(other, str):
@@ -291,7 +291,7 @@ def __rtruediv__(self, other) -> "Path":
 
         return Path(f"{a}/{b}")
 
-    def __itruediv__(self, other) -> "Path":
+    def __itruediv__(self, other: t.Union["Path", str]) -> "Path":
         path = self / other
         self.path = path.path
         self._fragments = path._fragments

tests/debug/test_data_structures.py

@@ -94,7 +94,7 @@ def bar_handler(): ...
             "apps": [
                 {
                     "name": "subapp",
-                    "path": "/subapp",
+                    "path": "/subapp/",
                     "apps": [],
                     "endpoints": [
                         {

tests/resources/test_routing.py

@@ -41,7 +41,7 @@ def test_init(self, resource):
             },
         )
 
-        assert resource_route.path == "/puppy"
+        assert resource_route.path == "/puppy/"
         assert resource_route.resource == resource
         for route in resource_route.routes:
             assert isinstance(route, Route)

tests/routing/routes/test_mount.py

@@ -51,7 +51,7 @@ def test_init(self, app, routes, exception):
                 app = Router(routes=routes)
 
             assert mount.app == app
-            assert mount.path == "/foo"
+            assert mount.path == "/foo/"
 
     @pytest.mark.parametrize(
         ["scope_type", "handle_call"],
@@ -149,19 +149,19 @@ def bar(): ...
         assert route_scope == {
             "app": app if used else asgi_scope["app"],
             "path": "/bar",
-            "root_path": "" if used else "/foo/1",
+            "root_path": "" if used else "/foo/1/",
         }
 
     @pytest.mark.parametrize(
         ["name", "params", "expected_url", "exception"],
         (
             pytest.param(
-                "foo", {"x": 1, "path": "/foo"}, url.URL(scheme="http", path="/foo/1"), None, id="match_full_name"
+                "foo", {"x": 1, "path": "/foo"}, url.URL(scheme="http", path="/foo/1/"), None, id="match_full_name"
             ),
             pytest.param("foo:bar", {"x": 1}, url.URL(scheme="http", path="/foo/1/bar"), None, id="match_route"),
             pytest.param(
                 "foo:nested",
-                {"x": 1, "path": "/foo"},
+                {"x": 1, "path": "/foo/"},
                 url.URL(scheme="http", path="/foo/1/nested"),
                 None,
                 id="match_nested_app",

tests/routing/test_router.py

@@ -355,7 +355,7 @@ def test_mount_app(self, app, app_mock, tags):
 
         assert len(app.routes) == 1
         assert isinstance(app.routes[0], Mount)
-        assert app.routes[0].path == "/app"
+        assert app.routes[0].path == "/app/"
         assert app.routes[0].app == app_mock
         assert app.routes[0].tags == tags
 
@@ -368,7 +368,7 @@ def test_mount_router(self, app, component_mock, tags):
         # Check mount is initialized
         assert isinstance(app.routes[0], Mount)
         mount_route = app.router.routes[0]
-        assert mount_route.path == "/app"
+        assert mount_route.path == "/app/"
         assert mount_route.tags == tags
         # Check router is created and initialized, also shares components and modules with main app
         assert isinstance(mount_route.app, Router)