X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/3bc643e943293ff1a352ca554797a274f2bc91ae..d9bfcf4d1b74bebfcc9881aad4f0aacd01238b01:/src/lib.rs?ds=sidebyside

diff --git a/src/lib.rs b/src/lib.rs
index 3002692..c5761d8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,18 @@
-use std::collections::{HashMap, HashSet};
+use std::borrow::ToOwned;
+use std::collections::HashMap;
 use std::fmt::Write;
 use std::io::BufRead;
 use std::iter::Iterator;
 
+pub struct Config {}
+
 const HEADER: &str = "<!DOCTYPE html>
 <html>
 <head>
   <meta charset=\"utf-8\">
   <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
   <style>
+    td { text-align: center; }
     /* h/t https://wabain.github.io/2019/10/13/css-rotated-table-header.html */
     th, td { white-space: nowrap; }
     th { text-align: left; font-weight: normal; }
@@ -37,35 +41,74 @@ const FOOTER: &str = "    </tbody>
 </body>
 </html>";
 
-#[derive(Debug, PartialEq, Eq, Hash)]
-struct Entry {
-    col: String,
-    instance: Option<String>,
+#[derive(PartialEq, Eq, Debug)]
+pub struct HTML(String);
+impl HTML {
+    fn escape(value: &str) -> HTML {
+        let mut escaped: String = String::new();
+        for c in value.chars() {
+            match c {
+                '>' => escaped.push_str("&gt;"),
+                '<' => escaped.push_str("&lt;"),
+                '\'' => escaped.push_str("&#39;"),
+                '"' => escaped.push_str("&quot;"),
+                '&' => escaped.push_str("&amp;"),
+                ok_c => escaped.push(ok_c),
+            }
+        }
+        HTML(escaped)
+    }
+}
+impl From<&str> for HTML {
+    fn from(value: &str) -> HTML {
+        HTML(String::from(value))
+    }
+}
+impl FromIterator<HTML> for HTML {
+    fn from_iter<T>(iter: T) -> HTML
+    where
+        T: IntoIterator<Item = HTML>,
+    {
+        HTML(iter.into_iter().map(|html| html.0).collect::<String>())
+    }
+}
+impl std::fmt::Display for HTML {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum InputLine<'a> {
+    Blank,
+    RowHeader(&'a str),
+    Entry(&'a str, Option<&'a str>),
 }
-impl From<&str> for Entry {
-    fn from(value: &str) -> Entry {
-        match value.split_once(':') {
-            None => Entry {
-                col: String::from(value),
-                instance: None,
-            },
-            Some((col, instance)) => Entry {
-                col: String::from(col.trim()),
-                instance: Some(String::from(instance.trim())),
-            },
+impl<'a> From<&'a str> for InputLine<'a> {
+    fn from(value: &'a str) -> InputLine<'a> {
+        let trimmed = value.trim_end();
+        if trimmed.is_empty() {
+            InputLine::Blank
+        } else if !trimmed.starts_with(' ') {
+            InputLine::RowHeader(value.trim())
+        } else {
+            match value.split_once(':') {
+                None => InputLine::Entry(value.trim(), None),
+                Some((col, instance)) => InputLine::Entry(col.trim(), Some(instance.trim())),
+            }
         }
     }
 }
 
 #[derive(Debug, PartialEq, Eq)]
-struct RowInput {
+struct Row {
     label: String,
-    entries: Vec<Entry>,
+    entries: HashMap<String, Vec<Option<String>>>,
 }
 
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
-    row: Option<RowInput>,
+    row: Option<Row>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     fn new(input: Input) -> Self {
@@ -76,60 +119,57 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
-    type Item = Result<RowInput, std::io::Error>;
+    type Item = Result<Row, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
-            match self
-                .input
-                .next()
-                .map(|(n, r)| (n, r.map(|line| String::from(line.trim_end()))))
-            {
+            match self.input.next() {
                 None => return Ok(std::mem::take(&mut self.row)).transpose(),
                 Some((_, Err(e))) => return Some(Err(e)),
-                Some((_, Ok(line))) if line.is_empty() && self.row.is_some() => {
-                    return Ok(std::mem::take(&mut self.row)).transpose()
-                }
-                Some((_, Ok(line))) if line.is_empty() => {}
-                Some((n, Ok(line))) if line.starts_with(' ') => match &mut self.row {
-                    None => {
-                        return Some(Err(std::io::Error::other(format!(
-                            "{}: Entry with no header",
-                            n + 1
-                        ))))
+                Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
+                    InputLine::Blank if self.row.is_some() => {
+                        return Ok(std::mem::take(&mut self.row)).transpose()
                     }
-                    Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
-                },
-                Some((_, Ok(line))) => {
-                    let prev = std::mem::take(&mut self.row);
-                    self.row = Some(RowInput {
-                        label: line,
-                        entries: vec![],
-                    });
-                    if prev.is_some() {
-                        return Ok(prev).transpose();
+                    InputLine::Blank => {}
+                    InputLine::Entry(col, instance) => match &mut self.row {
+                        None => {
+                            return Some(Err(std::io::Error::other(format!(
+                                "{}: Entry with no header",
+                                n + 1
+                            ))))
+                        }
+                        Some(ref mut row) => {
+                            row.entries
+                                .entry(col.to_owned())
+                                .and_modify(|is| is.push(instance.map(ToOwned::to_owned)))
+                                .or_insert_with(|| vec![instance.map(ToOwned::to_owned)]);
+                        }
+                    },
+                    InputLine::RowHeader(row) => {
+                        let prev = std::mem::take(&mut self.row);
+                        self.row = Some(Row {
+                            label: row.to_owned(),
+                            entries: HashMap::new(),
+                        });
+                        if prev.is_some() {
+                            return Ok(prev).transpose();
+                        }
                     }
-                }
+                },
             }
         }
     }
 }
 
-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
+fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Row, std::io::Error>> {
     Reader::new(std::io::BufReader::new(input).lines())
 }
 
-fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
     let mut counts: Vec<_> = rows
         .iter()
-        .flat_map(|r| {
-            r.entries
-                .iter()
-                .map(|e| &e.col)
-                .collect::<HashSet<_>>()
-                .into_iter()
-        })
+        .flat_map(|r| r.entries.keys())
         .fold(HashMap::new(), |mut cs, col| {
-            cs.entry(String::from(col))
+            cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
                 .or_insert(1);
             cs
@@ -137,63 +177,76 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
         .into_iter()
         .map(|(col, n)| (n, col))
         .collect();
-    counts.sort();
+    counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
-fn column_order(rows: &[RowInput]) -> Vec<String> {
+fn column_order(rows: &[Row]) -> 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_instance(instance: &Option<String>) -> HTML {
+    match instance {
+        None => HTML::from("â"),
+        Some(instance) => HTML::escape(instance.as_ref()),
     }
 }
 
-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()
+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) {
+        HTML::from("")
     } else if all_empty {
-        format!("{}", entries.len())
+        HTML(format!("{}", instances.unwrap().len()))
     } else {
-        entries
-            .iter()
-            .map(|i| render_instance(i))
-            .collect::<String>()
+        HTML(
+            instances
+                .unwrap()
+                .iter()
+                .map(render_instance)
+                .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+                .collect::<Vec<_>>()
+                .join(" "),
+        )
     };
-    format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col}')\" onmouseout=\"ch2('{row_label}','{col}')\">{}</td>", contents.trim())
+    row.entries.remove(col);
+    HTML(format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col_label}')\" onmouseout=\"ch2('{row_label}','{col_label}')\">{contents}</td>"))
 }
 
-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!(
+fn render_row(columns: &[String], row: &mut Row) -> HTML {
+    let row_label = HTML::escape(row.label.as_ref());
+    HTML(format!(
         "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
         &columns
             .iter()
             .map(|col| render_cell(col, row))
-            .collect::<String>()
-    )
+            .collect::<HTML>()
+    ))
 }
 
-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"
+fn render_column_headers(columns: &[String]) -> HTML {
+    HTML(
+        String::from("<tr class=\"key\"><th></th>")
+            + &columns.iter().fold(String::new(), |mut acc, col| {
+                let col_header = HTML::escape(col.as_ref());
+                write!(
+                    &mut acc,
+                    "<th id=\"{col_header}\"><div><div>{col_header}</div></div></th>"
+                )
+                .unwrap();
+                acc
+            })
+            + "</tr>\n",
+    )
 }
 
 /// # Errors
@@ -202,16 +255,16 @@ fn render_column_headers(columns: &[String]) -> String {
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
-pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
+pub fn tablify(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
     let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
     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)
+    Ok(HTML(format!(
+        "{HEADER}{}{}{FOOTER}",
+        render_column_headers(&columns),
+        rows.into_iter()
+            .map(|mut r| render_row(&columns, &mut r))
+            .collect::<HTML>()
+    )))
 }
 
 #[cfg(test)]
@@ -219,27 +272,31 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_parse_entry() {
+    fn test_parse_line() {
+        assert_eq!(InputLine::from(""), InputLine::Blank);
+        assert_eq!(InputLine::from(" "), InputLine::Blank);
+        assert_eq!(InputLine::from("foo"), InputLine::RowHeader("foo"));
+        assert_eq!(InputLine::from("foo "), InputLine::RowHeader("foo"));
+        assert_eq!(InputLine::from(" foo"), InputLine::Entry("foo", None));
         assert_eq!(
-            Entry::from("foo"),
-            Entry {
-                col: String::from("foo"),
-                instance: None
-            }
+            InputLine::from(" foo:bar"),
+            InputLine::Entry("foo", Some("bar"))
         );
         assert_eq!(
-            Entry::from("foo:bar"),
-            Entry {
-                col: String::from("foo"),
-                instance: Some(String::from("bar"))
-            }
+            InputLine::from(" foo: bar"),
+            InputLine::Entry("foo", Some("bar"))
         );
         assert_eq!(
-            Entry::from("foo: bar"),
-            Entry {
-                col: String::from("foo"),
-                instance: Some(String::from("bar"))
-            }
+            InputLine::from(" foo: bar "),
+            InputLine::Entry("foo", Some("bar"))
+        );
+        assert_eq!(
+            InputLine::from(" foo:  bar "),
+            InputLine::Entry("foo", Some("bar"))
+        );
+        assert_eq!(
+            InputLine::from(" foo :  bar "),
+            InputLine::Entry("foo", Some("bar"))
         );
     }
 
@@ -247,45 +304,48 @@ mod tests {
     fn test_read_rows() {
         assert_eq!(
             read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
-            vec![RowInput {
-                label: String::from("foo"),
-                entries: vec![]
+            vec![Row {
+                label: "foo".to_owned(),
+                entries: HashMap::new(),
             }]
         );
         assert_eq!(
             read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
-            vec![RowInput {
-                label: String::from("bar"),
-                entries: vec![]
+            vec![Row {
+                label: "bar".to_owned(),
+                entries: HashMap::new(),
             }]
         );
         assert_eq!(
             read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![
-                RowInput {
-                    label: String::from("foo"),
-                    entries: vec![]
+                Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
                 },
-                RowInput {
-                    label: String::from("bar"),
-                    entries: vec![]
+                Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
                 }
             ]
         );
         assert_eq!(
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
-            vec![RowInput {
-                label: String::from("foo"),
-                entries: vec![Entry::from("bar")]
+            vec![Row {
+                label: "foo".to_owned(),
+                entries: HashMap::from([("bar".to_owned(), vec![None])]),
             }]
         );
         assert_eq!(
             read_rows(&b"foo\n bar\n baz\n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
-            vec![RowInput {
-                label: String::from("foo"),
-                entries: vec![Entry::from("bar"), Entry::from("baz")]
+            vec![Row {
+                label: "foo".to_owned(),
+                entries: HashMap::from([
+                    ("bar".to_owned(), vec![None]),
+                    ("baz".to_owned(), vec![None])
+                ]),
             }]
         );
         assert_eq!(
@@ -293,13 +353,13 @@ mod tests {
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![
-                RowInput {
-                    label: String::from("foo"),
-                    entries: vec![]
+                Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
                 },
-                RowInput {
-                    label: String::from("bar"),
-                    entries: vec![]
+                Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
                 }
             ]
         );
@@ -308,13 +368,13 @@ mod tests {
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![
-                RowInput {
-                    label: String::from("foo"),
-                    entries: vec![]
+                Row {
+                    label: "foo".to_owned(),
+                    entries: HashMap::new(),
                 },
-                RowInput {
-                    label: String::from("bar"),
-                    entries: vec![]
+                Row {
+                    label: "bar".to_owned(),
+                    entries: HashMap::new(),
                 }
             ]
         );
@@ -322,9 +382,9 @@ mod tests {
             read_rows(&b"foo  \n bar  \n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
-            vec![RowInput {
-                label: String::from("foo"),
-                entries: vec![Entry::from("bar")]
+            vec![Row {
+                label: "foo".to_owned(),
+                entries: HashMap::from([("bar".to_owned(), vec![None])]),
             }]
         );
 
@@ -353,7 +413,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
@@ -361,7 +421,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
@@ -369,7 +429,7 @@ mod tests {
                     .collect::<Result<Vec<_>, _>>()
                     .unwrap()
             ),
-            vec![(1, String::from("bar")), (2, String::from("baz"))]
+            vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
     }
 
@@ -378,62 +438,96 @@ mod tests {
         assert_eq!(
             render_cell(
                 "foo",
-                &RowInput {
-                    label: String::from("nope"),
-                    entries: vec![]
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::new(),
                 }
             ),
-            String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::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")]
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 }
             ),
-            String::from("<td class=\"\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::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")]
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
-            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\"></td>")
+            HTML::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")]
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
                 }
             ),
-            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">2</td>")
+            HTML::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")]
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".to_owned())])]),
+                }
+            ),
+            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "foo",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
+                }
+            ),
+            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 â</td>")
+        );
+        assert_eq!(
+            render_cell(
+                "heart",
+                &mut Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
                 }
             ),
-            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 10</td>")
+            HTML::from("<td class=\"yes\" onmouseover=\"h2('nope','heart')\" onmouseout=\"ch2('nope','heart')\">&lt;3</td>")
         );
         assert_eq!(
             render_cell(
                 "foo",
-                &RowInput {
-                    label: String::from("nope"),
-                    entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
+                &mut Row {
+                    label: "bob's".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
                 }
             ),
-            String::from("<td class=\"yes\" onmouseover=\"h2('nope','foo')\" onmouseout=\"ch2('nope','foo')\">5 â</td>")
+            HTML::from("<td class=\"yes\" onmouseover=\"h2('bob&#39;s','foo')\" onmouseout=\"ch2('bob&#39;s','foo')\"></td>")
         );
+        let mut r = Row {
+            label: "nope".to_owned(),
+            entries: HashMap::from([
+                ("foo".to_owned(), vec![None]),
+                ("baz".to_owned(), vec![None]),
+            ]),
+        };
+        assert_eq!(r.entries.len(), 2);
+        render_cell("foo", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("bar", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("baz", &mut r);
+        assert_eq!(r.entries.len(), 0);
     }
 }
