Introduce pages, move posts under /posts

Currently pages reuse the post template, which isn't ideal but that will
change soon.

src/commands.rs

@@ -8,7 +8,7 @@ use toml::Value;
 
 use config::Config;
 use post::{parse_post, read_posts_dir};
-use write::{write_post, write_post_listing};
+use write::{write_page, write_post, write_post_listing};
 
 pub fn build(include_drafts: bool) {
     let cwd = env::current_dir().expect("Couldn't read current directory");
@@ -32,6 +32,7 @@ pub fn build(include_drafts: bool) {
     }
 
     fs::create_dir(cwd.join("public")).expect("Couldn't create public directory");
+    fs::create_dir(cwd.join("public").join("posts")).expect("Couldn't create posts directory");
 
     let layout_template = fs::read_to_string(&cwd.join("templates").join("layout.html"))
         .expect("Couldn't find layout template");
@@ -52,6 +53,8 @@ pub fn build(include_drafts: bool) {
         false => read_posts_dir(&cwd.join("posts")),
     };
 
+    let page_paths = read_posts_dir(&cwd.join("pages"));
+
     let posts = post_paths
         .into_iter()
         .map(|entry| {
@@ -61,6 +64,11 @@ pub fn build(include_drafts: bool) {
         })
         .collect();
 
+    for entry in page_paths.into_iter() {
+        let post = parse_post(entry.path());
+        write_page(&cwd, &layout_template, &post_template, &post, &config);
+    }
+
     write_post_listing(
         &cwd,
         &layout_template,
@@ -89,7 +97,15 @@ pub fn new(name: &str) {
     )
     .expect("Could not create casaubon.toml");
 
-    for dir in &["drafts", "posts", "public", "templates", "css", "js"] {
+    for dir in &[
+        "drafts",
+        "posts",
+        "pages",
+        "public",
+        "templates",
+        "css",
+        "js",
+    ] {
         fs::create_dir(&project_path.join(&dir))
             .expect(&format!("Couldn't create {} directory", &dir));
     }
@@ -209,7 +225,9 @@ mod tests {
         env::set_current_dir(&project_dir).unwrap();
 
         fs::create_dir(project_dir.join("posts")).unwrap();
+        fs::create_dir(project_dir.join("pages")).unwrap();
         fs::create_dir(project_dir.join("public")).unwrap();
+        fs::create_dir(project_dir.join("public").join("posts")).unwrap();
         fs::create_dir(project_dir.join("templates")).unwrap();
         fs::create_dir(project_dir.join("css")).unwrap();
         fs::create_dir(project_dir.join("js")).unwrap();
@@ -249,7 +267,11 @@ mod tests {
             "# First post\n\nThis is the first post\n\nIt has multiple paragraphs",
         )
         .unwrap();
-        fs::write(project_dir.join("casaubon.toml"), "site_name = \"Test Site\"").unwrap();
+        fs::write(
+            project_dir.join("casaubon.toml"),
+            "site_name = \"Test Site\"",
+        )
+        .unwrap();
 
         build(false);
 
@@ -266,6 +288,7 @@ mod tests {
             fs::read_to_string(
                 project_dir
                     .join("public")
+                    .join("posts")
                     .join("first-post")
                     .join("index.html")
             )
@@ -296,7 +319,9 @@ mod tests {
 
         fs::create_dir(project_dir.join("drafts")).unwrap();
         fs::create_dir(project_dir.join("posts")).unwrap();
+        fs::create_dir(project_dir.join("pages")).unwrap();
         fs::create_dir(project_dir.join("public")).unwrap();
+        fs::create_dir(project_dir.join("public").join("posts")).unwrap();
         fs::create_dir(project_dir.join("templates")).unwrap();
         fs::create_dir(project_dir.join("css")).unwrap();
         fs::create_dir(project_dir.join("js")).unwrap();
@@ -341,7 +366,11 @@ mod tests {
             "# First draft\n\nThis is the first draft",
         )
         .unwrap();
-        fs::write(project_dir.join("casaubon.toml"), "site_name = \"Test Site\"").unwrap();
+        fs::write(
+            project_dir.join("casaubon.toml"),
+            "site_name = \"Test Site\"",
+        )
+        .unwrap();
 
         build(true);
 
@@ -355,6 +384,7 @@ mod tests {
             fs::read_to_string(
                 project_dir
                     .join("public")
+                    .join("posts")
                     .join("first-post")
                     .join("index.html")
             ).unwrap()
@@ -366,6 +396,7 @@ mod tests {
             fs::read_to_string(
                 project_dir
                     .join("public")
+                    .join("posts")
                     .join("first-draft")
                     .join("index.html")
             ).unwrap()

src/write.rs

@@ -10,6 +10,30 @@ pub fn write_post(
     post_template: &str,
     post: &Post,
     config: &Config,
+) {
+    match fs::create_dir(cwd.join("public").join("posts").join(&post.slug)) {
+        Ok(_) => {}
+        Err(err) => match err.kind() {
+            std::io::ErrorKind::AlreadyExists => {}
+            _ => panic!(err),
+        },
+    }
+    fs::write(
+        cwd.join("public")
+            .join("posts")
+            .join(&post.slug)
+            .join("index.html"),
+        render_post(layout, post_template, post, config),
+    )
+    .expect("Unable to write file");
+}
+
+pub fn write_page(
+    cwd: &path::PathBuf,
+    layout: &str,
+    post_template: &str,
+    post: &Post,
+    config: &Config,
 ) {
     match fs::create_dir(cwd.join("public").join(&post.slug)) {
         Ok(_) => {}
@@ -64,6 +88,7 @@ mod tests {
 
         let cwd = env::current_dir().unwrap();
         fs::create_dir(cwd.join("public")).unwrap();
+        fs::create_dir(cwd.join("public").join("posts")).unwrap();
 
         let layout =
             "<html><head><title>{{ page_title }}</title></head><body>{{ contents }}</body></html>";
@@ -79,8 +104,13 @@ mod tests {
 
         write_post(&cwd, &layout, &post_template, &post, &config);
 
-        let content =
-            fs::read_to_string(cwd.join("public").join("hello-world").join("index.html")).unwrap();
+        let content = fs::read_to_string(
+            cwd.join("public")
+                .join("posts")
+                .join("hello-world")
+                .join("index.html"),
+        )
+        .unwrap();
 
         assert_eq!(
             "<html><head><title>Hello world | Test Site</title></head><body><article><h1>Hello world</h1><div><p>Lorem ipsum dolor sit amet</p></div></article></body></html>",