From 94267c681f8086d118a4e07a626b94c517d2648b Mon Sep 17 00:00:00 2001
From: gyoder <70408179+gyoder@users.noreply.github.com>
Date: Sat, 5 Jul 2025 18:36:26 -0600
Subject: [PATCH 1/2] added test
---
htmlua-parser/src/render.rs | 31 +++++++++++++++++++++++
htmlua-parser/src/serve.rs | 2 +-
htmlua-parser/tests/components/comp1.html | 2 +-
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/htmlua-parser/src/render.rs b/htmlua-parser/src/render.rs
index 58a8259..d50e934 100644
--- a/htmlua-parser/src/render.rs
+++ b/htmlua-parser/src/render.rs
@@ -188,6 +188,37 @@ mod tests {
assert!(d.select_first("include").is_err());
}
+ #[test]
+ fn basic_lua_include() {
+ let page = r#"
+
+
+
+ Basic HTML Page
+
+
+ Hello World
+ This is a paragraph.
+
+ htmlua.println("Test from Lua!")
+
+
+
+ "#;
+ let mut p = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+ p.push("tests/components");
+ let document = kuchikiki::parse_html().one(page);
+ let d = execute_lua(expand_template(document, &p, None).unwrap()).unwrap();
+ let text = d.select_first("span").unwrap().as_node().text_contents();
+ println!("{}", d.to_string());
+ assert_eq!(text, "Test from Lua!\n");
+ assert!(d.select_first("lua").is_err());
+ let text = d.select_first("#inc1").unwrap().as_node().text_contents();
+ assert_eq!(text, "included1");
+ assert!(d.select_first("include").is_err());
+
+ }
+
#[test]
fn recursive_include() {
let page = r#"
diff --git a/htmlua-parser/src/serve.rs b/htmlua-parser/src/serve.rs
index 1dfd306..134cc13 100644
--- a/htmlua-parser/src/serve.rs
+++ b/htmlua-parser/src/serve.rs
@@ -16,8 +16,8 @@ pub fn serve_content(request_uri: &str) -> Result {
let page_string = read_to_string(&page_path)?;
let doc = kuchikiki::parse_html().one(page_string);
- let full_doc = expand_template(doc, &components, None)?;
+ let full_doc = expand_template(doc, &components, None)?;
let executed_doc = execute_lua(full_doc)?;
Ok(executed_doc.to_string())
diff --git a/htmlua-parser/tests/components/comp1.html b/htmlua-parser/tests/components/comp1.html
index 516d00e..4110604 100644
--- a/htmlua-parser/tests/components/comp1.html
+++ b/htmlua-parser/tests/components/comp1.html
@@ -1 +1 @@
-included1
+included1
From 9a0038dacde3bcf1a10de51278d72f0f322c3817 Mon Sep 17 00:00:00 2001
From: gyoder <70408179+gyoder@users.noreply.github.com>
Date: Sat, 5 Jul 2025 21:33:25 -0600
Subject: [PATCH 2/2] fixed weird wrapping
---
htmlua-parser/src/render.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/htmlua-parser/src/render.rs b/htmlua-parser/src/render.rs
index d50e934..fe0b64f 100644
--- a/htmlua-parser/src/render.rs
+++ b/htmlua-parser/src/render.rs
@@ -9,7 +9,7 @@ use anyhow::anyhow;
use kuchikiki::{NodeRef, traits::TendrilSink};
use mlua::{Lua, Table};
-fn create_luahtml_stdlib(l: &Lua, stdout: &Rc>) -> mlua::Result {
+fn create_htmlua_stdlib(l: &Lua, stdout: &Rc>) -> mlua::Result {
let t = l.create_table()?;
// This cannot be the best way to do this
@@ -41,7 +41,7 @@ pub fn execute_lua(document: NodeRef) -> Result {
let stdout: Rc> = Rc::new(RefCell::new(String::new()));
let htmlua_table =
- create_luahtml_stdlib(&lua, &stdout).map_err(|e| anyhow!("Failed to create Lua stdlib: {}", e))?;
+ create_htmlua_stdlib(&lua, &stdout).map_err(|e| anyhow!("Failed to create Lua stdlib: {}", e))?;
globals
.set("htmlua", htmlua_table)
@@ -98,8 +98,9 @@ pub fn expand_template(document: NodeRef, component_path: &PathBuf, include_from
let mut item_path = component_path.clone();
item_path.push(include_path);
let component_text = read_to_string(item_path)?;
- let new_node = kuchikiki::parse_html().one(component_text);
- let replaced_node = expand_template(new_node, component_path, Some(i.as_node()))?;
+ let new_doc = kuchikiki::parse_html().one(component_text);
+ let new_node = new_doc.select_first("body").map_err(|()| anyhow!("Failed to get body"))?;
+ let replaced_node = expand_template(new_node.as_node().clone(), component_path, Some(i.as_node()))?;
i.as_node().insert_before(replaced_node);
i.as_node().detach();
}