Tally marks

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index f5d12f83f4b38b8198b434f158cbb57cc491d879..84cb336301e83f47b6e13bf4b484c41dca1322b5 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,6 +4,12 @@ use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
 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,
 #[derive(PartialEq, Eq, Debug)]
 struct Config {
     column_threshold: usize,


@@ -279,29 +285,30 @@ fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {
         .collect()
 }
 
         .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 {
 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(col: &str, row: &mut Row) -> HTML {


@@ -321,10 +328,10 @@ fn render_cell(col: &str, row: &mut Row) -> HTML {
 
 fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
     let label = HTML::escape(notcol);
 
 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 {
         HTML(format!("{label}"))
     } else {

+        let rest = render_instances(instances);

         HTML(format!("{label}: {rest}"))
     }
 }
         HTML(format!("{label}: {rest}"))
     }
 }


@@ -462,6 +469,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)
     }
     fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
         read_input(input).map(|(rows, _)| rows)
     }


@@ -692,7 +714,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             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!(
             )
         );
         assert_eq!(


@@ -704,7 +726,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             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!(
             )
         );
         assert_eq!(


@@ -731,7 +753,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             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!(
             )
         );
         assert_eq!(


@@ -755,7 +777,7 @@ mod tests {
                 }
             ),
             HTML::from(
                 }
             ),
             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 {
             )
         );
         let mut r = Row {


@@ -810,7 +832,7 @@ mod tests {
                     ]),
                 }
             ),
                     ]),
                 }
             ),

-            HTML::from("bar: 2, foo")
+            HTML::from("bar: 𝍷𝍷, foo")

         );
         assert_eq!(
             render_all_leftovers(
         );
         assert_eq!(
             render_all_leftovers(