Reorganize

src/main.rs

@@ -5,26 +5,17 @@ extern crate lazy_static;
 extern crate regex;
 extern crate uuid;
 
-use std::env;
-use std::fs;
-use std::path;
+use std::{env, fs};
 
 use clap::{App, Arg};
 
-use post::parse_post;
+use post::{parse_post, read_posts_dir};
 use write::{write_post, write_post_listing};
 
 mod post;
 mod render;
 mod write;
 
-fn read_posts_dir(cwd: &path::PathBuf) -> fs::ReadDir {
-    match fs::read_dir(cwd) {
-        Ok(posts) => posts,
-        Err(err) => panic!(err),
-    }
-}
-
 fn build() {
     let cwd = env::current_dir().expect("Couldn't read current directory");
 

src/post.rs

@@ -10,6 +10,13 @@ pub struct Post {
     pub slug: String,
 }
 
+pub fn read_posts_dir(cwd: &path::PathBuf) -> fs::ReadDir {
+    match fs::read_dir(cwd) {
+        Ok(posts) => posts,
+        Err(err) => panic!(err),
+    }
+}
+
 pub fn parse_post(path: path::PathBuf) -> Post {
     let contents = fs::read_to_string(&path).expect("Couldn't read post file");
 
@@ -34,10 +41,56 @@ mod tests {
     #[allow(unused_imports)]
     use super::*;
     #[allow(unused_imports)]
-    use std::{env, fs};
+    #[allow(unused_imports)]
+    use std::{env, fs, path};
     #[allow(unused_imports)]
     use uuid::Uuid;
 
+    #[test]
+    fn test_read_posts_dir() {
+        let temp_dir = env::temp_dir();
+        let working_dir = temp_dir.join(&Uuid::new_v4().to_string());
+        fs::create_dir(&working_dir).unwrap();
+        env::set_current_dir(&working_dir).unwrap();
+
+        let cwd = env::current_dir().unwrap();
+        fs::create_dir(cwd.join("posts")).unwrap();
+
+        let post_body = "# This is a post\n\nHere is some content that goes in the post";
+
+        let mut uuids: Vec<String> = vec![];
+
+        for _ in 1..11 {
+            let uuid = String::from(Uuid::new_v4().to_string());
+            uuids.push(uuid.clone());
+            fs::write(
+                cwd.join("posts").join(format!("{}.md", &uuid)),
+                &String::from(post_body),
+            ).unwrap();
+        }
+
+        let mut expected_paths: Vec<String> = uuids
+            .into_iter()
+            .map(|uuid| {
+                String::from(
+                    cwd.join("posts")
+                        .join(format!("{}.md", uuid))
+                        .to_str()
+                        .unwrap(),
+                )
+            }).collect();
+        expected_paths.sort();
+        let mut actual_paths: Vec<String> = read_posts_dir(&cwd.join("posts"))
+            .into_iter()
+            .map(|dir_entry| String::from(dir_entry.unwrap().path().to_str().unwrap()))
+            .collect();
+        actual_paths.sort();
+
+        assert_eq!(expected_paths, actual_paths);
+
+        fs::remove_dir_all(temp_dir.join(&working_dir)).unwrap();
+    }
+
     #[test]
     fn test_parse_post() {
         let temp_dir = env::temp_dir();