From dd8b65e5bfcb742beeb998ebb5186e16fa8eb0ff Mon Sep 17 00:00:00 2001
From: Brent Hagany <brent@hiidef.com>
Date: Wed, 30 Nov 2016 20:26:19 -0600
Subject: [PATCH] use explicit :include-atom and :include-rss flags for
 inclusion in feeds

---
 src/io/perun.clj          |  4 ++--
 src/io/perun/markdown.clj | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/io/perun.clj b/src/io/perun.clj
index 3cefacf8..561e1088 100644
--- a/src/io/perun.clj
+++ b/src/io/perun.clj
@@ -316,7 +316,7 @@
 
 (def ^:private +rss-defaults+
   {:filename "feed.rss"
-   :filterer :content
+   :filterer :include-rss
    :out-dir "public"})
 
 (deftask rss
@@ -344,7 +344,7 @@
 
 (def ^:private +atom-defaults+
   {:filename "atom.xml"
-   :filterer :content
+   :filterer :include-atom
    :out-dir "public"})
 
 (deftask atom-feed
diff --git a/src/io/perun/markdown.clj b/src/io/perun/markdown.clj
index 0af1fc4c..1cc87a35 100644
--- a/src/io/perun/markdown.clj
+++ b/src/io/perun/markdown.clj
@@ -76,14 +76,19 @@
         :else y))
     x))
 
+(def ^:private default-meta
+  {:original true
+   :include-rss true
+   :include-atom true})
+
 (defn parse-file-metadata [file-content]
   (if-let [metadata-str (substr-between file-content *yaml-head* *yaml-head*)]
     (if-let [parsed-yaml (normal-colls (yaml/parse-string metadata-str))]
       ; we use `original` file flag to distinguish between generated files
       ; (e.x. created those by plugins)
-      (assoc parsed-yaml :original true)
-      {:original true})
-    {:original true}))
+      (merge default-meta parsed-yaml)
+      default-meta)
+    default-meta))
 
 (defn remove-metadata [content]
   (let [splitted (str/split content *yaml-head* 3)]