grace/htmlua
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix merge.

Browse source
This commit is contained in:
Quin 2025-07-05 22:07:28 -06:00
commit c663ae27a8
2 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

40
htmlua-parser/src/render.rs
View file

@ -5,7 +5,7 @@ use kuchikiki::{NodeRef, traits::TendrilSink};
use mlua::{Lua, Table}; use mlua::{Lua, Table};
use pulldown_cmark::{Options, Parser, html}; use pulldown_cmark::{Options, Parser, html};
fn create_luahtml_stdlib(l: &Lua, stdout: &Rc<RefCell<String>>) -> mlua::Result<Table> { fn create_htmlua_stdlib(l: &Lua, stdout: &Rc<RefCell<String>>) -> mlua::Result<Table> {
let t = l.create_table()?; let t = l.create_table()?;
// This cannot be the best way to do this // This cannot be the best way to do this
@ -37,7 +37,7 @@ pub fn execute_lua(document: NodeRef) -> Result<NodeRef> {
let stdout: Rc<RefCell<String>> = Rc::new(RefCell::new(String::new())); let stdout: Rc<RefCell<String>> = Rc::new(RefCell::new(String::new()));
let htmlua_table = 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 globals
.set("htmlua", htmlua_table) .set("htmlua", htmlua_table)
@ -118,8 +118,9 @@ pub fn expand_template(document: NodeRef, component_path: &PathBuf, include_from
let mut item_path = component_path.clone(); let mut item_path = component_path.clone();
item_path.push(include_path); item_path.push(include_path);
let component_text = read_to_string(item_path)?; let component_text = read_to_string(item_path)?;
let new_node = kuchikiki::parse_html().one(component_text); let new_doc = kuchikiki::parse_html().one(component_text);
let replaced_node = expand_template(new_node, component_path, Some(i.as_node()))?; 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().insert_before(replaced_node);
i.as_node().detach(); i.as_node().detach();
} }
@ -208,6 +209,37 @@ mod tests {
assert!(d.select_first("include").is_err()); assert!(d.select_first("include").is_err());
} }
#[test]
fn basic_lua_include() {
let page = r#"
<!DOCTYPE html>
<html>
<head>
<title>Basic HTML Page</title>
</head>
<body>
<h1>Hello World</h1>
<p>This is a paragraph.</p>
<span><lua>
htmlua.println("Test from Lua!")
</lua></span>
<include path="comp1.html" />
</body>
</html>"#;
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] #[test]
fn recursive_include() { fn recursive_include() {
let page = r#" let page = r#"

2
htmlua-parser/tests/components/comp1.html
View file

@ -1 +1 @@
<span>included1</span> <span id="inc1">included1</span>