Render table

diff --git a/src/lib.rs b/src/lib.rs
index 2dd396469d8252876047f61752091c55b320bcfc..9504c7f69928be110927531fadfe64dac0ed9a1b 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -148,6 +148,44 @@ fn column_order(rows: &[RowInput]) -> Vec<String> {
         .collect()
 }
 
         .collect()
 }
 

+fn render_instance(entry: &Entry) -> String {
+    match &entry.instance {
+        None => String::from("✓ "),
+        Some(instance) => String::from(instance) + " ",
+    }
+}
+
+fn render_cell(col: &str, row: &RowInput) -> String {
+    // TODO: Escape HTML special characters
+    let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect();
+    let class = if entries.is_empty() { "" } else { "yes" };
+    let all_empty = entries.iter().all(|e| e.instance.is_none());
+    let contents = if entries.is_empty() || (all_empty && entries.len() == 1) {
+        String::new()
+    } else if all_empty {
+        format!("{}", entries.len())
+    } else {
+        entries
+            .iter()
+            .map(|i| render_instance(i))
+            .collect::<String>()
+    };
+    format!("<td class=\"{class}\">{}</td>", contents.trim())
+}
+
+fn render_row(columns: &[String], row: &RowInput) -> String {
+    // This is O(n^2) & doesn't need to be
+    // TODO: Escape HTML special characters
+    format!(
+        "<tr><th>{}</th>{}</tr>\n",
+        row.label,
+        &columns
+            .iter()
+            .map(|col| render_cell(col, row))
+            .collect::<String>()
+    )
+}
+

 /// # Errors
 ///
 /// Will return `Err` if
 /// # Errors
 ///
 /// Will return `Err` if


@@ -156,8 +194,13 @@ fn column_order(rows: &[RowInput]) -> Vec<String> {
 ///     * an indented line with no preceding non-indented line
 pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
     let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
 ///     * an indented line with no preceding non-indented line
 pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
     let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;

-    let _columns = column_order(&rows);
-    Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
+    let columns = column_order(&rows);
+    Ok(String::from(HEADER)
+        + &rows
+            .into_iter()
+            .map(|r| render_row(&columns, &r))
+            .collect::<String>()
+        + FOOTER)

 }
 
 #[cfg(test)]
 }
 
 #[cfg(test)]


@@ -318,4 +361,68 @@ mod tests {
             vec![(1, String::from("bar")), (2, String::from("baz"))]
         );
     }
             vec![(1, String::from("bar")), (2, String::from("baz"))]
         );
     }

+
+    #[test]
+    fn test_render_cell() {
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![]
+                }
+            ),
+            String::from("<td class=\"\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("bar")]
+                }
+            ),
+            String::from("<td class=\"\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo"), Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\">2</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
+                }
+            ),
+            String::from("<td class=\"yes\">5 10</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\">5 ✓</td>")
+        );
+    }

 }
 }