Merge pull request #60 from LucioFranco/master

Fix for copy files bug
cobalt-org · Mar 17, 2016 · 2b1d499 · 2b1d499
2 parents 2a5f416 + c0e3658
commit 2b1d499
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 3 deletions.
diff --git a/src/cobalt.rs b/src/cobalt.rs
@@ -45,9 +45,9 @@ pub fn build(config: &Config) -> Result<()> {
     let dest = dest.as_path();
 
     let template_extensions: Vec<&OsStr> = config.template_extensions
-                                                .iter()
-                                                .map(OsStr::new)
-                                                .collect();
+                                                 .iter()
+                                                 .map(OsStr::new)
+                                                 .collect();
 
     let layouts_path = source.join(&config.layouts);
     let posts_path = source.join(&config.posts);
@@ -141,6 +141,11 @@ pub fn build(config: &Config) -> Result<()> {
                 try!(fs::create_dir_all(&dest.join(relative)));
                 debug!("Created new directory {:?}", dest.join(relative));
             } else {
+                let parent_folder_path = dest.clone()
+                                             .join(Path::new(relative).parent().unwrap());
+
+                try!(fs::create_dir_all(&parent_folder_path));
+
                 try!(fs::copy(entry.path(), &dest.join(relative))
                          .map_err(|_| format!("Could not copy {:?}", entry.path())));
                 debug!("Copied {:?} to {:?}", entry.path(), dest.join(relative));

diff --git a/tests/fixtures/copy_files/_layouts/default.tpl b/tests/fixtures/copy_files/_layouts/default.tpl
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>test</title>
+    </head>
+    <body>
+        <h1>{{ name }}</h1>
+
+        {{ content }}
+    </body>
+</html>
+
diff --git a/tests/fixtures/copy_files/_layouts/posts.tpl b/tests/fixtures/copy_files/_layouts/posts.tpl
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>My blog - {{ title }}</title>
+    </head>
+    <body>
+        {{ content }}
+    </body>
+</html>
+
diff --git a/tests/fixtures/copy_files/_posts/2014-08-24-my-first-blogpost.md b/tests/fixtures/copy_files/_posts/2014-08-24-my-first-blogpost.md
@@ -0,0 +1,10 @@
+extends: posts.tpl
+
+title:   My first Blogpost
+date:    24/08/2014 at 15:36
+---
+# {{ title }}
+
+Hey there this is my first blogpost and this is super awesome.
+
+My Blog is lorem ipsum like, yes it is..
diff --git a/tests/fixtures/copy_files/index.liquid b/tests/fixtures/copy_files/index.liquid
@@ -0,0 +1,7 @@
+extends: default.tpl
+---
+This is my Index page!
+
+{% for post in posts %}
+ <a href="{{post.path}}">{{ post.title }}</a>
+{% endfor %}
diff --git a/tests/fixtures/copy_files/some.js b/tests/fixtures/copy_files/some.js
@@ -0,0 +1 @@
+var test = require('test');
diff --git a/tests/fixtures/copy_files/style/blog.css b/tests/fixtures/copy_files/style/blog.css
@@ -0,0 +1,3 @@
+.body {
+	width: 30px;
+}
diff --git a/tests/mod.rs b/tests/mod.rs
@@ -93,6 +93,11 @@ pub fn rss() {
     run_test("rss").expect("Build error");
 }
 
+#[test]
+pub fn copy_files() {
+    run_test("copy_files").unwrap();
+}
+
 #[test]
 pub fn yaml_error() {
     let err = run_test("yaml_error");

diff --git a/tests/target/copy_files/_posts/2014-08-24-my-first-blogpost.html b/tests/target/copy_files/_posts/2014-08-24-my-first-blogpost.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>My blog - My first Blogpost</title>
+    </head>
+    <body>
+        <h1 id='my_first_blogpost'>My first Blogpost</h1>
+
+<p>Hey there this is my first blogpost and this is super awesome.</p>
+
+<p>My Blog is lorem ipsum like, yes it is..</p>
+
+    </body>
+</html>
+
diff --git a/tests/target/copy_files/index.html b/tests/target/copy_files/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>test</title>
+    </head>
+    <body>
+        <h1>index</h1>
+
+
+This is my Index page!
+
+
+ <a href="_posts/2014-08-24-my-first-blogpost.html">My first Blogpost</a>
+
+
+    </body>
+</html>
+
diff --git a/tests/target/copy_files/some.js b/tests/target/copy_files/some.js
@@ -0,0 +1 @@
+var test = require('test');
diff --git a/tests/target/copy_files/style/blog.css b/tests/target/copy_files/style/blog.css
@@ -0,0 +1,3 @@
+.body {
+	width: 30px;
+}