Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't panic! on errors; fix apparent bug in JSON value handling #3

Merged
merged 2 commits into from
Jun 1, 2023
Merged

Don't panic! on errors; fix apparent bug in JSON value handling #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7601d57
don't panic; fix apparent bug in JSON value handling
lmcmicu May 23, 2023
84aa2d3
remove redundant string conversion
lmcmicu Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 69 additions & 37 deletions src/hiccup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde_json::Value;
/// * param `element` - hiccup-style list to add 'href' attributes to
/// * param `href` - pattern for href where the substring "{curie}" is replaced with resource
/// * return - copy of element with added 'href'
pub fn insert_href(element: &Value, href: &str) -> Value {
pub fn insert_href(element: &Value, href: &str) -> Result<Value, String> {
insert_href_by_depth(element, href, 0)
}

Expand All @@ -18,26 +18,28 @@ pub fn insert_href(element: &Value, href: &str) -> Value {
/// * param `href` - pattern for href where the substring "{curie}" is replaced with resource
/// * param `depth` - list depth of current element
/// * return - copy of element with added 'href'
pub fn insert_href_by_depth(element: &Value, href: &str, depth: usize) -> Value {
pub fn insert_href_by_depth(element: &Value, href: &str, depth: usize) -> Result<Value, String> {
let mut element_pointer = 0;
let render_element = element.clone();
let render_element = match render_element {
Value::Array(x) => x,
_ => panic!("Element is not a list: {:?}", element),
_ => return Err(format!("Element is not a list: {:?}", element)),
};
if render_element.is_empty() {
panic!("Element is an empty list")
return Err("Element is an empty list".to_string());
}

let tag = render_element[0].clone();
element_pointer += 1;
let tag_string = match tag {
Value::String(x) => x,
_ => panic!(
"Tag '{tag}' at loc {depth} is not a string",
tag = tag,
depth = depth
),
_ => {
return Err(format!(
"Tag '{tag}' at loc {depth} is not a string",
tag = tag,
depth = depth
))
}
};

let mut output = vec![json!(tag_string.clone())];
Expand All @@ -49,7 +51,12 @@ pub fn insert_href_by_depth(element: &Value, href: &str, depth: usize) -> Value
if tag_string.eq("a") & !attr.contains_key("href") & attr.contains_key("resource") {
attr.insert(
String::from("href"),
json!(href.replace("{curie}", attr["resource"].as_str().unwrap())),
json!(href.replace("{curie}", {
match attr["resource"].as_str() {
Some(r) => r,
None => return Err(format!("No str 'resource' in {:?}", attr)),
}
})),
);
}
output.push(Value::Object(attr.clone()));
Expand All @@ -66,54 +73,58 @@ pub fn insert_href_by_depth(element: &Value, href: &str, depth: usize) -> Value
output.push(json!(x));
}
Value::Array(x) => {
output.push(insert_href_by_depth(&json!(x), href, depth + 1));
output.push(insert_href_by_depth(&json!(x), href, depth + 1)?);
}
_ => {
return Err(format!(
"Bad type for '{tag}' child '{child}' at loc {depth}",
tag = tag_string,
child = child,
depth = depth + 1
))
}
_ => panic!(
"Bad type for '{tag}' child '{child}' at loc {depth}",
tag = tag_string,
child = child,
depth = depth + 1
),
}
}
}

Value::Array(output)
Ok(Value::Array(output))
}

/// Render hiccup-style HTML vector as HTML.
/// * param `element` - hiccup-style list
/// * return - HTML string
pub fn render(element: &Value) -> String {
pub fn render(element: &Value) -> Result<String, String> {
render_by_depth(element, 0)
}

/// Render hiccup-style HTML vector as HTML.
/// * param `element` - hiccup-style list
/// * param `depth` - list depth of current element
/// * return - HTML string
pub fn render_by_depth(element: &Value, depth: usize) -> String {
pub fn render_by_depth(element: &Value, depth: usize) -> Result<String, String> {
let render_element = element.clone();
let indent = " ".repeat(depth);
let mut element_pointer = 0;

let render_element = match render_element {
Value::Array(x) => x,
_ => panic!("Element is not a list: {:?}", element),
_ => return Err(format!("Element is not a list: {:?}", element)),
};
if render_element.is_empty() {
panic!("Element is an empty list")
return Err("Element is an empty list".to_string());
}

let tag = render_element[0].clone();
element_pointer += 1;
let tag_string = match tag {
Value::String(x) => x,
_ => panic!(
"Tag '{tag}' at loc {depth} is not a string",
tag = tag,
depth = depth
),
_ => {
return Err(format!(
"Tag '{tag}' at loc {depth} is not a string",
tag = tag,
depth = depth
))
}
};

let mut output = format!("{}<{}", indent, tag_string);
Expand All @@ -126,7 +137,22 @@ pub fn render_by_depth(element: &Value, depth: usize) -> String {
if key.eq("checked") {
output = format!("{} {}", output, key);
} else {
output = format!("{} {}=\"{}\"", output, key, value.as_str().unwrap());
output = format!(
"{} {}=\"{}\"",
output,
key,
match value {
Value::String(s) => s,
Value::Number(n) => n.to_string(),
Value::Bool(b) => b.to_string(),
Value::Null => value.to_string(),
_ =>
return Err(format!(
"Value '{}' is not a string, number, bool, or null value",
value
)),
}
);
}
}
}
Expand All @@ -136,7 +162,7 @@ pub fn render_by_depth(element: &Value, depth: usize) -> String {

if tag_string.eq("meta") | tag_string.eq("link") | tag_string.eq("path") {
output = format!("{}/>", output);
return output;
return Ok(output);
}

output = format!("{}>", output);
Expand All @@ -148,18 +174,24 @@ pub fn render_by_depth(element: &Value, depth: usize) -> String {
output = format!("{}{}", output, s.as_str());
}
Value::Array(_v) => {
output = format!("{}\n{}", output, render_by_depth(&child.clone(), depth + 1));
output = format!(
"{}\n{}",
output,
render_by_depth(&child.clone(), depth + 1)?
);
spacing = format!("\n{}", indent);
}
_ => panic!(
"Bad type for '{tag}' child '{child}' at loc {depth}",
tag = tag_string,
child = child,
depth = depth + 1
),
_ => {
return Err(format!(
"Bad type for '{tag}' child '{child}' at loc {depth}",
tag = tag_string,
child = child,
depth = depth + 1
))
}
}
}
}
output = format!("{}{}</{}>", output, spacing, tag_string);
output
Ok(output)
}
6 changes: 3 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use serde_json::Value;

pub mod hiccup;
pub mod hiccup;

fn main() {
//let data = r#"["body", ["div", {"id": "myDiv"}, ["h1", {"class": "header"}, "Hello World!"]]]"#;
let data = r#"["body", ["div", {"id": "myDiv"}, ["h1", {"class": "header"}, ["a", {"resource":"iri:example"}, "Hello World!"]]]]"#;

let hiccup: Value = serde_json::from_str(data).unwrap();

let html = hiccup::render(&hiccup);
let html_2 = hiccup::insert_href(&hiccup, "?id={curie}");
let html = hiccup::render(&hiccup).unwrap();
let html_2 = hiccup::insert_href(&hiccup, "?id={curie}").unwrap();

println!("{}", html);
println!("{}", html_2);
Expand Down