]> git.scottworley.com Git - tablify/blobdiff - src/lib.rs
projects / tablify / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Start on 0.2.1
[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index 01668eb3db650e39157a85f0dc1f50b3663422c2..efdb7d812ec7c98724518d883f214b40871601a3 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;
 
@@ -16,12 +17,9 @@ const HEADER: &str = "<!DOCTYPE html>
     tr.key > th > div { width: 1em; }
     tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
     td { border: thin solid gray; }
     tr.key > th > div { width: 1em; }
     tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
     td { border: thin solid gray; }
-    td.numeric { text-align: right; }
-    td.yes { border: thin solid gray; background-color: gray; }
-    td.spacer { border: none; }
+    td.yes { border: thin solid gray; background-color: #ddd; }
     /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
     .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
     /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
     .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
-    img { height: 1.2em; }
   </style>
   <script>
     function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   \"highlight\"); } }
   </style>
   <script>
     function highlight(id)       { const e = document.getElementById(id); if (e) { e.classList.add(   \"highlight\"); } }
@@ -32,7 +30,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>
@@ -51,8 +50,8 @@ impl From<&str> for Entry {
                 instance: None,
             },
             Some((col, instance)) => Entry {
                 instance: None,
             },
             Some((col, instance)) => Entry {
-                col: String::from(col),
-                instance: Some(String::from(instance)),
+                col: String::from(col.trim()),
+                instance: Some(String::from(instance.trim())),
             },
         }
     }
             },
         }
     }
@@ -141,6 +140,61 @@ 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 row_label = &row.label;
+    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}\" onmouseover=\"h2('{row_label}','{col}')\" onmouseout=\"ch2('{row_label}','{col}')\">{}</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
+    let row_label = &row.label;
+    format!(
+        "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
+        &columns
+            .iter()
+            .map(|col| render_cell(col, row))
+            .collect::<String>()
+    )
+}
+
+fn render_column_headers(columns: &[String]) -> String {
+    // TODO: Escape HTML special characters
+    String::from("<tr class=\"key\"><th></th>")
+        + &columns.iter().fold(String::new(), |mut acc, c| {
+            write!(&mut acc, "<th id=\"{c}\"><div><div>{c}</div></div></th>").unwrap();
+            acc
+        })
+        + "</tr>\n"
+}
 
 /// # Errors
 ///
 
 /// # Errors
 ///
@@ -150,8 +204,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)]
@@ -174,6 +234,13 @@ mod tests {
                 instance: Some(String::from("bar"))
             }
         );
                 instance: Some(String::from("bar"))
             }
         );
+        assert_eq!(
+            Entry::from("foo: bar"),
+            Entry {
+                col: String::from("foo"),
+                instance: Some(String::from("bar"))
+            }
+        );
     }
 
     #[test]
     }
 
     #[test]
@@ -305,4 +372,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=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("bar")]
+                }
+            ),
+            String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &RowInput {
+                    label: String::from("nope"),
+                    entries: vec![Entry::from("foo"), Entry::from("foo")]
+                }
+            ),
+            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">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\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">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\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 ✓</td>")
+        );
+    }
 }
 }
Summarize a text log as an HTML table