X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/88a08162523cf4a0a7c1286b1438fdf16ca6c802..5ffe8e3a8394fc46b50659b0e197b0b0a22e18c8:/src/lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index b406f95..cfaeb4b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,11 +4,13 @@ use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
-const HEADER: &str = "
+pub struct Config {}
+
+const HEADER: &str = r#"
-
-
+
+
@@ -33,7 +35,7 @@ const HEADER: &str = "
-";
+"#;
const FOOTER: &str = "
@@ -192,7 +194,7 @@ fn render_instance(instance: &Option) -> HTML {
}
}
-fn render_cell(col: &str, row: &Row) -> HTML {
+fn render_cell(col: &str, row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
let col_label = HTML::escape(col);
let instances: Option<&Vec>> = row.entries.get(col);
@@ -216,10 +218,13 @@ fn render_cell(col: &str, row: &Row) -> HTML {
.join(" "),
)
};
- HTML(format!("{contents} | "))
+ row.entries.remove(col);
+ HTML(format!(
+ r#"{contents} | "#
+ ))
}
-fn render_row(columns: &[String], row: &Row) -> HTML {
+fn render_row(columns: &[String], row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
HTML(format!(
"| {row_label} | {}
|---|
\n",
@@ -232,12 +237,12 @@ fn render_row(columns: &[String], row: &Row) -> HTML {
fn render_column_headers(columns: &[String]) -> HTML {
HTML(
- String::from(" | ")
+ String::from(r#"
|---|
| "#)
+ &columns.iter().fold(String::new(), |mut acc, col| {
let col_header = HTML::escape(col.as_ref());
write!(
&mut acc,
- ""
+ r#""#
)
.unwrap();
acc
@@ -252,14 +257,14 @@ fn render_column_headers(columns: &[String]) -> HTML {
/// * there's an i/o error while reading `input`
/// * the log has invalid syntax:
/// * an indented line with no preceding non-indented line
-pub fn tablify(input: impl std::io::Read) -> Result {
+pub fn tablify(config: &Config, input: impl std::io::Read) -> Result {
let rows = read_rows(input).collect::, _>>()?;
let columns = column_order(&rows);
Ok(HTML(format!(
"{HEADER}{}{}{FOOTER}",
render_column_headers(&columns),
rows.into_iter()
- .map(|r| render_row(&columns, &r))
+ .map(|mut r| render_row(&columns, &mut r))
.collect::()
)))
}
@@ -435,82 +440,115 @@ mod tests {
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::new(),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::from([("bar".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::from([("foo".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
}
),
- HTML::from("2 | ")
+ HTML::from(
+ r#"2 | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
- entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".to_owned())])]),
+ entries: HashMap::from([(
+ "foo".to_owned(),
+ vec![Some("5".to_owned()), Some("10".to_owned())]
+ )]),
}
),
- HTML::from("5 10 | ")
+ HTML::from(
+ r#"5 10 | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
}
),
- HTML::from("5 â | ")
+ HTML::from(
+ r#"5 â | "#
+ )
);
assert_eq!(
render_cell(
"heart",
- &Row {
+ &mut Row {
label: "nope".to_owned(),
entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
}
),
- HTML::from("<3 | ")
+ HTML::from(
+ r#"<3 | "#
+ )
);
assert_eq!(
render_cell(
"foo",
- &Row {
+ &mut Row {
label: "bob's".to_owned(),
entries: HashMap::from([("foo".to_owned(), vec![None])]),
}
),
- HTML::from(" | ")
+ HTML::from(
+ r#" | "#
+ )
);
+ let mut r = Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("baz".to_owned(), vec![None]),
+ ]),
+ };
+ assert_eq!(r.entries.len(), 2);
+ render_cell("foo", &mut r);
+ assert_eq!(r.entries.len(), 1);
+ render_cell("bar", &mut r);
+ assert_eq!(r.entries.len(), 1);
+ render_cell("baz", &mut r);
+ assert_eq!(r.entries.len(), 0);
}
}
|---|