Clippy wants this to use mut and write!

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

index 5b06e705aecaaac8fd071f064dd63d731038687d..a3878c56f879436aedd0d18220a60a076e3ffa7c 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
  use std::collections::{HashMap, HashSet};
  use std::collections::{HashMap, HashSet};
+use std::fmt::Write;
  use std::io::BufRead;
  use std::iter::Iterator;
  
  use std::io::BufRead;
  use std::iter::Iterator;
  
@@ -32,7 +33,8 @@ const HEADER: &str = "<!DOCTYPE html>
  </head>
  <body>
    <table>
  </head>
  <body>
    <table>
-    <tbody>";
+    <tbody>
+";
  const FOOTER: &str = "    </tbody>
    </table>
  </body>
  const FOOTER: &str = "    </tbody>
    </table>
  </body>
@@ -141,6 +143,60 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
      counts.sort();
      counts
  }
      counts.sort();
      counts
  }
+fn column_order(rows: &[RowInput]) -> Vec<String> {
+    column_counts(rows)
+        .into_iter()
+        .map(|(_, col)| col)
+        .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>()
+    )
+}
+
+fn render_column_headers(columns: &[String]) -> String {
+    // TODO: Escape HTML special characters
+    String::from("<th></th>")
+        + &columns.iter().fold(String::new(), |mut acc, c| {
+            write!(&mut acc, "<th>{c}</th>").unwrap();
+            acc
+        })
+        + "\n"
+}
  
  /// # Errors
  ///
  
  /// # Errors
  ///
@@ -150,8 +206,14 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, 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_counts(&rows);
-    Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
+    let columns = column_order(&rows);
+    Ok(String::from(HEADER)
+        + &render_column_headers(&columns)
+        + &rows
+            .into_iter()
+            .map(|r| render_row(&columns, &r))
+            .collect::<String>()
+        + FOOTER)
  }
  
  #[cfg(test)]
  }
  
  #[cfg(test)]
@@ -312,4 +374,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>")
+        );
+    }
  }
  }