Merge pull request #1238 from epage/page.tag

fix: Always include page.tags

Author: epage

src/cobalt_model/frontmatter.rs

@@ -17,7 +17,7 @@ pub struct Frontmatter {
     pub description: Option<liquid::model::KString>,
     pub excerpt: Option<liquid::model::KString>,
     pub categories: Vec<liquid::model::KString>,
-    pub tags: Option<Vec<liquid::model::KString>>,
+    pub tags: Vec<liquid::model::KString>,
     pub excerpt_separator: liquid::model::KString,
     pub published_date: Option<DateTime>,
     pub format: SourceFormat,
@@ -56,16 +56,11 @@ impl Frontmatter {
 
         let permalink = permalink.unwrap_or_default();
 
-        if let Some(ref tags) = tags {
+        if let Some(tags) = &tags {
             if tags.iter().any(|x| x.trim().is_empty()) {
                 anyhow::bail!("Empty strings are not allowed in tags");
             }
         }
-        let tags = if tags.as_ref().map(|t| t.len()).unwrap_or(0) == 0 {
-            None
-        } else {
-            tags
-        };
         let fm = Frontmatter {
             pagination: pagination
                 .and_then(|p| pagination::PaginationConfig::from_config(p, &permalink)),
@@ -75,7 +70,7 @@ impl Frontmatter {
             description,
             excerpt,
             categories: categories.unwrap_or_default(),
-            tags,
+            tags: tags.unwrap_or_default(),
             excerpt_separator: excerpt_separator.unwrap_or_else(|| "\n\n".into()),
             published_date,
             format: format.unwrap_or_default(),

src/document.rs

@@ -92,6 +92,20 @@ impl Document {
     pub(crate) fn to_jsonfeed(&self, root_url: &str) -> jsonfeed::Item {
         let link = format!("{}/{}", root_url, &self.url_path);
 
+        let tags = if !self.front.tags.is_empty() {
+            self.front
+                .tags
+                .iter()
+                .map(|s| s.as_str().to_owned())
+                .collect()
+        } else {
+            self.front
+                .categories
+                .iter()
+                .map(|s| s.as_str().to_owned())
+                .collect()
+        };
+
         jsonfeed::Item {
             id: link.clone(),
             url: Some(link),
@@ -100,19 +114,7 @@ impl Document {
                 self.description_to_str().unwrap_or_else(|| "".into()),
             ),
             date_published: self.front.published_date.map(|date| date.to_rfc2822()),
-            tags: Some(
-                self.front
-                    .tags
-                    .as_ref()
-                    .map(|tags| tags.iter().map(|s| s.as_str().to_owned()).collect())
-                    .unwrap_or_else(|| {
-                        self.front
-                            .categories
-                            .iter()
-                            .map(|s| s.as_str().to_owned())
-                            .collect()
-                    }),
-            ),
+            tags: Some(tags),
             ..Default::default()
         }
     }
@@ -328,10 +330,11 @@ fn document_attributes(
             .map(Value::scalar)
             .collect(),
     );
+    let tags = Value::Array(front.tags.iter().cloned().map(Value::scalar).collect());
     // Reason for `file`:
     // - Allow access to assets in the original location
     // - Ease linking back to page's source
-    let file: Object = vec![
+    let file: Object = [
         (
             "permalink".into(),
             Value::scalar(source_file.as_str().to_owned()),
@@ -349,7 +352,7 @@ fn document_attributes(
     ]
     .into_iter()
     .collect();
-    let attributes = vec![
+    let attributes = [
         ("permalink".into(), Value::scalar(url_path.to_owned())),
         ("title".into(), Value::scalar(front.title.clone())),
         ("slug".into(), Value::scalar(front.slug.clone())),
@@ -358,6 +361,7 @@ fn document_attributes(
             Value::scalar(front.description.as_deref().unwrap_or("").to_owned()),
         ),
         ("categories".into(), categories),
+        ("tags".into(), tags),
         ("is_draft".into(), Value::scalar(front.is_draft)),
         ("weight".into(), Value::scalar(front.weight)),
         ("file".into(), Value::Object(file)),
@@ -366,11 +370,6 @@ fn document_attributes(
     ];
     let mut attributes: Object = attributes.into_iter().collect();
 
-    if let Some(ref tags) = front.tags {
-        let tags = Value::Array(tags.iter().cloned().map(Value::scalar).collect());
-        attributes.insert("tags".into(), tags);
-    }
-
     if let Some(ref published_date) = front.published_date {
         attributes.insert("published_date".into(), Value::scalar(*published_date));
     }