X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/b59ad4335c434a858a991137445fd34aaa4c6b21..61a7497779d8e9a7d7b73a53c55d252177d68e1c:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index d85de02..c1a4761 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -311,9 +311,14 @@ fn render_instances(instances: &[Option]) -> HTML { ) } -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 is_empty = match instances { None => true, @@ -370,14 +375,14 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM .iter() .map(|ocol| match ocol { Some(col) if config.hidden_columns.contains(col) => HTML::from(""), - Some(col) => render_cell(col, row), + Some(col) => render_cell(config, col, row), None => HTML::from(r#""#), }) .collect::(); let dynamic_cells = columns .iter() .filter(|&col| !config.hidden_columns.contains(col)) - .map(|col| render_cell(col, row)) + .map(|col| render_cell(config, col, row)) .collect::(); let leftovers = render_all_leftovers(config, row); HTML(format!( @@ -690,6 +695,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -702,6 +708,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -714,6 +721,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -726,6 +734,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -738,6 +747,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -753,6 +763,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -765,6 +776,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -777,6 +789,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -789,6 +802,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -807,11 +821,11 @@ 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); } @@ -966,6 +980,25 @@ mod tests { ), 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())]), + }, + &["foo".to_owned()], + &mut Rowlike::Row(Row { + label: "nope".to_owned(), + entries: HashMap::from([("foo".to_owned(), vec![None])]), + }) + ), + HTML::from( + r#"nope𝍷 "# ) );