Get config from read_input()

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index fbadb2a2bab44e937bf39f51b1a7836c85f32d81..5c994c9f20a0d8eeb63650d4d9618c6da6dc75dc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -170,8 +170,13 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 

-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Rowlike, std::io::Error>> {
+fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
+    let default_config = Config {
+        column_threshold: 2,
+    };

     Reader::new(std::io::BufReader::new(input).lines())
     Reader::new(std::io::BufReader::new(input).lines())

+        .collect::<Result<Vec<_>, _>>()
+        .map(|rows| (rows, default_config))

 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {


@@ -303,9 +308,9 @@ fn render_column_headers(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
 ///   * 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(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
-    let columns = column_order(config, &rows);
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+    let (rows, config) = read_input(input)?;
+    let columns = column_order(&config, &rows);

     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),


@@ -348,24 +353,27 @@ mod tests {
         );
     }
 
         );
     }
 

+    fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
+        read_input(input).map(|(rows, _)| rows)
+    }

     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(

-            read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo"[..]).unwrap(),

             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(

-            read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"bar"[..]).unwrap(),

             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "bar".to_owned(),
                 entries: HashMap::new(),
             })]
         );
         assert_eq!(

-            read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\nbar\n"[..]).unwrap(),

             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),


@@ -378,16 +386,14 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(

-            read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n"[..]).unwrap(),

             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
         assert_eq!(

-            read_rows(&b"foo\n bar\n baz\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n bar\n baz\n"[..]).unwrap(),

             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([


@@ -397,9 +403,7 @@ mod tests {
             })]
         );
         assert_eq!(
             })]
         );
         assert_eq!(

-            read_rows(&b"foo\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\nbar\n"[..]).unwrap(),

             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),


@@ -412,9 +416,7 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(

-            read_rows(&b"foo\n\n\nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n\n\nbar\n"[..]).unwrap(),

             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),


@@ -428,9 +430,7 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(

-            read_rows(&b"foo\n \nbar\n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo\n \nbar\n"[..]).unwrap(),

             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),
             vec![
                 Rowlike::Row(Row {
                     label: "foo".to_owned(),


@@ -443,20 +443,18 @@ mod tests {
             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(

-            read_rows(&b"foo  \n bar  \n"[..])
-                .flatten()
-                .collect::<Vec<_>>(),
+            read_rows(&b"foo  \n bar  \n"[..]).unwrap(),

             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
 
             vec![Rowlike::Row(Row {
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
             })]
         );
 

-        let bad = read_rows(&b" foo"[..]).next().unwrap();
+        let bad = read_rows(&b" foo"[..]);

         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 
         assert!(bad.is_err());
         assert!(format!("{bad:?}").contains("1: Entry with no header"));
 

-        let bad2 = read_rows(&b"foo\n\n bar"[..]).nth(1).unwrap();
+        let bad2 = read_rows(&b"foo\n\n bar"[..]);

         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }
         assert!(bad2.is_err());
         assert!(format!("{bad2:?}").contains("3: Entry with no header"));
     }


@@ -464,34 +462,20 @@ mod tests {
     #[test]
     fn test_column_counts() {
         assert_eq!(
     #[test]
     fn test_column_counts() {
         assert_eq!(

-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\n"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\n"[..]).unwrap()),

             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(
             vec![(1, String::from("bar")), (1, String::from("baz"))]
         );
         assert_eq!(

-            column_counts(
-                &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..])
-                    .collect::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n baz\nquux\n baz"[..]).unwrap()),

             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             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::<Result<Vec<_>, _>>()
-                    .unwrap()
-            ),
+            column_counts(&read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..]).unwrap()),

             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
         assert_eq!(
             column_counts(
             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::<Result<Vec<_>, _>>()
-                    .unwrap()
+                &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..]).unwrap()

             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );
             ),
             vec![(2, String::from("baz")), (1, String::from("bar"))]
         );