X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/d669f60d11bad036e4ac6c3da39f067d7bd2153a..61a7497779d8e9a7d7b73a53c55d252177d68e1c:/src/lib.rs?ds=sidebyside

diff --git a/src/lib.rs b/src/lib.rs
index f5d12f8..c1a4761 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,6 +4,12 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
+fn tally_marks(n: usize) -> String {
+    let fives = { 0..n / 5 }.map(|_| '𝍸');
+    let ones = { 0..n % 5 }.map(|_| '𝍷');
+    fives.chain(ones).collect()
+}
+
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,
@@ -279,52 +285,65 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
         .collect()
 }
 
-fn render_one_instance(instance: &Option<String>) -> HTML {
-    match instance {
-        None => HTML::from("✓"),
-        Some(instance) => HTML::escape(instance.as_ref()),
-    }
-}
-
 fn render_instances(instances: &[Option<String>]) -> HTML {
-    let all_empty = instances.iter().all(Option::is_none);
-    if all_empty && instances.len() == 1 {
-        HTML::from("")
-    } else if all_empty {
-        HTML(format!("{}", instances.len()))
-    } else {
-        HTML(
-            instances
-                .iter()
-                .map(render_one_instance)
-                .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
-                .collect::<Vec<_>>()
-                .join(" "),
-        )
+    let mut tally = 0;
+    let mut out = vec![];
+    for ins in instances {
+        match ins {
+            None => tally += 1,
+            Some(content) => {
+                if tally > 0 {
+                    out.push(HTML(tally_marks(tally)));
+                    tally = 0;
+                }
+                out.push(HTML::escape(content));
+            }
+        }
+    }
+    if tally > 0 {
+        out.push(HTML(tally_marks(tally)));
     }
+    HTML(
+        out.into_iter()
+            .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+            .collect::<Vec<_>>()
+            .join(" "),
+    )
 }
 
-fn render_cell(col: &str, row: &mut Row) -> HTML {
+fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
     let row_label = HTML::escape(row.label.as_ref());
-    let col_label = HTML::escape(col);
+    let col_label = HTML::escape(
+        config
+            .substitute_labels
+            .get(col)
+            .map_or(col, std::string::String::as_str),
+    );
     let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
-    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+    let is_empty = match instances {
+        None => true,
+        Some(is) => is.iter().all(|ins| match ins {
+            None => false,
+            Some(content) => content == "×",
+        }),
+    };
+    let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
     let contents = match instances {
         None => HTML::from(""),
         Some(is) => render_instances(is),
     };
     row.entries.remove(col);
     HTML(format!(
-        r#"<td class="{class}" onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
+        r#"<td{class} onmouseover="h2('{row_label}','{col_label}')" onmouseout="ch2('{row_label}','{col_label}')">{contents}</td>"#
     ))
 }
 
 fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
     let label = HTML::escape(notcol);
-    let rest = render_instances(instances);
-    if rest == HTML::from("") {
+    if instances.len() == 1 && instances[0].is_none() {
         HTML(format!("{label}"))
     } else {
+        let rest = render_instances(instances);
         HTML(format!("{label}: {rest}"))
     }
 }
@@ -356,14 +375,14 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
                 .iter()
                 .map(|ocol| match ocol {
                     Some(col) if config.hidden_columns.contains(col) => HTML::from(""),
-                    Some(col) => render_cell(col, row),
+                    Some(col) => render_cell(config, col, row),
                     None => HTML::from(r#"<td class="spacer_col"></td>"#),
                 })
                 .collect::<HTML>();
             let dynamic_cells = columns
                 .iter()
                 .filter(|&col| !config.hidden_columns.contains(col))
-                .map(|col| render_cell(col, row))
+                .map(|col| render_cell(config, col, row))
                 .collect::<HTML>();
             let leftovers = render_all_leftovers(config, row);
             HTML(format!(
@@ -462,6 +481,21 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_tally_marks() {
+        assert_eq!(tally_marks(1), "𝍷");
+        assert_eq!(tally_marks(2), "𝍷𝍷");
+        assert_eq!(tally_marks(3), "𝍷𝍷𝍷");
+        assert_eq!(tally_marks(4), "𝍷𝍷𝍷𝍷");
+        assert_eq!(tally_marks(5), "𝍸");
+        assert_eq!(tally_marks(6), "𝍸𝍷");
+        assert_eq!(tally_marks(7), "𝍸𝍷𝍷");
+        assert_eq!(tally_marks(8), "𝍸𝍷𝍷𝍷");
+        assert_eq!(tally_marks(9), "𝍸𝍷𝍷𝍷𝍷");
+        assert_eq!(tally_marks(10), "𝍸𝍸");
+        assert_eq!(tally_marks(11), "𝍸𝍸𝍷");
+    }
+
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
         read_input(input).map(|(rows, _)| rows)
     }
@@ -661,6 +695,7 @@ mod tests {
     fn test_render_cell() {
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -668,11 +703,12 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -680,11 +716,12 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -692,11 +729,12 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷</td>"#
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -704,11 +742,12 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">2</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">𝍷𝍷</td>"#
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -724,6 +763,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -731,11 +771,25 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 ✓</td>"#
+                r#"<td class="yes" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">5 𝍷</td>"#
             )
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
+                "foo",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("×".to_owned())])]),
+                }
+            ),
+            HTML::from(
+                r#"<td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')">×</td>"#
+            )
+        );
+        assert_eq!(
+            render_cell(
+                &Config::default(),
                 "heart",
                 &mut Row {
                     label: "nope".to_owned(),
@@ -748,6 +802,7 @@ mod tests {
         );
         assert_eq!(
             render_cell(
+                &Config::default(),
                 "foo",
                 &mut Row {
                     label: "bob's".to_owned(),
@@ -755,7 +810,7 @@ mod tests {
                 }
             ),
             HTML::from(
-                r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')"></td>"#
+                r#"<td class="yes" onmouseover="h2('bob&#39;s','foo')" onmouseout="ch2('bob&#39;s','foo')">𝍷</td>"#
             )
         );
         let mut r = Row {
@@ -766,11 +821,11 @@ mod tests {
             ]),
         };
         assert_eq!(r.entries.len(), 2);
-        render_cell("foo", &mut r);
+        render_cell(&Config::default(), "foo", &mut r);
         assert_eq!(r.entries.len(), 1);
-        render_cell("bar", &mut r);
+        render_cell(&Config::default(), "bar", &mut r);
         assert_eq!(r.entries.len(), 1);
-        render_cell("baz", &mut r);
+        render_cell(&Config::default(), "baz", &mut r);
         assert_eq!(r.entries.len(), 0);
     }
 
@@ -810,7 +865,7 @@ mod tests {
                     ]),
                 }
             ),
-            HTML::from("bar: 2, foo")
+            HTML::from("bar: 𝍷𝍷, foo")
         );
         assert_eq!(
             render_all_leftovers(
@@ -841,7 +896,7 @@ mod tests {
                 })
             ),
             HTML::from(
-                r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
+                r#"<tr><th id="nope">nope</th><td onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
 "#
             )
         );
@@ -925,6 +980,25 @@ mod tests {
             ),
             HTML::from(
                 r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
+                },
+                &["foo".to_owned()],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">𝍷</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
 "#
             )
         );