use std::collections::{HashMap, HashSet};
+use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
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.yes { border: thin solid gray; background-color: #ddd; }
td.spacer { border: none; }
/* 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; }
</head>
<body>
<table>
- <tbody>";
+ <tbody>
+";
const FOOTER: &str = " </tbody>
</table>
</body>
</html>";
#[derive(Debug, PartialEq, Eq, Hash)]
-struct Entry(String);
+struct Entry {
+ col: String,
+ instance: Option<String>,
+}
+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 {
n + 1
))))
}
- Some(ref mut row) => row.entries.push(Entry(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);
fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
let mut counts: Vec<_> = rows
.iter()
- .flat_map(|r| r.entries.iter().collect::<HashSet<_>>().into_iter())
- .fold(HashMap::new(), |mut cs, e| {
- cs.entry(String::from(&e.0))
+ .flat_map(|r| {
+ r.entries
+ .iter()
+ .map(|e| &e.col)
+ .collect::<HashSet<_>>()
+ .into_iter()
+ })
+ .fold(HashMap::new(), |mut cs, col| {
+ cs.entry(String::from(col))
.and_modify(|n| *n += 1)
.or_insert(1);
cs
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
///
/// * 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)]
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!(
read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![Entry(String::from("bar"))]
+ entries: vec![Entry::from("bar")]
}]
);
assert_eq!(
.collect::<Vec<_>>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![Entry(String::from("bar")), Entry(String::from("baz"))]
+ entries: vec![Entry::from("bar"), Entry::from("baz")]
}]
);
assert_eq!(
.collect::<Vec<_>>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![Entry(String::from("bar"))]
+ entries: vec![Entry::from("bar")]
}]
);
),
vec![(1, String::from("bar")), (2, String::from("baz"))]
);
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap()
+ ),
+ 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>")
+ );
}
}
projects / tablify / blobdiff