chore: Simplify the non-draft code ... I think

src/cobalt.rs

@@ -74,17 +74,11 @@ pub fn build(config: &Config) -> Result<()> {
                         template_extensions
                             .contains(&p.extension().unwrap_or_else(|| OsStr::new("")))
                     }) {
-        let src_path = source.join(file_path.as_path());
-
-        let new_path = source.join(file_path);
-        let new_path = new_path
-            .strip_prefix(source)
-            .expect("Entry not in source folder");
-
         // if the document is in the posts folder it's considered a post
+        let src_path = source.join(file_path.as_path());
         let is_post = src_path.starts_with(posts_path.as_path());
 
-        let doc = Document::parse(src_path.as_path(), new_path, is_post, &config.post_path)?;
+        let doc = Document::parse(source, &file_path, &file_path, is_post, &config.post_path)?;
         if !doc.is_draft || config.include_drafts {
             documents.push(doc);
         }
@@ -103,13 +97,12 @@ pub fn build(config: &Config) -> Result<()> {
                             template_extensions
                                 .contains(&p.extension().unwrap_or_else(|| OsStr::new("")))
                         }) {
-            let src_path = drafts_root.join(file_path.as_path());
-
-            let new_path = posts_path.join(file_path);
+            let new_path = posts_path.join(&file_path);
             let new_path = new_path
                 .strip_prefix(source)
                 .expect("Entry not in source folder");
-            let doc = try!(Document::parse(src_path.as_path(), new_path, true, &config.post_path));
+            let doc =
+                try!(Document::parse(&drafts_root, &file_path, new_path, true, &config.post_path));
             documents.push(doc);
         }
     }

src/document.rs

@@ -31,6 +31,21 @@ lazy_static!{
     static ref MARKDOWN_REF: Regex = Regex::new(r"(?m:^ {0,3}\[[^\]]+\]:.+$)").unwrap();
 }
 
+fn read_file<P: AsRef<Path>>(path: P) -> Result<String> {
+    let mut file = File::open(path.as_ref())?;
+    let mut text = String::new();
+    file.read_to_string(&mut text)?;
+    Ok(text)
+}
+
+fn read_document<PB: Into<PathBuf>, P: AsRef<Path>>(root: PB, relpath: P) -> Result<String> {
+    let path = root.into().join(relpath);
+    let mut file = File::open(path)?;
+    let mut text = String::new();
+    file.read_to_string(&mut text)?;
+    Ok(text)
+}
+
 fn split_document(content: &str) -> Result<(Option<&str>, &str)> {
     if FRONT_MATTER_DIVIDE.is_match(content) {
         let mut splits = FRONT_MATTER_DIVIDE.splitn(content, 2);
@@ -47,13 +62,6 @@ fn split_document(content: &str) -> Result<(Option<&str>, &str)> {
     }
 }
 
-fn read_file<P: AsRef<Path>>(path: P) -> Result<String> {
-    let mut file = try!(File::open(path));
-    let mut text = String::new();
-    try!(file.read_to_string(&mut text));
-    Ok(text)
-}
-
 fn yaml_to_liquid(yaml: &Yaml) -> Option<Value> {
     match *yaml {
         Yaml::Real(ref s) |
@@ -159,15 +167,16 @@ impl Document {
         }
     }
 
-    pub fn parse(file_path: &Path,
-                 new_path: &Path,
+    pub fn parse(root_path: &Path,
+                 source_file: &Path,
+                 dest_file: &Path,
                  mut is_post: bool,
                  post_path: &Option<String>)
                  -> Result<Document> {
-        let mut attributes: HashMap<String, Value> = HashMap::new();
-        let content = try!(read_file(file_path));
+        let content = read_document(root_path, source_file)?;
         let (front, content) = split_document(&content)?;
 
+        let mut attributes: HashMap<String, Value> = HashMap::new();
         // if there is front matter, split the file and parse it
         if let Some(front) = front {
             let yaml_result = try!(YamlLoader::load_from_str(front));
@@ -177,7 +186,7 @@ impl Document {
                              .as_hash()
                              .ok_or_else(|| {
                                              format!("Incorrect front matter format in {:?}",
-                                                     file_path)
+                                                     source_file)
                                          }));
 
                 for (key, value) in yaml_attributes {
@@ -209,7 +218,7 @@ impl Document {
             .and_then(|d| d.as_str())
             .and_then(datetime::DateTime::parse);
 
-        let file_stem = file_stem(new_path);
+        let file_stem = file_stem(dest_file);
         let slug = slug::slugify(&file_stem);
         attributes
             .entry("title".to_owned())
@@ -223,7 +232,7 @@ impl Document {
             *attributes
                  .entry("ext".to_owned())
                  .or_insert_with(|| {
-                                     Value::Str(new_path
+                                     Value::Str(dest_file
                                                     .extension()
                                                     .and_then(|os| os.to_str())
                                                     .unwrap_or("")
@@ -237,7 +246,7 @@ impl Document {
             .and_then(|l| l.as_str())
             .map(|x| x.to_owned());
 
-        let mut path_buf = PathBuf::from(new_path);
+        let mut path_buf = PathBuf::from(dest_file);
         path_buf.set_extension("html");
 
         // if the user specified a custom path override
@@ -270,7 +279,7 @@ impl Document {
                          is_post,
                          is_draft,
                          date,
-                         file_path.to_string_lossy().into_owned(),
+                         dest_file.to_string_lossy().into_owned(),
                          markdown))
     }
 

tests/mod.rs

@@ -172,7 +172,7 @@ pub fn no_extends_error() {
     assert!(err.unwrap_err()
                 .description()
                 .contains("Layout default_nonexistent.liquid can not be read (defined in \
-                   tests/fixtures/no_extends_error/index.liquid)"));
+                   index.liquid)"));
 }
 
 #[test]