From: Scott Worley Date: Sat, 5 Oct 2024 02:22:28 +0000 (-0700) Subject: Plumb config into render_cell() X-Git-Tag: v0.5.1~2 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/ba61b04b47e497f8519eed53c78864c08bfc8669?hp=d1d16f97ea7aad7e7006bda3bd39de79fe63ae33 Plumb config into render_cell() --- diff --git a/src/lib.rs b/src/lib.rs index d85de02..70dfb52 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -311,7 +311,7 @@ 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 instances: Option<&Vec>> = row.entries.get(col); @@ -370,14 +370,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 +690,7 @@ mod tests { fn test_render_cell() { assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -702,6 +703,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -714,6 +716,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -726,6 +729,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -738,6 +742,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -753,6 +758,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -765,6 +771,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "nope".to_owned(), @@ -777,6 +784,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "heart", &mut Row { label: "nope".to_owned(), @@ -789,6 +797,7 @@ mod tests { ); assert_eq!( render_cell( + &Config::default(), "foo", &mut Row { label: "bob's".to_owned(), @@ -807,11 +816,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); }