X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/f272e502c4d1e2e33ab1e9fe460df69ff8f8ccd2..70436f237f896aa7651ef259c16a19302e85df38:/src/lib.rs?ds=inline
diff --git a/src/lib.rs b/src/lib.rs
index e90f66b..370eb5d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,104 @@
-#[cfg(test)]
-use std::collections::HashMap;
-#[cfg(test)]
+use std::collections::{HashMap, HashSet};
+use std::fmt::Write;
use std::io::BufRead;
-#[cfg(test)]
use std::iter::Iterator;
+const HEADER: &str = "
+
+
+
+
+";
+const FOOTER: &str = "
+
+
+";
+
+#[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(">"),
+ '<' => escaped.push_str("<"),
+ '\'' => escaped.push_str("'"),
+ '"' => escaped.push_str("""),
+ '&' => escaped.push_str("&"),
+ ok_c => escaped.push(ok_c),
+ }
+ }
+ HTML(escaped)
+ }
+}
+impl From<&str> for HTML {
+ fn from(value: &str) -> HTML {
+ HTML(String::from(value))
+ }
+}
+impl FromIterator for HTML {
+ fn from_iter(iter: T) -> HTML
+ where
+ T: IntoIterator- ,
+ {
+ HTML(iter.into_iter().map(|html| html.0).collect::
())
+ }
+}
+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, Hash)]
+struct Entry {
+ col: String,
+ instance: Option,
+}
+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())),
+ },
+ }
+ }
+}
+
#[derive(Debug, PartialEq, Eq)]
struct RowInput {
label: String,
- entries: Vec,
+ entries: Vec,
}
struct Reader>> {
@@ -16,7 +106,6 @@ struct Reader>> {
row: Option,
}
impl>> Reader>> Iterator for Reader
n + 1
))))
}
- Some(ref mut row) => row.entries.push(String::from(line.trim())),
+ Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
},
Some((_, Ok(line))) => {
let prev = std::mem::take(&mut self.row);
@@ -63,32 +152,144 @@ impl>> Iterator for Reader
}
}
-#[cfg(test)]
fn read_rows(input: impl std::io::Read) -> impl Iterator- > {
Reader::new(std::io::BufReader::new(input).lines())
}
-#[cfg(test)]
-fn column_counts(rows: &[RowInput]) -> HashMap
{
- rows.iter()
- .flat_map(|r| r.entries.iter())
- .fold(HashMap::new(), |mut counts, e| {
- counts
- .entry(String::from(e))
- .and_modify(|c| *c += 1)
+fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+ let mut counts: Vec<_> = rows
+ .iter()
+ .flat_map(|r| {
+ r.entries
+ .iter()
+ .map(|e| &e.col)
+ .collect::>()
+ .into_iter()
+ })
+ .fold(HashMap::new(), |mut cs, col| {
+ cs.entry(String::from(col))
+ .and_modify(|n| *n += 1)
.or_insert(1);
- counts
+ cs
})
+ .into_iter()
+ .map(|(col, n)| (n, col))
+ .collect();
+ counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
+ counts
+}
+fn column_order(rows: &[RowInput]) -> Vec {
+ column_counts(rows)
+ .into_iter()
+ .map(|(_, col)| col)
+ .collect()
}
-pub fn tablify(_input: &impl std::io::Read) -> String {
- String::from("Hello, world!")
+fn render_instance(entry: &Entry) -> HTML {
+ match &entry.instance {
+ None => HTML::from("â"),
+ Some(instance) => HTML::escape(instance.as_ref()),
+ }
+}
+
+fn render_cell(col: &str, row: &RowInput) -> HTML {
+ let row_label = HTML::escape(row.label.as_ref());
+ let col_label = HTML::escape(col);
+ let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect();
+ let class = HTML::from(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) {
+ HTML::from("")
+ } else if all_empty {
+ HTML(format!("{}", entries.len()))
+ } else {
+ HTML(
+ entries
+ .iter()
+ .map(|i| render_instance(i))
+ .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+ .collect::>()
+ .join(" "),
+ )
+ };
+ HTML(format!("{contents} "))
+}
+
+fn render_row(columns: &[String], row: &RowInput) -> HTML {
+ // This is O(n^2) & doesn't need to be
+ let row_label = HTML::escape(row.label.as_ref());
+ HTML(format!(
+ "{row_label} {} {
+ let rows = read_rows(input).collect::, _>>()?;
+ let columns = column_order(&rows);
+ Ok(HTML(format!(
+ "{HEADER}{}{}{FOOTER}",
+ render_column_headers(&columns),
+ rows.into_iter()
+ .map(|r| render_row(&columns, &r))
+ .collect::()
+ )))
}
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn test_parse_entry() {
+ assert_eq!(
+ Entry::from("foo"),
+ Entry {
+ col: String::from("foo"),
+ instance: None
+ }
+ );
+ assert_eq!(
+ Entry::from("foo:bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
+ assert_eq!(
+ Entry::from("foo: bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
+ }
+
#[test]
fn test_read_rows() {
assert_eq!(
@@ -122,7 +323,7 @@ mod tests {
read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);
assert_eq!(
@@ -131,7 +332,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar"), String::from("baz")]
+ entries: vec![Entry::from("bar"), Entry::from("baz")]
}]
);
assert_eq!(
@@ -170,7 +371,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);
@@ -191,7 +392,7 @@ mod tests {
.collect::, _>>()
.unwrap()
),
- HashMap::from([(String::from("bar"), 1), (String::from("baz"), 1)])
+ vec![(1, String::from("bar")), (1, String::from("baz"))]
);
assert_eq!(
column_counts(
@@ -199,7 +400,107 @@ mod tests {
.collect::, _>>()
.unwrap()
),
- HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)])
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
+ );
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
+ .collect::, _>>()
+ .unwrap()
+ ),
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
+ );
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
+ .collect::, _>>()
+ .unwrap()
+ ),
+ vec![(2, String::from("baz")), (1, String::from("bar"))]
+ );
+ }
+
+ #[test]
+ fn test_render_cell() {
+ assert_eq!(
+ render_cell(
+ "foo",
+ &RowInput {
+ label: String::from("nope"),
+ entries: vec![]
+ }
+ ),
+ HTML::from("2 ")
+ );
+ assert_eq!(
+ render_cell(
+ "foo",
+ &RowInput {
+ label: String::from("nope"),
+ entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")]
+ }
+ ),
+ HTML::from("5 10 ")
+ );
+ assert_eq!(
+ render_cell(
+ "foo",
+ &RowInput {
+ label: String::from("nope"),
+ entries: vec![Entry::from("foo: 5"), Entry::from("foo")]
+ }
+ ),
+ HTML::from("5 â ")
+ );
+ assert_eq!(
+ render_cell(
+ "heart",
+ &RowInput {
+ label: String::from("nope"),
+ entries: vec![Entry::from("heart: <3")]
+ }
+ ),
+ HTML::from("<3 ")
+ );
+ assert_eq!(
+ render_cell(
+ "foo",
+ &RowInput {
+ label: String::from("bob's"),
+ entries: vec![Entry::from("foo")]
+ }
+ ),
+ HTML::from("