X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/4b99fb70fa61addf2373a460d6d5c7fe82e19f5a..b89077705f91d010ac22f3f4cabe5336257a0758:/src/lib.rs?ds=sidebyside
diff --git a/src/lib.rs b/src/lib.rs
index 8d60eb8..01668eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,10 +2,66 @@ use std::collections::{HashMap, HashSet};
use std::io::BufRead;
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>> {
@@ -42,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);
@@ -66,9 +122,15 @@ fn read_rows(input: impl std::io::Read) -> impl Iterator- Vec<(usize, String)> {
let mut counts: Vec<_> = rows
.iter()
- .flat_map(|r| r.entries.iter().collect::>().into_iter())
- .fold(HashMap::new(), |mut cs, e| {
- cs.entry(String::from(e))
+ .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
@@ -89,13 +151,31 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
pub fn tablify(input: impl std::io::Read) -> Result {
let rows = read_rows(input).collect::, _>>()?;
let _columns = column_counts(&rows);
- Ok(String::from("Hello, world!"))
+ 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!(
@@ -129,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!(
@@ -138,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!(
@@ -177,7 +257,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);
@@ -216,5 +296,13 @@ mod tests {
),
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"))]
+ );
}
}