X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/8110b492cfa41fd99bfb639d7491b4e075fa9385..b89077705f91d010ac22f3f4cabe5336257a0758:/src/lib.rs?ds=sidebyside
diff --git a/src/lib.rs b/src/lib.rs
index 56a2b6d..01668eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,12 +1,67 @@
-#[cfg(test)]
+use std::collections::{HashMap, HashSet};
use std::io::BufRead;
-#[cfg(test)]
use std::iter::Iterator;
+const HEADER: &str = "
+
+
+
+
+
+
+
+
+
+ ";
+const FOOTER: &str = "
+
+
+";
+
+#[derive(Debug, PartialEq, Eq, Hash)]
+struct Entry {
+ col: String,
+ instance: Option,
+}
+impl From<&str> for Entry {
+ fn from(value: &str) -> Entry {
+ match value.split_once(':') {
+ None => Entry {
+ col: String::from(value),
+ instance: None,
+ },
+ Some((col, instance)) => Entry {
+ col: String::from(col),
+ instance: Some(String::from(instance)),
+ },
+ }
+ }
+}
+
#[derive(Debug, PartialEq, Eq)]
struct RowInput {
label: String,
- entries: Vec,
+ entries: Vec,
}
struct Reader>> {
@@ -14,7 +69,6 @@ struct Reader>> {
row: Option,
}
impl>> Reader {
- #[cfg(test)]
fn new(input: Input) -> Self {
Self {
input: input.enumerate(),
@@ -44,7 +98,7 @@ impl>> Iterator for Reader
n + 1
))))
}
- Some(ref mut row) => row.entries.push(String::from(line.trim())),
+ Some(ref mut row) => row.entries.push(Entry::from(line.trim())),
},
Some((_, Ok(line))) => {
let prev = std::mem::take(&mut self.row);
@@ -61,19 +115,67 @@ impl>> Iterator for Reader
}
}
-#[cfg(test)]
fn read_rows(input: impl std::io::Read) -> impl Iterator- > {
Reader::new(std::io::BufReader::new(input).lines())
}
-pub fn tablify(_input: &impl std::io::Read) -> String {
- String::from("Hello, world!")
+fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
+ let mut counts: Vec<_> = rows
+ .iter()
+ .flat_map(|r| {
+ r.entries
+ .iter()
+ .map(|e| &e.col)
+ .collect::>()
+ .into_iter()
+ })
+ .fold(HashMap::new(), |mut cs, col| {
+ cs.entry(String::from(col))
+ .and_modify(|n| *n += 1)
+ .or_insert(1);
+ cs
+ })
+ .into_iter()
+ .map(|(col, n)| (n, col))
+ .collect();
+ counts.sort();
+ counts
+}
+
+/// # Errors
+///
+/// Will return `Err` if
+/// * 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 {
+ let rows = read_rows(input).collect::, _>>()?;
+ let _columns = column_counts(&rows);
+ Ok(String::from(HEADER) + "Hello, world!" + FOOTER)
}
#[cfg(test)]
mod tests {
use super::*;
+ #[test]
+ fn test_parse_entry() {
+ assert_eq!(
+ Entry::from("foo"),
+ Entry {
+ col: String::from("foo"),
+ instance: None
+ }
+ );
+ assert_eq!(
+ Entry::from("foo:bar"),
+ Entry {
+ col: String::from("foo"),
+ instance: Some(String::from("bar"))
+ }
+ );
+ }
+
#[test]
fn test_read_rows() {
assert_eq!(
@@ -107,7 +209,7 @@ mod tests {
read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);
assert_eq!(
@@ -116,7 +218,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar"), String::from("baz")]
+ entries: vec![Entry::from("bar"), Entry::from("baz")]
}]
);
assert_eq!(
@@ -155,7 +257,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);
@@ -167,4 +269,40 @@ mod tests {
assert!(bad2.is_err());
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::, _>>()
+ .unwrap()
+ ),
+ 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::, _>>()
+ .unwrap()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar\n bar\n baz\n bar\nquux\n baz"[..])
+ .collect::, _>>()
+ .unwrap()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
+ assert_eq!(
+ column_counts(
+ &read_rows(&b"foo\n bar: 1\n bar: 2\n baz\n bar\nquux\n baz"[..])
+ .collect::, _>>()
+ .unwrap()
+ ),
+ vec![(1, String::from("bar")), (2, String::from("baz"))]
+ );
+ }
}