]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Start on 0.4.0
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 73e517b14016e2a2681f422c4c173e4f20eb7fd5..5c994c9f20a0d8eeb63650d4d9618c6da6dc75dc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,6 +18,7 @@ const HEADER: &str = r#"<!DOCTYPE html>
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
+    th.spacer_row { height: .3em; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
     table { border-collapse: collapse }
     tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
     tr.key > th > div { width: 1em; }
@@ -138,7 +139,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                     InputLine::Blank if self.row.is_some() => {
                         return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
                     InputLine::Blank if self.row.is_some() => {
                         return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
                     }
-                    InputLine::Blank => {}
+                    InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
                     InputLine::Entry(col, instance) => match &mut self.row {
                         None => {
                             return Some(Err(std::io::Error::other(format!(
@@ -169,8 +170,13 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Rowlike, std::io::Error>> {
+fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
+    let default_config = Config {
+        column_threshold: 2,
+    };
     Reader::new(std::io::BufReader::new(input).lines())
     Reader::new(std::io::BufReader::new(input).lines())
+        .collect::<Result<Vec<_>, _>>()
+        .map(|rows| (rows, default_config))
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
@@ -265,7 +271,7 @@ fn render_all_leftovers(row: &Row) -> HTML {
 
 fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
     match rowlike {
 
 fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
     match rowlike {
-        Rowlike::Spacer => HTML::from("<tr><td>&nbsp;</td></tr>"),
+        Rowlike::Spacer => HTML::from("<tr><th class=\"spacer_row\"></th></tr>\n"),
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
             let cells = columns
         Rowlike::Row(row) => {
             let row_label = HTML::escape(row.label.as_ref());
             let cells = columns
@@ -302,9 +308,9 @@ 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
 ///   * 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(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
-    let columns = column_order(config, &rows);
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+    let (rows, config) = read_input(input)?;
+    let columns = column_order(&config, &rows);
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
@@ -347,24 +353,27 @@ mod tests {
         );
     }
 
         );
     }
 
+    fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
+        read_input(input).map(|(rows, _)| rows)
+    }
     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(
-            read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
-            read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"bar"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
@@ -377,16 +386,14 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\n bar\n baz\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
@@ -396,14 +403,26 @@ mod tests {
             })]
         );
         assert_eq!(
             })]
         );
         assert_eq!(
-            read_rows(&b"foo\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\nbar\n"[..]).unwrap(),
+            vec![
+                Rowlike::Row(Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
+                }),
+                Rowlike::Row(Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
+                })
+            ]
+        );
+        assert_eq!(
+            read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                 }),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                 }),
+                Rowlike::Spacer,
                 Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                 Rowlike::Row(Row {
                     label: "bar".to_owned(),
                     entries: HashMap::new(),
@@ -411,9 +430,7 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo\n \nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n \nbar\n"[..]).unwrap(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
@@ -426,20 +443,18 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(
-            read_rows(&b"foo  \n bar  \n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo  \n bar  \n"[..]).unwrap(),
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
 
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
 
-        let bad = read_rows(&b" foo"[..]).next().unwrap();
+        let bad = read_rows(&b" foo"[..]);
         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 
         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 
-        let bad2 = read_rows(&b"foo\n\n bar"[..]).nth(1).unwrap();
+        let bad2 = read_rows(&b"foo\n\n bar"[..]);
         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }
         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }
@@ -447,34 +462,20 @@ mod tests {
     #[test]
     fn test_column_counts() {
         assert_eq!(
     #[test]
     fn test_column_counts() {
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\n"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).unwrap()),
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
-            column_counts(
-                &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
-                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
+                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap()
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
Summarize a text log as an HTML table