X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/d22b2e05706f7a4367ac3df33d61383673724b8b..de408c29be1f465f08fc0ba4114704d3ef8bdcef:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index 2dd3964..9504c7f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -148,6 +148,44 @@ fn column_order(rows: &[RowInput]) -> Vec { .collect() } +fn render_instance(entry: &Entry) -> String { + match &entry.instance { + None => String::from("✓ "), + Some(instance) => String::from(instance) + " ", + } +} + +fn render_cell(col: &str, row: &RowInput) -> String { + // TODO: Escape HTML special characters + let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect(); + let class = if entries.is_empty() { "" } else { "yes" }; + let all_empty = entries.iter().all(|e| e.instance.is_none()); + let contents = if entries.is_empty() || (all_empty && entries.len() == 1) { + String::new() + } else if all_empty { + format!("{}", entries.len()) + } else { + entries + .iter() + .map(|i| render_instance(i)) + .collect::() + }; + format!("{}", contents.trim()) +} + +fn render_row(columns: &[String], row: &RowInput) -> String { + // This is O(n^2) & doesn't need to be + // TODO: Escape HTML special characters + format!( + "{}{}\n", + row.label, + &columns + .iter() + .map(|col| render_cell(col, row)) + .collect::() + ) +} + /// # Errors /// /// Will return `Err` if @@ -156,8 +194,13 @@ fn column_order(rows: &[RowInput]) -> Vec { /// * an indented line with no preceding non-indented line pub fn tablify(input: impl std::io::Read) -> Result { let rows = read_rows(input).collect::, _>>()?; - let _columns = column_order(&rows); - Ok(String::from(HEADER) + "Hello, world!" + FOOTER) + let columns = column_order(&rows); + Ok(String::from(HEADER) + + &rows + .into_iter() + .map(|r| render_row(&columns, &r)) + .collect::() + + FOOTER) } #[cfg(test)] @@ -318,4 +361,68 @@ mod tests { vec![(1, String::from("bar")), (2, String::from("baz"))] ); } + + #[test] + fn test_render_cell() { + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![] + } + ), + String::from("") + ); + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![Entry::from("bar")] + } + ), + String::from("") + ); + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![Entry::from("foo")] + } + ), + String::from("") + ); + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![Entry::from("foo"), Entry::from("foo")] + } + ), + String::from("2") + ); + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")] + } + ), + String::from("5 10") + ); + assert_eq!( + render_cell( + "foo", + &RowInput { + label: String::from("nope"), + entries: vec![Entry::from("foo: 5"), Entry::from("foo")] + } + ), + String::from("5 ✓") + ); + } }