Merge pull request #20 from volfpeter/feat/metadata-always-exists

volfpeter · web-flow · commit 0f05a4336149 · 2025-10-09T09:39:29.000+02:00
Always have Metadata in the htmy context
diff --git a/holm/__init__.py b/holm/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 from .app import App as App
 from .fastapi import FastAPIDependency as FastAPIDependency
diff --git a/holm/modules/_metadata.py b/holm/modules/_metadata.py
@@ -50,14 +50,14 @@ class Metadata(ContextAware):
 
     __slots__ = ("_metadata",)
 
-    def __init__(self, metadata: MetadataMapping) -> None:
+    def __init__(self, metadata: MetadataMapping | None = None) -> None:
         """
         Initialization.
 
         Arguments:
             metadata: The actual metadata mapping.
         """
-        self._metadata = metadata
+        self._metadata = {} if metadata is None else metadata
         """The metadata mapping."""
 
     @overload
@@ -116,8 +116,4 @@ def components_with_metadata(data: tuple[Component, MetadataMapping | None]) ->
     # This allows `Metadata.from_context()` to be used in all wrapped components.
     # The received components object is usually a ComponentSequence (doctype and html components),
     # so converting to a component sequence seems a tiny bit more efficient.
-    return (
-        components
-        if metadata is None
-        else Metadata(metadata).in_context(*as_component_sequence(components))
-    )
+    return Metadata(metadata).in_context(*as_component_sequence(components))
diff --git a/test_app/no_metadata/__init__.py b/test_app/no_metadata/__init__.py
diff --git a/test_app/no_metadata/page.py b/test_app/no_metadata/page.py
@@ -0,0 +1,25 @@
+def page() -> str:
+    return "This page has no metadata."
+
+
+rendered_page = """
+<!DOCTYPE html><html >
+<head >
+<title >App</title>
+<meta charset="utf-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css"/>
+</head>
+<body class="container-fluid">
+<header class="container">
+<p >Root layout header</p>
+</header>
+<main class="container">
+This page has no metadata.
+</main>
+<footer class="container">
+Root layout footer
+</footer>
+</body>
+</html>
+""".strip()
diff --git a/tests/no_metadata/__init__.py b/tests/no_metadata/__init__.py
diff --git a/tests/no_metadata/test_page.py b/tests/no_metadata/test_page.py
@@ -0,0 +1,13 @@
+from fastapi.testclient import TestClient
+
+from test_app.no_metadata.page import rendered_page
+
+# Do not add metadata, Metadata.from_context() should still succeed in layouts.
+# metadata = {}
+
+
+def test_page(client: TestClient) -> None:
+    response = client.get("/no_metadata")
+    assert response.status_code == 200
+    assert response.headers["Content-Type"] == "text/html; charset=utf-8"
+    assert response.text == rendered_page

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "0.3.1"`
	`1`	`+__version__ = "0.3.2"`
`2`	`2`
`3`	`3`	`from .app import App as App`
`4`	`4`	`from .fastapi import FastAPIDependency as FastAPIDependency`