Column counts

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index b583c3eefb0b3e3f1ea74f0aae24556b711865a1..e90f66b37f2359542bad445064f86ea1ee2ec6ad 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,6 @@
 #[cfg(test)]
 #[cfg(test)]

+use std::collections::HashMap;
+#[cfg(test)]

 use std::io::BufRead;
 #[cfg(test)]
 use std::iter::Iterator;
 use std::io::BufRead;
 #[cfg(test)]
 use std::iter::Iterator;


@@ -10,31 +12,43 @@ struct RowInput {
 }
 
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
 }
 
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {

-    input: Input,
+    input: std::iter::Enumerate<Input>,

     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     #[cfg(test)]
     fn new(input: Input) -> Self {
     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     #[cfg(test)]
     fn new(input: Input) -> Self {

-        Self { input, row: None }
+        Self {
+            input: input.enumerate(),
+            row: None,
+        }

     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
     type Item = Result<RowInput, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
     type Item = Result<RowInput, std::io::Error>;
     fn next(&mut self) -> Option<Self::Item> {
         loop {

-            match self.input.next() {
+            match self
+                .input
+                .next()
+                .map(|(n, r)| (n, r.map(|line| String::from(line.trim_end()))))
+            {

                 None => return Ok(std::mem::take(&mut self.row)).transpose(),
                 None => return Ok(std::mem::take(&mut self.row)).transpose(),

-                Some(Err(e)) => return Some(Err(e)),
-                Some(Ok(line)) if line.is_empty() && self.row.is_some() => {
+                Some((_, Err(e))) => return Some(Err(e)),
+                Some((_, Ok(line))) if line.is_empty() && self.row.is_some() => {

                     return Ok(std::mem::take(&mut self.row)).transpose()
                 }
                     return Ok(std::mem::take(&mut self.row)).transpose()
                 }

-                Some(Ok(line)) if line.is_empty() => {}
-                Some(Ok(line)) if line.starts_with(' ') => match &mut self.row {
-                    None => return Some(Err(std::io::Error::other("Entry with no header"))),
+                Some((_, Ok(line))) if line.is_empty() => {}
+                Some((n, Ok(line))) if line.starts_with(' ') => match &mut self.row {
+                    None => {
+                        return Some(Err(std::io::Error::other(format!(
+                            "{}: Entry with no header",
+                            n + 1
+                        ))))
+                    }

                     Some(ref mut row) => row.entries.push(String::from(line.trim())),
                 },
                     Some(ref mut row) => row.entries.push(String::from(line.trim())),
                 },

-                Some(Ok(line)) => {
+                Some((_, Ok(line))) => {

                     let prev = std::mem::take(&mut self.row);
                     self.row = Some(RowInput {
                         label: line,
                     let prev = std::mem::take(&mut self.row);
                     self.row = Some(RowInput {
                         label: line,


@@ -54,6 +68,19 @@ fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput,
     Reader::new(std::io::BufReader::new(input).lines())
 }
 
     Reader::new(std::io::BufReader::new(input).lines())
 }
 

+#[cfg(test)]
+fn column_counts(rows: &[RowInput]) -> HashMap<String, usize> {
+    rows.iter()
+        .flat_map(|r| r.entries.iter())
+        .fold(HashMap::new(), |mut counts, e| {
+            counts
+                .entry(String::from(e))
+                .and_modify(|c| *c += 1)
+                .or_insert(1);
+            counts
+        })
+}
+

 pub fn tablify(_input: &impl std::io::Read) -> String {
     String::from("Hello, world!")
 }
 pub fn tablify(_input: &impl std::io::Read) -> String {
     String::from("Hello, world!")
 }


@@ -122,13 +149,57 @@ mod tests {
                 }
             ]
         );
                 }
             ]
         );

+        assert_eq!(
+            read_rows(&b"foo\n \nbar\n"[..])
+                .flatten()
+                .collect::<Vec<_>>(),
+            vec![
+                RowInput {
+                    label: String::from("foo"),
+                    entries: vec![]
+                },
+                RowInput {
+                    label: String::from("bar"),
+                    entries: vec![]
+                }
+            ]
+        );
+        assert_eq!(
+            read_rows(&b"foo  \n bar  \n"[..])
+                .flatten()
+                .collect::<Vec<_>>(),
+            vec![RowInput {
+                label: String::from("foo"),
+                entries: vec![String::from("bar")]
+            }]
+        );

 
         let bad = read_rows(&b" foo"[..]).next().unwrap();
         assert!(bad.is_err());
 
         let bad = read_rows(&b" foo"[..]).next().unwrap();
         assert!(bad.is_err());

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

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

-        assert!(format!("{bad2:?}").contains("Entry with no header"));
+        assert!(format!("{bad2:?}").contains("3: Entry with no header"));
+    }
+
+    #[test]
+    fn test_column_counts() {
+        assert_eq!(
+            column_counts(
+                &read_rows(&b"foo\n bar\n baz\n"[..])
+                    .collect::<Result<Vec<_>, _>>()
+                    .unwrap()
+            ),
+            HashMap::from([(String::from("bar"), 1), (String::from("baz"), 1)])
+        );
+        assert_eq!(
+            column_counts(
+                &read_rows(&b"foo\n bar\n baz\nquux\n baz"[..])
+                    .collect::<Result<Vec<_>, _>>()
+                    .unwrap()
+            ),
+            HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)])
+        );

     }
 }
     }
 }