X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b89077705f91d010ac22f3f4cabe5336257a0758..92476edc57b23a42c640f55f3a00b69bbee809b5:/src/lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 01668eb..2e9bfcc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
use std::collections::{HashMap, HashSet};
+use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
@@ -17,7 +18,7 @@ const HEADER: &str = "
tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
td { border: thin solid gray; }
td.numeric { text-align: right; }
- td.yes { border: thin solid gray; background-color: gray; }
+ td.yes { border: thin solid gray; background-color: #ddd; }
td.spacer { border: none; }
/* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
.highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
@@ -32,7 +33,8 @@ const HEADER: &str = "
- ";
+
+";
const FOOTER: &str = "
@@ -51,8 +53,8 @@ impl From<&str> for Entry {
instance: None,
},
Some((col, instance)) => Entry {
- col: String::from(col),
- instance: Some(String::from(instance)),
+ col: String::from(col.trim()),
+ instance: Some(String::from(instance.trim())),
},
}
}
@@ -141,6 +143,61 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
counts.sort();
counts
}
+fn column_order(rows: &[RowInput]) -> Vec {
+ column_counts(rows)
+ .into_iter()
+ .map(|(_, col)| col)
+ .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 row_label = &row.label;
+ 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
+ let row_label = &row.label;
+ format!(
+ "| {row_label} | {}
|---|
\n",
+ &columns
+ .iter()
+ .map(|col| render_cell(col, row))
+ .collect::()
+ )
+}
+
+fn render_column_headers(columns: &[String]) -> String {
+ // TODO: Escape HTML special characters
+ String::from(" | ")
+ + &columns.iter().fold(String::new(), |mut acc, c| {
+ write!(&mut acc, " | ").unwrap();
+ acc
+ })
+ + "
|---|
\n"
+}
/// # Errors
///
@@ -150,8 +207,14 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
/// * 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_counts(&rows);
- Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
+ let columns = column_order(&rows);
+ Ok(String::from(HEADER)
+ + &render_column_headers(&columns)
+ + &rows
+ .into_iter()
+ .map(|r| render_row(&columns, &r))
+ .collect::()
+ + FOOTER)
}
#[cfg(test)]
@@ -174,6 +237,13 @@ mod tests {
instance: Some(String::from("bar"))
}
);
+ assert_eq!(
+ Entry::from("foo: bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
}
#[test]
@@ -305,4 +375,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 â | ")
+ );
+ }
}