extract render_instances()

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index cfaeb4be194b96c5b16faad185e29cbec632b064..1396c9be9b9605d18af6efce8deb974b121e6408 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -187,36 +187,39 @@ fn column_order(rows: &[Row]) -> Vec<String> {
          .collect()
  }
  
-fn render_instance(instance: &Option<String>) -> HTML {
+fn render_one_instance(instance: &Option<String>) -> HTML {
      match instance {
          None => HTML::from("✓"),
          Some(instance) => HTML::escape(instance.as_ref()),
      }
  }
  
-fn render_cell(col: &str, row: &mut Row) -> HTML {
-    let row_label = HTML::escape(row.label.as_ref());
-    let col_label = HTML::escape(col);
-    let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
-    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
-    let all_empty = instances
-        .iter()
-        .flat_map(|is| is.iter())
-        .all(Option::is_none);
-    let contents = if instances.is_none() || (all_empty && instances.unwrap().len() == 1) {
+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.unwrap().len()))
+        HTML(format!("{}", instances.len()))
      } else {
          HTML(
              instances
-                .unwrap()
                  .iter()
-                .map(render_instance)
+                .map(render_one_instance)
                  .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
                  .collect::<Vec<_>>()
                  .join(" "),
          )
+    }
+}
+
+fn render_cell(col: &str, row: &mut Row) -> HTML {
+    let row_label = HTML::escape(row.label.as_ref());
+    let col_label = HTML::escape(col);
+    let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
+    let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+    let contents = match instances {
+        None => HTML::from(""),
+        Some(is) => render_instances(is),
      };
      row.entries.remove(col);
      HTML(format!(
@@ -226,12 +229,12 @@ fn render_cell(col: &str, row: &mut Row) -> HTML {
  
  fn render_row(columns: &[String], row: &mut Row) -> HTML {
      let row_label = HTML::escape(row.label.as_ref());
+    let cells = columns
+        .iter()
+        .map(|col| render_cell(col, row))
+        .collect::<HTML>();
      HTML(format!(
-        "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
-        &columns
-            .iter()
-            .map(|col| render_cell(col, row))
-            .collect::<HTML>()
+        "<tr><th id=\"{row_label}\">{row_label}</th>{cells}</tr>\n"
      ))
  }
  
@@ -551,4 +554,21 @@ mod tests {
          render_cell("baz", &mut r);
          assert_eq!(r.entries.len(), 0);
      }
+
+    #[test]
+    fn test_render_row() {
+        assert_eq!(
+            render_row(
+                &["foo".to_owned()],
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("bar".to_owned(), vec![None])]),
+                }
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td></tr>
+"#
+            )
+        );
+    }
  }