X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/5ffe8e3a8394fc46b50659b0e197b0b0a22e18c8..58c0a717743d262025e664eb6ce79ad9cd4c7968:/src/lib.rs?ds=sidebyside

diff --git a/src/lib.rs b/src/lib.rs
index cfaeb4b..f1da5f7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -187,7 +187,7 @@ 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()),
@@ -212,7 +212,7 @@ fn render_cell(col: &str, row: &mut Row) -> 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(" "),
@@ -226,12 +226,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 +551,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>
+"#
+            )
+        );
+    }
 }
