add html function

jcornaz · Oct 31, 2024 · 6f683b7 · 6f683b7
1 parent 5942c09
commit 6f683b7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Escape HTML strings
 * `id` and `class` attributes
 * Nodes
-  * Html document (`head` and `body`)
+  * Html document (`html`, `head`, `body`)
+  * Meta (`title`)
   * Text (`h1`, `h2`, `h3`, `h4`, `h5`, `h6` and `text`)
   * Container (`div`)
 * `Node`, `Attribute` and `Document` types

diff --git a/src/attributes.rs b/src/attributes.rs
@@ -6,6 +6,10 @@ pub fn attr(key: &'static str, value: impl Into<Cow<'static, str>>) -> Attribute
     Attribute::new(key, value)
 }
 
+pub fn lang(lang: impl Into<Cow<'static, str>>) -> Attribute {
+    attr("lang", lang)
+}
+
 pub fn id(id: impl Into<Cow<'static, str>>) -> Attribute {
     attr("id", id)
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -113,3 +113,10 @@ impl Attribute {
         }
     }
 }
+
+pub fn html(
+    attributes: impl IntoIterator<Item = Attribute>,
+    children: impl IntoIterator<Item = Node>,
+) -> Document {
+    Document(Node::new("html", attributes, children))
+}
diff --git a/src/nodes.rs b/src/nodes.rs
@@ -16,6 +16,13 @@ pub fn head(
     Node::new("head", attributes, children)
 }
 
+pub fn title(
+    attributes: impl IntoIterator<Item = Attribute>,
+    children: impl IntoIterator<Item = Node>,
+) -> Node {
+    Node::new("title", attributes, children)
+}
+
 pub fn body(
     attributes: impl IntoIterator<Item = Attribute>,
     children: impl IntoIterator<Item = Node>,

diff --git a/tests/render_spec.rs b/tests/render_spec.rs
@@ -1,6 +1,6 @@
 use rstest::rstest;
 
-use fun_html::prelude::*;
+use fun_html::{html, prelude::*};
 
 #[test]
 fn should_render_empty_document() {
@@ -12,6 +12,18 @@ fn should_render_empty_document() {
     )
 }
 
+#[test]
+fn should_render_html_document() {
+    let doc = html(
+        [lang("en")],
+        [
+            head([], [title([], [text("greeting")])]),
+            body([], [h1([], [text("Hello world!")])]),
+        ],
+    );
+    assert_eq!(doc.to_string(), "<!DOCTYPE html>\n<html lang=\"en\"><head><title>greeting</title></head><body><h1>Hello world!</h1></body></html>");
+}
+
 #[test]
 fn should_render_attributes() {
     let node = h1(
@@ -28,6 +40,7 @@ fn should_render_attributes() {
 #[case(div([attr("foo", "bar")], [text("hello")]), "<div foo=\"bar\">hello</div>")]
 #[case(div([attr("foo", "bar".to_string())], [text("hello".to_string())]), "<div foo=\"bar\">hello</div>")]
 #[case(head([id("foo")], [text("hello")]), "<head id=\"foo\">hello</head>")]
+#[case(title([attr("foo", "bar")], [text("hello")]), "<title foo=\"bar\">hello</title>")]
 #[case(body([id("foo")], [text("hello")]), "<body id=\"foo\">hello</body>")]
 #[case(h1([id("foo")], [text("hello")]), "<h1 id=\"foo\">hello</h1>")]
 #[case(h2([id("foo")], [text("hello")]), "<h2 id=\"foo\">hello</h2>")]