fix: title override and add tests

banditburai · banditburai · commit f5e237535ed2 · 2024-12-14T12:52:20.000-05:00
- Fix _xt_cts to respect manually passed Title components

- Add tests for default title

- Add tests for custom title

- Add tests for title override behavior
diff --git a/fasthtml/core.py b/fasthtml/core.py
@@ -392,7 +392,8 @@ def _xt_cts(req, resp):
     hdr_tags = 'title','meta','link','style','base'
     heads,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)
     if resp and 'hx-request' not in req.headers and not any(getattr(o, 'tag', '')=='html' for o in resp):
-        resp = respond(req, heads or [Title(req.app.title)], bdy)
+        title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]
+        resp = respond(req, [*heads, *title], bdy)
     return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs, ts
 
 # %% ../nbs/api/00_core.ipynb
diff --git a/nbs/api/00_core.ipynb b/nbs/api/00_core.ipynb
@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "datetime.datetime(2024, 12, 10, 14, 0)"
+       "datetime.datetime(2024, 12, 14, 14, 0)"
       ]
      },
      "execution_count": null,
@@ -1085,7 +1085,8 @@
     "    hdr_tags = 'title','meta','link','style','base'\n",
     "    heads,bdy = partition(resp, lambda o: getattr(o, 'tag', '') in hdr_tags)\n",
     "    if resp and 'hx-request' not in req.headers and not any(getattr(o, 'tag', '')=='html' for o in resp):\n",
-    "        resp = respond(req, heads or [Title(req.app.title)], bdy)\n",
+    "        title = [] if any(getattr(o, 'tag', '')=='title' for o in heads) else [Title(req.app.title)]\n",
+    "        resp = respond(req, [*heads, *title], bdy)\n",
     "    return _to_xml(req, resp, indent=fh_cfg.indent), http_hdrs, ts"
    ]
   },
@@ -1229,7 +1230,7 @@
     {
      "data": {
       "text/plain": [
-       "'7eb16e0e-f1b9-4266-98fa-2d84c34f86fc'"
+       "'af1b5dfe-6a32-4348-b1de-692f979f20fb'"
       ]
      },
      "execution_count": null,
@@ -1667,6 +1668,59 @@
     "app,cli,rt = get_cli(FastHTML(secret_key='soopersecret'))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "421262a8",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[Route(path='/foo', name='foo', methods=['GET', 'HEAD'])]\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "'/foo?param=value'"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "app,cli,rt = get_cli(FastHTML(title=\"My Custom Title\"))\n",
+    "@app.get\n",
+    "def foo(): return Div(\"Hello World\")\n",
+    "\n",
+    "print(app.routes)\n",
+    "\n",
+    "response = cli.get('/foo')\n",
+    "assert '<title>My Custom Title</title>' in response.text\n",
+    "\n",
+    "foo.to(param='value')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "2ebd6270",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "app,cli,rt = get_cli(FastHTML())\n",
+    "\n",
+    "@rt('/xt2')\n",
+    "def get(): return H1('bar')\n",
+    "\n",
+    "txt = cli.get('/xt2').text\n",
+    "assert '<title>FastHTML page</title>' in txt and '<h1>bar</h1>' in txt and '<html>' in txt"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -2424,13 +2478,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-12-10 09:54:42.331681\n"
+      "Set to 2024-12-14 12:38:57.886589\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 2024-12-10 09:54:42.331681'"
+       "'Session time: 2024-12-14 12:38:57.886589'"
       ]
      },
      "execution_count": null,
@@ -2950,7 +3004,7 @@
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 09:54:43.255286'"
+       "'Cookie was set at time 12:38:58.050326'"
       ]
      },
      "execution_count": null,
