X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/4b99fb70fa61addf2373a460d6d5c7fe82e19f5a..e8657dffc83621d84240320f5389b81ab8204c78:/src/lib.rs?ds=inline
diff --git a/src/lib.rs b/src/lib.rs
index 8d60eb8..bebbcf7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,10 +2,60 @@ 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: String,
+}
+impl From<&str> for Entry {
+ fn from(value: &str) -> Entry {
+ Entry {
+ col: String::from(value),
+ instance: String::from(""),
+ }
+ }
+}
+
#[derive(Debug, PartialEq, Eq)]
struct RowInput {
label: String,
- entries: Vec,
+ entries: Vec,
}
struct Reader>> {
@@ -42,7 +92,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);
@@ -68,7 +118,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
.iter()
.flat_map(|r| r.entries.iter().collect::>().into_iter())
.fold(HashMap::new(), |mut cs, e| {
- cs.entry(String::from(e))
+ cs.entry(String::from(&e.col))
.and_modify(|n| *n += 1)
.or_insert(1);
cs
@@ -89,7 +139,7 @@ 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)]
@@ -129,7 +179,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 +188,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 +227,7 @@ mod tests {
.collect::>(),
vec![RowInput {
label: String::from("foo"),
- entries: vec![String::from("bar")]
+ entries: vec![Entry::from("bar")]
}]
);