X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b2f318323ffed782b90237e38015d65638848d3d..7a246d87bb2de224662bb80526fd5ed31be05cbe:/src/lib.rs
diff --git a/src/lib.rs b/src/lib.rs
index d974461..bfcfdec 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,28 +4,85 @@ use std::fmt::Write;
use std::io::BufRead;
use std::iter::Iterator;
+const TALLY_FONT: &str = "BabelStone Han";
+
+fn tally_marks(n: usize, mark: Option<&str>) -> HTML {
+ HTML(match mark {
+ None => {
+ let fives = { 0..n / 5 }.map(|_| 'ð¸');
+ let ones = { 0..n % 5 }.map(|_| 'ð·');
+ let marks: String = fives.chain(ones).collect();
+ format!("{marks}")
+ }
+ Some(m) => { 0..n }.map(|_| m).collect(),
+ })
+}
+
#[derive(PartialEq, Eq, Debug)]
struct Config {
column_threshold: usize,
- static_columns: Vec,
+ static_columns: Vec>,
+ hidden_columns: HashSet,
+ substitute_labels: HashMap,
+ mark: HashMap,
}
impl Config {
- fn apply_command(&mut self, cmd: &str) -> Result<(), std::io::Error> {
+ fn apply_command(&mut self, line_num: usize, cmd: &str) -> Result<(), std::io::Error> {
if let Some(threshold) = cmd.strip_prefix("col_threshold ") {
- self.column_threshold = threshold
- .parse()
- .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?;
+ self.column_threshold = threshold.parse().map_err(|e| {
+ std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ format!("line {line_num}: col_threshold must be numeric: {e}"),
+ )
+ })?;
+ } else if let Some(col) = cmd.strip_prefix("hide ") {
+ self.hidden_columns.insert(col.to_owned());
} else if let Some(col) = cmd.strip_prefix("col ") {
- self.static_columns.push(col.to_owned());
+ self.static_columns.push(Some(col.to_owned()));
+ } else if cmd == "colsep" {
+ self.static_columns.push(None);
+ } else if let Some(directive) = cmd.strip_prefix("label ") {
+ match directive.split_once(':') {
+ None => {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ format!("line {line_num}: Annotation missing ':'"),
+ ))
+ }
+ Some((col, label)) => self
+ .substitute_labels
+ .insert(col.to_owned(), label.to_owned()),
+ };
+ } else if let Some(directive) = cmd.strip_prefix("mark ") {
+ match directive.split_once(':') {
+ None => {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::InvalidInput,
+ format!("line {line_num}: Mark missing ':'"),
+ ))
+ }
+ Some((col, label)) => self.mark.insert(col.to_owned(), label.to_owned()),
+ };
} else {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
- format!("Unknown command: {cmd}"),
+ format!("line {line_num}: Unknown command: {cmd}"),
));
}
Ok(())
}
}
+impl Default for Config {
+ fn default() -> Self {
+ Self {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
+ }
+ }
+}
const HEADER: &str = r#"
@@ -38,13 +95,14 @@ const HEADER: &str = r#"
th, td { white-space: nowrap; }
th { text-align: left; font-weight: normal; }
th.spacer_row { height: .3em; }
+ .spacer_col { border: none; width: .2em; }
table { border-collapse: collapse }
tr.key > th { height: 10em; vertical-align: bottom; line-height: 1 }
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.leftover { text-align: left; border: none; padding-left: .4em; }
- td.yes { border: thin solid gray; background-color: #ddd; }
+ td.yes { border: thin solid gray; background-color: #eee; }
/* 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; }
@@ -152,9 +210,7 @@ impl<'cfg, Input: Iterator- >> Reader<'cfg,
}
}
}
-impl<'cfg, Input: Iterator
- >> Iterator
- for Reader<'cfg, Input>
-{
+impl>> Iterator for Reader<'_, Input> {
type Item = Result;
fn next(&mut self) -> Option {
loop {
@@ -163,7 +219,7 @@ impl<'cfg, Input: Iterator
- >> Iterator
Some((_, Err(e))) => return Some(Err(e)),
Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
InputLine::Command(cmd) => {
- if let Err(e) = self.config.apply_command(cmd) {
+ if let Err(e) = self.config.apply_command(n + 1, cmd) {
return Some(Err(e));
}
}
@@ -171,10 +227,10 @@ impl<'cfg, Input: Iterator
- >> Iterator
return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()
}
InputLine::Blank => return Some(Ok(Rowlike::Spacer)),
- InputLine::Entry(col, instance) => match &mut self.row {
+ InputLine::Entry(col, instance) => match self.row {
None => {
return Some(Err(std::io::Error::other(format!(
- "{}: Entry with no header",
+ "line {}: Entry with no header",
n + 1
))))
}
@@ -202,10 +258,7 @@ impl<'cfg, Input: Iterator
- >> Iterator
}
fn read_input(input: impl std::io::Read) -> Result<(Vec, Config), std::io::Error> {
- let mut config = Config {
- column_threshold: 2,
- static_columns: vec![],
- };
+ let mut config = Config::default();
let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
reader
.collect::, _>>()
@@ -216,8 +269,8 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
let empty = HashMap::new();
let mut counts: Vec<_> = rows
.iter()
- .flat_map(|rl| match rl {
- Rowlike::Row(r) => r.entries.keys(),
+ .flat_map(|rl| match *rl {
+ Rowlike::Row(ref r) => r.entries.keys(),
Rowlike::Spacer => empty.keys(),
})
.fold(HashMap::new(), |mut cs, col| {
@@ -229,101 +282,133 @@ fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
.into_iter()
.map(|(col, n)| (n, col))
.collect();
- counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
+ counts.sort_unstable_by(|a, b| b.0.cmp(&a.0).then(a.1.cmp(&b.1)));
counts
}
fn column_order(config: &Config, rows: &[Rowlike]) -> Vec {
let static_columns: HashSet<&str> = config
.static_columns
.iter()
+ .flatten()
.map(std::string::String::as_str)
.collect();
column_counts(rows)
.into_iter()
.filter_map(|(n, col)| {
- (n >= config.column_threshold && !static_columns.contains(col.as_str())).then_some(col)
+ (n >= config.column_threshold
+ && !static_columns.contains(col.as_str())
+ && !config.hidden_columns.contains(&col))
+ .then_some(col)
})
.collect()
}
-fn render_one_instance(instance: &Option) -> HTML {
- match instance {
- None => HTML::from("â"),
- Some(instance) => HTML::escape(instance.as_ref()),
+fn render_instances(instances: &[Option], mark: Option<&str>) -> HTML {
+ let mut tally = 0;
+ let mut out = vec![];
+ for ins in instances {
+ match *ins {
+ None => tally += 1,
+ Some(ref content) => {
+ if tally > 0 {
+ out.push(tally_marks(tally, mark));
+ tally = 0;
+ }
+ out.push(HTML::escape(content));
+ }
+ }
}
-}
-
-fn render_instances(instances: &[Option]) -> HTML {
- let all_empty = instances.iter().all(Option::is_none);
- if all_empty && instances.len() == 1 {
- HTML::from("")
- } else if all_empty {
- HTML(format!("{}", instances.len()))
- } else {
- HTML(
- instances
- .iter()
- .map(render_one_instance)
- .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
- .collect::>()
- .join(" "),
- )
+ if tally > 0 {
+ out.push(tally_marks(tally, mark));
}
+ HTML(
+ out.into_iter()
+ .map(|html| html.0)
+ .collect::>()
+ .join(" "),
+ )
}
-fn render_cell(col: &str, row: &mut Row) -> HTML {
+fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
let row_label = HTML::escape(row.label.as_ref());
- let col_label = HTML::escape(col);
+ let col_label = HTML::escape(
+ config
+ .substitute_labels
+ .get(col)
+ .map_or(col, std::string::String::as_str),
+ );
let instances: Option<&Vec>> = row.entries.get(col);
- let class = HTML::from(if instances.is_none() { "" } else { "yes" });
+ let is_empty = match instances {
+ None => true,
+ Some(is) => is.iter().all(|ins| match *ins {
+ None => false,
+ Some(ref content) => content == "Ã",
+ }),
+ };
+ let class = HTML::from(if is_empty { "" } else { r#" class="yes""# });
let contents = match instances {
None => HTML::from(""),
- Some(is) => render_instances(is),
+ Some(is) => render_instances(is, config.mark.get(col).map(String::as_str)),
};
row.entries.remove(col);
HTML(format!(
- r#"
| {contents} | "#
+ r#"{contents}"#
))
}
-fn render_leftover(notcol: &str, instances: &[Option]) -> HTML {
+fn render_leftover(config: &Config, notcol: &str, instances: &[Option]) -> HTML {
let label = HTML::escape(notcol);
- let rest = render_instances(instances);
- if rest == HTML::from("") {
+ if instances.len() == 1 && instances[0].is_none() {
HTML(format!("{label}"))
} else {
+ let rest = render_instances(instances, config.mark.get(notcol).map(String::as_str));
HTML(format!("{label}: {rest}"))
}
}
-fn render_all_leftovers(row: &Row) -> HTML {
- let mut order: Vec<_> = row.entries.keys().collect();
+fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
+ let mut order: Vec<_> = row
+ .entries
+ .keys()
+ .filter(|&col| !config.hidden_columns.contains(col))
+ .collect();
order.sort_unstable();
HTML(
order
.into_iter()
- .map(|notcol| render_leftover(notcol, row.entries.get(notcol).expect("Key vanished?!")))
- .map(|html| html.0) // Waiting for slice_concat_trait to stabilize
+ .map(|notcol| {
+ render_leftover(
+ config,
+ notcol,
+ row.entries.get(notcol).expect("Key vanished?!"),
+ )
+ })
+ .map(|html| html.0)
.collect::>()
.join(", "),
)
}
fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTML {
- match rowlike {
+ match *rowlike {
Rowlike::Spacer => HTML::from(" |
|---|
\n"),
- Rowlike::Row(row) => {
+ Rowlike::Row(ref mut row) => {
let row_label = HTML::escape(row.label.as_ref());
let static_cells = config
.static_columns
.iter()
- .map(|col| render_cell(col, row))
+ .map(|ocol| match *ocol {
+ Some(ref col) if config.hidden_columns.contains(col) => HTML::from(""),
+ Some(ref col) => render_cell(config, col, row),
+ None => HTML::from(r#" | "#),
+ })
.collect::();
let dynamic_cells = columns
.iter()
- .map(|col| render_cell(col, row))
+ .filter(|&col| !config.hidden_columns.contains(col))
+ .map(|col| render_cell(config, col, row))
.collect::();
- let leftovers = render_all_leftovers(row);
+ let leftovers = render_all_leftovers(config, row);
HTML(format!(
"| {row_label} | {static_cells}{dynamic_cells}{leftovers} |
|---|
\n"
))
@@ -331,21 +416,40 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
}
}
+fn column_header_labels<'a>(
+ config: &'a Config,
+ columns: &'a [String],
+) -> impl Iterator- > {
+ let static_columns = config.static_columns.iter().map(|oc| oc.as_ref());
+ let dynamic_columns = columns.iter().map(Some);
+ static_columns
+ .chain(dynamic_columns)
+ .filter(|ocol| ocol.is_none_or(|col| !config.hidden_columns.contains(col)))
+ .map(|ocol| {
+ ocol.map(|col| match config.substitute_labels.get(col) {
+ None => col,
+ Some(substitute) => substitute,
+ })
+ })
+}
+
fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
HTML(
String::from(r#"
| "#)
- + &config.static_columns.iter().chain(columns.iter()).fold(
- String::new(),
- |mut acc, col| {
- let col_header = HTML::escape(col.as_ref());
- write!(
- &mut acc,
- r#""#
- )
- .unwrap();
- acc
- },
- )
+ + &column_header_labels(config, columns).fold(String::new(), |mut acc, ocol| {
+ match ocol {
+ Some(col) => {
+ let col_header = HTML::escape(col);
+ write!(
+ &mut acc,
+ r#""#
+ )
+ }
+ None => write!(&mut acc, r#" | "#),
+ }
+ .unwrap();
+ acc
+ })
+ "
|---|
\n",
)
}
@@ -356,7 +460,7 @@ fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
/// * 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 {
+pub fn tablify(input: R) -> Result {
let (rows, config) = read_input(input)?;
let columns = column_order(&config, &rows);
Ok(HTML(format!(
@@ -401,6 +505,81 @@ mod tests {
);
}
+ #[test]
+ fn test_tally_marks() {
+ assert_eq!(
+ tally_marks(1, None),
+ HTML(format!(
+ "ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(2, None),
+ HTML(format!(
+ "ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(3, None),
+ HTML(format!(
+ "ð·ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(4, None),
+ HTML(format!(
+ "ð·ð·ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(5, None),
+ HTML(format!(
+ "ð¸"
+ ))
+ );
+ assert_eq!(
+ tally_marks(6, None),
+ HTML(format!(
+ "ð¸ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(7, None),
+ HTML(format!(
+ "ð¸ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(8, None),
+ HTML(format!(
+ "ð¸ð·ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(9, None),
+ HTML(format!(
+ "ð¸ð·ð·ð·ð·"
+ ))
+ );
+ assert_eq!(
+ tally_marks(10, None),
+ HTML(format!(
+ "ð¸ð¸"
+ ))
+ );
+ assert_eq!(
+ tally_marks(11, None),
+ HTML(format!(
+ "ð¸ð¸ð·"
+ ))
+ );
+ assert_eq!(tally_marks(1, Some("x")), "x".into());
+ assert_eq!(tally_marks(4, Some("x")), "xxxx".into());
+ assert_eq!(tally_marks(5, Some("x")), "xxxxx".into());
+ assert_eq!(tally_marks(6, Some("x")), "xxxxxx".into());
+ assert_eq!(tally_marks(2, Some("ð")), "ðð".into());
+ }
+
fn read_rows(input: impl std::io::Read) -> Result, std::io::Error> {
read_input(input).map(|(rows, _)| rows)
}
@@ -503,11 +682,11 @@ mod tests {
let bad = read_rows(&b" foo"[..]);
assert!(bad.is_err());
- assert!(format!("{bad:?}").contains("1: Entry with no header"));
+ assert!(format!("{bad:?}").contains("line 1: Entry with no header"));
let bad2 = read_rows(&b"foo\n\n bar"[..]);
assert!(bad2.is_err());
- assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+ assert!(format!("{bad2:?}").contains("line 3: Entry with no header"));
}
#[test]
@@ -520,16 +699,31 @@ mod tests {
);
assert_eq!(
read_config(&b"!col foo"[..]).unwrap().static_columns,
- vec!["foo".to_owned()]
+ vec![Some("foo".to_owned())]
+ );
+ assert_eq!(
+ read_config(&b"!label foo:bar"[..])
+ .unwrap()
+ .substitute_labels["foo"],
+ "bar"
);
+ assert_eq!(read_config(&b"!mark foo:*"[..]).unwrap().mark["foo"], "*");
let bad_command = read_config(&b"!no such command"[..]);
assert!(bad_command.is_err());
- assert!(format!("{bad_command:?}").contains("Unknown command"));
+ assert!(format!("{bad_command:?}").contains("line 1: Unknown command"));
let bad_num = read_config(&b"!col_threshold foo"[..]);
assert!(bad_num.is_err());
- assert!(format!("{bad_num:?}").contains("Parse"));
+ assert!(format!("{bad_num:?}").contains("line 1: col_threshold must be numeric"));
+
+ let bad_sub = read_config(&b"!label foo"[..]);
+ assert!(bad_sub.is_err());
+ assert!(format!("{bad_sub:?}").contains("line 1: Annotation missing ':'"));
+
+ let bad_mark = read_config(&b"!mark foo"[..]);
+ assert!(bad_mark.is_err());
+ assert!(format!("{bad_mark:?}").contains("line 1: Mark missing ':'"));
}
#[test]
@@ -554,10 +748,43 @@ mod tests {
);
}
+ #[test]
+ fn test_column_header_labels() {
+ let mut cfg = Config::default();
+
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
+
+ cfg.static_columns.push(Some("bar".to_owned()));
+ assert!(column_header_labels(&cfg, &["foo".to_owned()])
+ .eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())]));
+
+ cfg.static_columns.push(None);
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
+ Some(&"bar".to_owned()),
+ None,
+ Some(&"foo".to_owned())
+ ]));
+
+ cfg.substitute_labels
+ .insert("foo".to_owned(), "foo (bits)".to_owned());
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
+ Some(&"bar".to_owned()),
+ None,
+ Some(&"foo (bits)".to_owned())
+ ]));
+
+ cfg.hidden_columns.insert("foo".to_owned());
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
+
+ cfg.hidden_columns.insert("bar".to_owned());
+ assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([None]));
+ }
+
#[test]
fn test_render_cell() {
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -565,11 +792,12 @@ mod tests {
}
),
HTML::from(
- r#" | "#
+ r#" | "#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -577,11 +805,12 @@ mod tests {
}
),
HTML::from(
- r#" | "#
+ r#" | "#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -589,11 +818,12 @@ mod tests {
}
),
HTML::from(
- r#" | "#
+ r#"ð· | "#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -601,11 +831,12 @@ mod tests {
}
),
HTML::from(
- r#"2 | "#
+ r#"ð·ð· | "#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -621,6 +852,7 @@ mod tests {
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "nope".to_owned(),
@@ -628,11 +860,25 @@ mod tests {
}
),
HTML::from(
- r#"5 â | "#
+ r#"5 ð· | "#
)
);
assert_eq!(
render_cell(
+ &Config::default(),
+ "foo",
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("Ã".to_owned())])]),
+ }
+ ),
+ HTML::from(
+ r#"Ã | "#
+ )
+ );
+ assert_eq!(
+ render_cell(
+ &Config::default(),
"heart",
&mut Row {
label: "nope".to_owned(),
@@ -645,6 +891,7 @@ mod tests {
);
assert_eq!(
render_cell(
+ &Config::default(),
"foo",
&mut Row {
label: "bob's".to_owned(),
@@ -652,9 +899,29 @@ mod tests {
}
),
HTML::from(
- r#" | "#
+ r#"ð· | "#
+ )
+ );
+ assert_eq!(
+ render_cell(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::from([("foo".to_owned(), "ð¦".to_owned())]),
+ },
+ "foo",
+ &mut Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ }
+ ),
+ HTML::from(
+ r#"ð¦ | "#
)
);
+
let mut r = Row {
label: "nope".to_owned(),
entries: HashMap::from([
@@ -663,42 +930,83 @@ mod tests {
]),
};
assert_eq!(r.entries.len(), 2);
- render_cell("foo", &mut r);
+ render_cell(&Config::default(), "foo", &mut r);
assert_eq!(r.entries.len(), 1);
- render_cell("bar", &mut r);
+ render_cell(&Config::default(), "bar", &mut r);
assert_eq!(r.entries.len(), 1);
- render_cell("baz", &mut r);
+ render_cell(&Config::default(), "baz", &mut r);
assert_eq!(r.entries.len(), 0);
}
#[test]
fn test_render_leftovers() {
assert_eq!(
- render_all_leftovers(&Row {
- label: "nope".to_owned(),
- entries: HashMap::from([("foo".to_owned(), vec![None])]),
- }),
+ render_all_leftovers(
+ &Config::default(),
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ }
+ ),
HTML::from("foo")
);
assert_eq!(
- render_all_leftovers(&Row {
- label: "nope".to_owned(),
- entries: HashMap::from([
- ("foo".to_owned(), vec![None]),
- ("bar".to_owned(), vec![None])
- ]),
- }),
+ render_all_leftovers(
+ &Config::default(),
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("bar".to_owned(), vec![None])
+ ]),
+ }
+ ),
HTML::from("bar, foo")
);
assert_eq!(
- render_all_leftovers(&Row {
- label: "nope".to_owned(),
- entries: HashMap::from([
- ("foo".to_owned(), vec![None]),
- ("bar".to_owned(), vec![None, None])
- ]),
- }),
- HTML::from("bar: 2, foo")
+ render_all_leftovers(
+ &Config::default(),
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("foo".to_owned(), vec![None]),
+ ("bar".to_owned(), vec![None, None])
+ ]),
+ }
+ ),
+ HTML::from(r#"bar: ð·ð·, foo"#)
+ );
+ assert_eq!(
+ render_all_leftovers(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::from(["private".to_owned()]),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
+ },
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("private".to_owned(), vec![None]),]),
+ }
+ ),
+ HTML::from("")
+ );
+ assert_eq!(
+ render_all_leftovers(
+ &Config {
+ column_threshold: 2,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::from([("foo".to_owned(), "ð".to_owned())]),
+ },
+ &Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
+ }
+ ),
+ HTML::from("foo: ðð")
);
}
@@ -706,10 +1014,7 @@ mod tests {
fn test_render_row() {
assert_eq!(
render_row(
- &Config {
- column_threshold: 0,
- static_columns: vec![],
- },
+ &Config::default(),
&["foo".to_owned()],
&mut Rowlike::Row(Row {
label: "nope".to_owned(),
@@ -717,7 +1022,7 @@ mod tests {
})
),
HTML::from(
- r#"| nope | | bar |
|---|
+ r#"| nope | | bar |
|---|
"#
)
);
@@ -725,7 +1030,10 @@ mod tests {
render_row(
&Config {
column_threshold: 0,
- static_columns: vec!["foo".to_owned(), "bar".to_owned()],
+ static_columns: vec![Some("foo".to_owned()), Some("bar".to_owned())],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
},
&["baz".to_owned()],
&mut Rowlike::Row(Row {
@@ -739,6 +1047,89 @@ mod tests {
),
HTML::from(
r#"| nope | f | r | z | |
|---|
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![Some("foo".to_owned()), None, Some("bar".to_owned())],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
+ },
+ &[],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([
+ ("bar".to_owned(), vec![Some("r".to_owned())]),
+ ("foo".to_owned(), vec![Some("f".to_owned())]),
+ ]),
+ })
+ ),
+ HTML::from(
+ r#"| nope | f | | r | |
|---|
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![],
+ hidden_columns: HashSet::from(["foo".to_owned()]),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
+ },
+ &[],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+ })
+ ),
+ HTML::from(
+ r#"| nope | |
|---|
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![Some("foo".to_owned())],
+ hidden_columns: HashSet::from(["foo".to_owned()]),
+ substitute_labels: HashMap::new(),
+ mark: HashMap::new(),
+ },
+ &[],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![Some("f".to_owned())]),]),
+ })
+ ),
+ HTML::from(
+ r#"| nope | |
|---|
+"#
+ )
+ );
+ assert_eq!(
+ render_row(
+ &Config {
+ column_threshold: 0,
+ static_columns: vec![],
+ hidden_columns: HashSet::new(),
+ substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
+ mark: HashMap::new(),
+ },
+ &["foo".to_owned()],
+ &mut Rowlike::Row(Row {
+ label: "nope".to_owned(),
+ entries: HashMap::from([("foo".to_owned(), vec![None])]),
+ })
+ ),
+ HTML::from(
+ r#"| nope | ð· | |
|---|
"#
)
);