meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unnecesasry tag-root key

Browse source
This commit is contained in:
Carmen La 2016-01-08 20:44:07 -05:00
parent 1abc4c6137
commit 839ed5c469
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -1,4 +1,4 @@
(defproject cryogen-core "0.1.28" (defproject cryogen-core "0.1.29"
:description "Cryogen's compiler" :description "Cryogen's compiler"
:url "https://github.com/cryogen-project/cryogen-core" :url "https://github.com/cryogen-project/cryogen-core"
:license {:name "Eclipse Public License" :license {:name "Eclipse Public License"

7
src/cryogen_core/compiler.clj
View file

@ -20,7 +20,7 @@
(cache-off!) (cache-off!)
(defn root-uri (defn root-uri
"Creates the uri for posts, tags and pages. Returns root-path by default" "Creates the uri for posts and pages. Returns root-path by default"
[k config] [k config]
(if-let [uri (k config)] (if-let [uri (k config)]
uri uri
@ -349,7 +349,7 @@
(update-in [:blog-prefix] (fnil str "")) (update-in [:blog-prefix] (fnil str ""))
(update-in [:page-root] (fnil str "")) (update-in [:page-root] (fnil str ""))
(update-in [:post-root] (fnil str "")) (update-in [:post-root] (fnil str ""))
(update-in [:tag-root] (fnil str "")) (update-in [:tag-root-uri] (fnil str ""))
(update-in [:rss-name] (fnil str "rss.xml")) (update-in [:rss-name] (fnil str "rss.xml"))
(update-in [:rss-filters] (fnil seq [])) (update-in [:rss-filters] (fnil seq []))
(update-in [:sass-src] (fnil str "css")) (update-in [:sass-src] (fnil str "css"))
@ -360,8 +360,7 @@
(merge (merge
config config
{:page-root-uri (root-uri :page-root-uri config) {:page-root-uri (root-uri :page-root-uri config)
:post-root-uri (root-uri :post-root-uri config) :post-root-uri (root-uri :post-root-uri config)}))
:tag-root-uri (root-uri :tag-root-uri config)}))
(catch Exception _ (catch Exception _
(throw (IllegalArgumentException. "Failed to parse config.edn"))))) (throw (IllegalArgumentException. "Failed to parse config.edn")))))