Fix serve directory path.

jinjabread/serve.py

@@ -14,18 +14,19 @@ def __init__(self, config):
         self.config = config
 
     def dispatch_request(self, request):
-        path = Path(request.path)
+        url_path = Path(request.path)
+        file_path = self.config.output_dir / url_path.relative_to("/")
 
-        if path.name == "index.html":
-            return redirect(path.parent)
+        # Clean up URL path.
+        if url_path.name == "index.html":
+            return redirect(url_path.parent.as_posix().removesuffix("/") + "/")
+        if url_path.suffix == ".html":
+            return redirect(url_path.with_suffix("").as_posix())
+        if file_path.is_dir() and not request.path.endswith("/"):
+            return redirect(url_path.as_posix() + "/")
 
-        if path.suffix == ".html":
-            return redirect(path.with_suffix(""))
-
-        file_path = self.config.output_dir / path.relative_to("/")
-        if (not file_path.exists() or file_path.is_dir()) and file_path.with_suffix(
-            ".html"
-        ).exists():
+        # Clean up file path.
+        if not file_path.exists() and file_path.with_suffix(".html").exists():
             file_path = file_path.with_suffix(".html")
         elif file_path.is_dir():
             file_path /= "index.html"

tests/tests.py

@@ -487,7 +487,7 @@ def test_response(self):
         )
         self.assertHtmlEqual("", response.get_data(as_text=True))
 
-    def test_redirect_index_path(self):
+    def test_redirect_root_index_path(self):
         index_file = self.working_dir / "content" / "index.html"
         index_file.parent.mkdir(parents=True)
         index_file.touch()
@@ -502,6 +502,21 @@ def test_redirect_index_path(self):
         self.assertEqual(302, response.status_code)
         self.assertEqual("/", response.headers.get("Location"))
 
+    def test_redirect_dir_index_path(self):
+        index_file = self.working_dir / "content" / "posts" / "index.html"
+        index_file.parent.mkdir(parents=True)
+        index_file.touch()
+
+        config = jinjabread.Config.load()
+        site = jinjabread.Site(config)
+        site.generate()
+
+        client = Client(jinjabread.App(config))
+        response = client.get("/posts/index.html")
+
+        self.assertEqual(302, response.status_code)
+        self.assertEqual("/posts/", response.headers.get("Location"))
+
     def test_redirect_path_with_suffix(self):
         index_file = self.working_dir / "content" / "about.html"
         index_file.parent.mkdir(parents=True)
@@ -516,3 +531,18 @@ def test_redirect_path_with_suffix(self):
 
         self.assertEqual(302, response.status_code)
         self.assertEqual("/about", response.headers.get("Location"))
+
+    def test_redirect_dir_path_with_missing_slash(self):
+        index_file = self.working_dir / "content" / "posts" / "index.html"
+        index_file.parent.mkdir(parents=True)
+        index_file.touch()
+
+        config = jinjabread.Config.load()
+        site = jinjabread.Site(config)
+        site.generate()
+
+        client = Client(jinjabread.App(config))
+        response = client.get("/posts")
+
+        self.assertEqual(302, response.status_code)
+        self.assertEqual("/posts/", response.headers.get("Location"))