Give posts a date, separate posts and pages

Cargo.lock

@@ -52,6 +52,7 @@ dependencies = [
 name = "casaubon"
 version = "0.1.1"
 dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "comrak 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -67,6 +68,16 @@ name = "cfg-if"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "chrono"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "clap"
 version = "2.32.0"
@@ -320,6 +331,19 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "num_cpus"
 version = "1.8.0"
@@ -541,6 +565,16 @@ dependencies = [
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tokio-executor"
 version = "0.1.5"
@@ -718,6 +752,7 @@ dependencies = [
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum comrak 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bd60be8877a3343d25b9a3dadbaf7f02f9ac843b54e663ecef73e29e8b9c6b"
@@ -745,6 +780,8 @@ dependencies = [
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum notify 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "873ecfd8c174964ae30f401329d140142312c8e5590719cf1199d5f1717d8078"
+"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
@@ -774,6 +811,7 @@ dependencies = [
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde"
 "checksum tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7392fe0a70d5ce0c882c4778116c519bd5dbaa8a7c3ae3d04578b3afafdcda21"
 "checksum tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "502b625acb4ee13cbb3b90b8ca80e0addd263ddacf6931666ef751e610b07fb5"

Cargo.toml

@@ -8,6 +8,7 @@ readme = "README.md"
 repository = "https://git.sr.ht/~simulacrumparty/casaubon"
 
 [dependencies]
+chrono = "0.4"
 clap = "2.32.0"
 comrak = "0.3"
 fs_extra = "1.1.0"

src/commands.rs

@@ -7,6 +7,7 @@ use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
 use toml::Value;
 
 use config::Config;
+use page::{parse_page, read_pages_dir};
 use post::{parse_post, read_posts_dir};
 use write::{write_page, write_post, write_post_listing};
 
@@ -55,7 +56,7 @@ pub fn build(include_drafts: bool) {
         false => read_posts_dir(&cwd.join("posts")),
     };
 
-    let page_paths = read_posts_dir(&cwd.join("pages"));
+    let page_paths = read_pages_dir(&cwd.join("pages"));
 
     let posts = post_paths
         .into_iter()
@@ -67,7 +68,7 @@ pub fn build(include_drafts: bool) {
         .collect();
 
     for entry in page_paths.into_iter() {
-        let page = parse_post(entry.path());
+        let page = parse_page(entry.path());
         write_page(&cwd, &layout_template, &page_template, &page, &config);
     }
 
@@ -334,7 +335,7 @@ mod tests {
         .unwrap();
         fs::write(
             project_dir.join("posts").join("first-post.md"),
-            "# First post\n\nThis is the first post\n\nIt has multiple paragraphs",
+            "# First post | 2019-01-01\n\nThis is the first post\n\nIt has multiple paragraphs",
         )
         .unwrap();
         fs::write(
@@ -452,7 +453,7 @@ mod tests {
         .unwrap();
         fs::write(
             project_dir.join("posts").join("first-post.md"),
-            "# First post\n\nThis is the first post",
+            "# First post | 2019-01-01\n\nThis is the first post",
         )
         .unwrap();
         fs::write(
@@ -462,7 +463,7 @@ mod tests {
         .unwrap();
         fs::write(
             project_dir.join("drafts").join("first-draft.md"),
-            "# First draft\n\nThis is the first draft",
+            "# First draft | 2019-01-01\n\nThis is the first draft",
         )
         .unwrap();
         fs::write(

src/main.rs

@@ -1,3 +1,4 @@
+extern crate chrono;
 extern crate clap;
 extern crate comrak;
 extern crate fs_extra;
@@ -14,6 +15,7 @@ use commands::{build, new, watch};
 
 mod commands;
 mod config;
+mod page;
 mod post;
 mod render;
 mod write;

src/page.rs

@@ -0,0 +1,38 @@
+use regex::Regex;
+
+use std::fs;
+use std::path;
+
+#[derive(Debug)]
+pub struct Page {
+    pub title: String,
+    pub body: String,
+    pub slug: String,
+}
+
+pub fn read_pages_dir(cwd: &path::PathBuf) -> Vec<fs::DirEntry> {
+    match fs::read_dir(cwd) {
+        Ok(pages) => pages.into_iter().map(|page| page.unwrap()).collect(),
+        Err(err) => panic!(err),
+    }
+}
+
+pub fn parse_page(path: path::PathBuf) -> Page {
+    let contents = fs::read_to_string(&path).expect("Couldn't read page file");
+
+    lazy_static! {
+        static ref re: Regex = Regex::new(r"^# (?P<title>.*)\n\n(?s)(?P<body>.*)").unwrap();
+        static ref slug_re: Regex = Regex::new(r"(?P<slug>\S+).md").unwrap();
+    }
+
+    let title = &re.captures(&contents).expect("Couldn't parse title")["title"];
+    let body = &re.captures(&contents).expect("Couldn't parse body")["body"];
+
+    let filename = &path.file_name().unwrap().to_str().unwrap();
+    let slug = &slug_re.captures(filename).expect("Couldn't parse slug")["slug"];
+    Page {
+        title: String::from(title),
+        body: String::from(body),
+        slug: String::from(slug),
+    }
+}

src/post.rs

@@ -1,13 +1,15 @@
+use chrono::NaiveDate;
+use regex::Regex;
+
 use std::fs;
 use std::path;
 
-use regex::Regex;
-
 #[derive(Debug)]
 pub struct Post {
     pub title: String,
     pub body: String,
     pub slug: String,
+    pub date: NaiveDate,
 }
 
 pub fn read_posts_dir(cwd: &path::PathBuf) -> Vec<fs::DirEntry> {
@@ -21,11 +23,14 @@ pub fn parse_post(path: path::PathBuf) -> Post {
     let contents = fs::read_to_string(&path).expect("Couldn't read post file");
 
     lazy_static! {
-        static ref re: Regex = Regex::new(r"^# (?P<title>.*)\n\n(?s)(?P<body>.*)").unwrap();
+        static ref re: Regex =
+            Regex::new(r"^# (?P<title>.*) \| (?P<date>\d{4}-\d{2}-\d{2})\n\n(?s)(?P<body>.*)")
+                .unwrap();
         static ref slug_re: Regex = Regex::new(r"(?P<slug>\S+).md").unwrap();
     }
 
     let title = &re.captures(&contents).expect("Couldn't parse title")["title"];
+    let date = &re.captures(&contents).expect("Couldn't parse date")["date"];
     let body = &re.captures(&contents).expect("Couldn't parse body")["body"];
 
     let filename = &path.file_name().unwrap().to_str().unwrap();
@@ -34,6 +39,7 @@ pub fn parse_post(path: path::PathBuf) -> Post {
         title: String::from(title),
         body: String::from(body),
         slug: String::from(slug),
+        date: NaiveDate::parse_from_str(&date, "%Y-%m-%d").expect("Couldn't parse date"),
     }
 }
 
@@ -108,14 +114,16 @@ mod tests {
         let filename = format!("{}.md", slug);
         fs::write(
             cwd.join("posts").join(&filename),
-            "# This is a post\n\nHere is some content that goes in the post",
+            "# This is a post | 2019-01-01\n\nHere is some content that goes in the post",
         )
         .unwrap();
 
         let post = parse_post(cwd.join("posts").join(&filename));
+        let date = NaiveDate::from_ymd(2019, 1, 1);
         assert_eq!("This is a post", post.title);
         assert_eq!("Here is some content that goes in the post", post.body);
         assert_eq!(slug, post.slug);
+        assert_eq!(date, post.date);
 
         fs::remove_dir_all(temp_dir.join(&working_dir)).unwrap();
     }
@@ -134,17 +142,19 @@ mod tests {
         let filename = format!("{}.md", slug);
         fs::write(
             cwd.join("posts").join(&filename),
-            "# This is a post\n\nHere is a line\n\nHere is another line\n\nAnd a third",
+            "# This is a post | 2019-01-01\n\nHere is a line\n\nHere is another line\n\nAnd a third",
         )
         .unwrap();
 
         let post = parse_post(cwd.join("posts").join(&filename));
+        let date = NaiveDate::from_ymd(2019, 1, 1);
         assert_eq!("This is a post", post.title);
         assert_eq!(
             "Here is a line\n\nHere is another line\n\nAnd a third",
             post.body
         );
         assert_eq!(slug, post.slug);
+        assert_eq!(date, post.date);
 
         fs::remove_dir_all(temp_dir.join(&working_dir)).unwrap();
     }

src/render.rs

@@ -1,6 +1,7 @@
 use comrak::{markdown_to_html, ComrakOptions};
 
 use config::Config;
+use page::Page;
 use post::Post;
 
 pub fn render_post(layout: &str, post_template: &str, post: &Post, config: &Config) -> String {
@@ -18,6 +19,21 @@ pub fn render_post(layout: &str, post_template: &str, post: &Post, config: &Conf
         )
 }
 
+pub fn render_page(layout: &str, page_template: &str, page: &Page, config: &Config) -> String {
+    layout
+        .replace(
+            "{{ page_title }}",
+            &format!("{} | {}", page.title, config.site_name),
+        )
+        .replace(
+            "{{ contents }}",
+            &page_template.replace("{{ title }}", &page.title).replace(
+                "{{ body }}",
+                &markdown_to_html(&page.body, &ComrakOptions::default()),
+            ),
+        )
+}
+
 pub fn render_post_listing(
     layout: &str,
     post_listing_template: &str,
@@ -46,8 +62,9 @@ pub fn render_post_listing(
 
 #[cfg(test)]
 mod tests {
-    #[allow(unused_imports)]
     use super::{render_post, render_post_listing, Config, Post};
+    #[allow(unused_imports)]
+    use chrono::NaiveDate;
 
     #[test]
     fn test_render_post() {
@@ -58,6 +75,7 @@ mod tests {
                 title: String::from("hello world"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("hello-world"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
             &Config {
                 site_name: "Test Site".to_string(),
@@ -78,16 +96,19 @@ mod tests {
                 title: String::from("First post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("first-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
             Post {
                 title: String::from("Second post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("second-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
             Post {
                 title: String::from("Third post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("third-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
         ];
         let output = render_post_listing(

src/write.rs

@@ -1,6 +1,7 @@
 use config::Config;
+use page::Page;
 use post::Post;
-use render::{render_post, render_post_listing};
+use render::{render_page, render_post, render_post_listing};
 use std::fs;
 use std::path;
 
@@ -31,11 +32,11 @@ pub fn write_post(
 pub fn write_page(
     cwd: &path::PathBuf,
     layout: &str,
-    post_template: &str,
-    post: &Post,
+    page_template: &str,
+    page: &Page,
     config: &Config,
 ) {
-    match fs::create_dir(cwd.join("public").join(&post.slug)) {
+    match fs::create_dir(cwd.join("public").join(&page.slug)) {
         Ok(_) => {}
         Err(err) => match err.kind() {
             std::io::ErrorKind::AlreadyExists => {}
@@ -43,8 +44,8 @@ pub fn write_page(
         },
     }
     fs::write(
-        cwd.join("public").join(&post.slug).join("index.html"),
-        render_post(layout, post_template, post, config),
+        cwd.join("public").join(&page.slug).join("index.html"),
+        render_page(layout, page_template, page, config),
     )
     .expect("Unable to write file");
 }
@@ -72,6 +73,8 @@ pub fn write_post_listing(
 
 #[cfg(test)]
 mod tests {
+    use chrono::NaiveDate;
+
     #[allow(unused_imports)]
     use super::*;
     #[allow(unused_imports)]
@@ -97,6 +100,7 @@ mod tests {
             title: String::from("Hello world"),
             body: String::from("Lorem ipsum dolor sit amet"),
             slug: String::from("hello-world"),
+            date: NaiveDate::from_ymd(2019, 1, 1),
         };
         let config = Config {
             site_name: "Test Site".to_string(),
@@ -139,16 +143,19 @@ mod tests {
                 title: String::from("First post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("first-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
             Post {
                 title: String::from("Second post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("second-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
             Post {
                 title: String::from("Third post"),
                 body: String::from("lorem ipsum dolor sit amet"),
                 slug: String::from("third-post"),
+                date: NaiveDate::from_ymd(2019, 1, 1),
             },
         ];
         let config = Config {