Fix cobalt-org#241

Author: Geobert Quach

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

Cargo.lock

@@ -43,6 +43,7 @@ serde = "1.0"
 serde_yaml = "0.7"
 serde_json = "1.0"
 toml = "0.4.0"
+normalize-line-endings = "0.2.2"
 
 [dependencies.sass-rs]
 version = "0.2.0"

Cargo.toml

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::default::Default;
 use std::path::{Path, PathBuf};
+use std::iter::FromIterator;
 
 use chrono::{Datelike, Timelike};
 use itertools;
@@ -12,6 +13,7 @@ use pulldown_cmark as cmark;
 use regex::Regex;
 use rss;
 use serde_yaml;
+use normalize_line_endings::normalized;
 
 use error::*;
 use cobalt_model::files;
@@ -198,6 +200,7 @@ impl Document {
                  -> Result<Document> {
         trace!("Parsing {:?}", rel_path);
         let content = files::read_file(src_path)?;
+        let content = String::from_iter(normalized(content.chars()));
         let builder = legacy_model::DocumentBuilder::parse(&content)?;
         let builder: cobalt_model::DocumentBuilder<cobalt_model::FrontmatterBuilder> = builder
             .into();

src/document.rs

@@ -84,6 +84,8 @@ extern crate lazy_static;
 #[macro_use]
 extern crate serde;
 
+extern crate normalize_line_endings;
+
 pub use cobalt::build;
 pub use error::Error;
 pub use cobalt_model::Config;

src/lib.rs

@@ -5,15 +5,18 @@ extern crate cobalt;
 extern crate error_chain;
 extern crate tempdir;
 extern crate walkdir;
+extern crate normalize_line_endings;
 
 use std::error::Error;
 use std::fs::{self, File};
 use std::io::Read;
 use std::path::{Path, PathBuf};
+use std::iter::FromIterator;
 
 use error_chain::ChainedError;
 use tempdir::TempDir;
 use walkdir::WalkDir;
+use normalize_line_endings::normalized;
 
 macro_rules! assert_contains {
     ($haystack: expr, $needle: expr) => {
@@ -50,6 +53,9 @@ fn assert_dirs_eq(expected: &Path, actual: &Path) {
             .read_to_string(&mut created)
             .expect("Could not read to string");
 
+        let original = String::from_iter(normalized(original.chars()));
+        let created = String::from_iter(normalized(created.chars()));
+
         assert_diff!(&original, &created, " ", 0);
     }