Merge pull request #529 from getzola/next

0.5.1

.travis.yml

@@ -16,7 +16,7 @@ matrix:
 
     # The earliest stable Rust version that works
     - env: TARGET=x86_64-unknown-linux-gnu
-      rust: 1.29.0
+      rust: 1.30.0
 
 
 before_install: set -e

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.1 (2018-12-14)
+
+- Fix deleting markdown file in `zola serve`
+- Fix pagination for taxonomies being broken and add missing documentation for it
+- Add missing pager pages from the sitemap
+- Allow and parse full RFC339 datetimes in filenames
+- Live reload is now enabled for the 404 page on serve
+
+
 ## 0.5.0 (2018-11-17)
 
 ### Breaking

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zola"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Vincent Prouillet <[email protected]>"]
 license = "MIT"
 readme = "README.md"

components/config/src/config.rs

@@ -37,6 +37,14 @@ impl Taxonomy {
             false
         }
     }
+
+    pub fn paginate_path(&self) -> &str {
+        if let Some(ref path) = self.paginate_path {
+            path
+        } else {
+            "page"
+        }
+    }
 }
 
 impl Default for Taxonomy {

components/library/src/content/page.rs

@@ -20,8 +20,11 @@ use content::file_info::FileInfo;
 use content::ser::SerializingPage;
 
 lazy_static! {
-    // Check whether a string starts with yyyy-mm-dd{-,_}
-    static ref DATE_IN_FILENAME: Regex = Regex::new(r"^^([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))(_|-)").unwrap();
+    // Based on https://regex101.com/r/H2n38Z/1/tests
+    // A regex parsing RFC3339 date followed by {_,-}, some characters and ended by .md
+    static ref RFC3339_DATE: Regex = Regex::new(
+        r"^(?P<datetime>(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9])))?)(_|-)(?P<slug>.+$)"
+    ).unwrap();
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -113,11 +116,11 @@ impl Page {
         page.word_count = Some(word_count);
         page.reading_time = Some(reading_time);
 
-        let mut has_date_in_name = false;
-        if DATE_IN_FILENAME.is_match(&page.file.name) {
-            has_date_in_name = true;
+        let mut slug_from_dated_filename = None;
+        if let Some(ref caps) = RFC3339_DATE.captures(&page.file.name.replace(".md", "")) {
+            slug_from_dated_filename = Some(caps.name("slug").unwrap().as_str().to_string());
             if page.meta.date.is_none() {
-                page.meta.date = Some(page.file.name[..10].to_string());
+                page.meta.date = Some(caps.name("datetime").unwrap().as_str().to_string());
                 page.meta.date_to_datetime();
             }
         }
@@ -132,9 +135,8 @@ impl Page {
                     slugify(&page.file.name)
                 }
             } else {
-                if has_date_in_name {
-                    // skip the date + the {_,-}
-                    slugify(&page.file.name[11..])
+                if let Some(slug) = slug_from_dated_filename {
+                    slugify(&slug)
                 } else {
                     slugify(&page.file.name)
                 }
@@ -507,7 +509,7 @@ Hello world
     }
 
     #[test]
-    fn can_get_date_from_filename() {
+    fn can_get_date_from_short_date_in_filename() {
         let config = Config::default();
         let content = r#"
 +++
@@ -523,6 +525,23 @@ Hello world
         assert_eq!(page.slug, "hello");
     }
 
+    #[test]
+    fn can_get_date_from_full_rfc3339_date_in_filename() {
+        let config = Config::default();
+        let content = r#"
++++
++++
+Hello world
+<!-- more -->"#
+            .to_string();
+        let res = Page::parse(Path::new("2018-10-02T15:00:00Z-hello.md"), &content, &config);
+        assert!(res.is_ok());
+        let page = res.unwrap();
+
+        assert_eq!(page.meta.date, Some("2018-10-02T15:00:00Z".to_string()));
+        assert_eq!(page.slug, "hello");
+    }
+
     #[test]
     fn frontmatter_date_override_filename_date() {
         let config = Config::default();

components/library/src/content/section.rs

@@ -80,7 +80,7 @@ impl Section {
     pub fn parse(file_path: &Path, content: &str, config: &Config) -> Result<Section> {
         let (meta, content) = split_section_content(file_path, content)?;
         let mut section = Section::new(file_path, meta);
-        section.raw_content = content.clone();
+        section.raw_content = content;
         let (word_count, reading_time) = get_reading_analytics(&section.raw_content);
         section.word_count = Some(word_count);
         section.reading_time = Some(reading_time);

components/library/src/pagination/mod.rs

@@ -14,7 +14,7 @@ use taxonomies::{Taxonomy, TaxonomyItem};
 #[derive(Clone, Debug, PartialEq)]
 enum PaginationRoot<'a> {
     Section(&'a Section),
-    Taxonomy(&'a Taxonomy),
+    Taxonomy(&'a Taxonomy, &'a TaxonomyItem),
 }
 
 /// A list of all the pages in the paginator with their index and links
@@ -93,14 +93,14 @@ impl<'a> Paginator<'a> {
             all_pages: &item.pages,
             pagers: Vec::with_capacity(item.pages.len() / paginate_by),
             paginate_by,
-            root: PaginationRoot::Taxonomy(taxonomy),
+            root: PaginationRoot::Taxonomy(taxonomy, item),
             permalink: item.permalink.clone(),
             path: format!("{}/{}", taxonomy.kind.name, item.slug),
             paginate_path: taxonomy
                 .kind
                 .paginate_path
                 .clone()
-                .unwrap_or_else(|| "pages".to_string()),
+                .unwrap_or_else(|| "page".to_string()),
             is_index: false,
             template: format!("{}/single.html", taxonomy.kind.name),
         };
@@ -212,8 +212,9 @@ impl<'a> Paginator<'a> {
                 context
                     .insert("section", &SerializingSection::from_section_basic(s, Some(library)));
             }
-            PaginationRoot::Taxonomy(t) => {
+            PaginationRoot::Taxonomy(t, item) => {
                 context.insert("taxonomy", &t.kind);
+                context.insert("term", &item.serialize(library));
             }
         };
         context.insert("current_url", &pager.permalink);
@@ -349,7 +350,7 @@ mod tests {
 
         assert_eq!(paginator.pagers[1].index, 2);
         assert_eq!(paginator.pagers[1].pages.len(), 1);
-        assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/tags/something/pages/2/");
-        assert_eq!(paginator.pagers[1].path, "tags/something/pages/2/");
+        assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/tags/something/page/2/");
+        assert_eq!(paginator.pagers[1].path, "tags/something/page/2/");
     }
 }

components/library/src/taxonomies/mod.rs

@@ -13,7 +13,7 @@ use library::Library;
 use sorting::sort_pages_by_date;
 
 #[derive(Debug, Clone, PartialEq, Serialize)]
-struct SerializedTaxonomyItem<'a> {
+pub struct SerializedTaxonomyItem<'a> {
     name: &'a str,
     slug: &'a str,
     permalink: &'a str,
@@ -71,6 +71,10 @@ impl TaxonomyItem {
 
         TaxonomyItem { name: name.to_string(), permalink, slug, pages }
     }
+
+    pub fn serialize<'a>(&'a self, library: &'a Library) -> SerializedTaxonomyItem<'a> {
+        SerializedTaxonomyItem::from_item(self, library)
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize)]

components/rebuild/src/lib.rs

@@ -311,7 +311,7 @@ pub fn after_content_change(site: &mut Site, path: &Path) -> Result<()> {
     if is_md {
         // only delete if it was able to be added in the first place
         if !index.exists() && !path.exists() {
-            delete_element(site, path, is_section)?;
+            return delete_element(site, path, is_section);
         }
 
         // Added another .md in a assets directory
@@ -352,6 +352,7 @@ pub fn after_template_change(site: &mut Site, path: &Path) -> Result<()> {
             site.render_orphan_pages()
         }
         "section.html" => site.render_sections(),
+        "404.html" => site.render_404(),
         // Either the index or some unknown template changed
         // We can't really know what this change affects so rebuild all
         // the things

components/rebuild/tests/rebuild.rs

@@ -228,9 +228,22 @@ fn can_rebuild_after_renaming_section_folder() {
 fn can_rebuild_after_renaming_non_md_asset_in_colocated_folder() {
     let tmp_dir = tempdir().expect("create temp dir");
     let (site_path, mut site) = load_and_build_site!(tmp_dir);
-    let (old_path, new_path) = rename!(site_path, "content/posts/with-assets/zola.png", "gutenberg.png");
+    let (old_path, new_path) =
+        rename!(site_path, "content/posts/with-assets/zola.png", "gutenberg.png");
 
     // Testing that we don't try to load some images as markdown or something
     let res = after_content_rename(&mut site, &old_path, &new_path);
     assert!(res.is_ok());
 }
+
+#[test]
+fn can_rebuild_after_deleting_file() {
+    let tmp_dir = tempdir().expect("create temp dir");
+    let (site_path, mut site) = load_and_build_site!(tmp_dir);
+    let path = site_path.join("content").join("posts").join("fixed-slug.md");
+    fs::remove_file(&path).unwrap();
+
+    let res = after_content_change(&mut site, &path);
+    println!("{:?}", res);
+    assert!(res.is_ok());
+}

components/rendering/src/markdown.rs

@@ -31,7 +31,7 @@ pub struct Rendered {
 // means we will have example, example-1, example-2 etc
 fn find_anchor(anchors: &[String], name: String, level: u8) -> String {
     if level == 0 && !anchors.contains(&name) {
-        return name.to_string();
+        return name;
     }
 
     let new_anchor = format!("{}-{}", name, level + 1);

components/rendering/src/shortcode.rs

@@ -1,7 +1,7 @@
 use pest::iterators::Pair;
 use pest::Parser;
-use tera::{to_value, Context, Map, Value};
 use regex::Regex;
+use tera::{to_value, Context, Map, Value};
 
 use context::RenderContext;
 use errors::{Result, ResultExt};
@@ -20,9 +20,9 @@ lazy_static! {
 
 fn replace_string_markers(input: &str) -> String {
     match input.chars().next().unwrap() {
-        '"' => input.replace('"', "").to_string(),
-        '\'' => input.replace('\'', "").to_string(),
-        '`' => input.replace('`', "").to_string(),
+        '"' => input.replace('"', ""),
+        '\'' => input.replace('\'', ""),
+        '`' => input.replace('`', ""),
         _ => unreachable!("How did you even get there"),
     }
 }