Skip to content

Commit

Permalink
renamed :servlet-context to :selmer/context
Browse files Browse the repository at this point in the history
  • Loading branch information
@yogthos
yogthos committed Nov 7, 2018
1 parent 5945930 commit 67ef4b2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
6 changes: 3 additions & 3 deletions project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(defproject cryogen-core "0.1.63"
(defproject cryogen-core "0.1.64"
:description "Cryogen's compiler"
:url "https://github.com/cryogen-project/cryogen-core"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.8.0"]
:dependencies [[org.clojure/clojure "1.9.0"]
[camel-snake-kebab "0.4.0"]
[cheshire "5.8.1"]
[clj-rss "0.2.3"]
Expand All @@ -15,6 +15,6 @@
[me.raynes/fs "1.4.6"]
[pandect "0.6.1"]
[prismatic/schema "1.1.9"]
[selmer "1.12.2"]]
[selmer "1.12.3"]]
:deploy-repositories [["snapshots" :clojars]
["releases" :clojars]])
29 changes: 15 additions & 14 deletions src/cryogen_core/compiler.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
(merge params
{:active-page "pages"
:home false
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:page page
:uri uri}))))))

Expand All @@ -272,7 +272,7 @@
(render-file (str "/html/" (:layout post))
(merge params
{:active-page "posts"
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:post post
:disqus-shortname disqus-shortname
:uri uri}))))))
Expand All @@ -291,7 +291,7 @@
(render-file "/html/tag.html"
(merge params
{:active-page "tags"
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:name name
:posts posts
:uri uri})))))))
Expand All @@ -305,7 +305,7 @@
(render-file "/html/tags.html"
(merge params
{:active-page "tags"
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:uri uri})))))

(defn content-until-more-marker
Expand Down Expand Up @@ -367,14 +367,14 @@
(merge params
{:active-page "preview"
:home (when index-page? true)
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:posts posts
:prev-uri prev
:next-uri next})))))))

(defn compile-index
"Compiles the index page into html and spits it out into the public folder"
[{:keys [disqus? debug? home-page] :as params}]
[{:keys [blog-prefix disqus? debug? home-page] :as params}]
(println (blue "compiling index"))
(let [uri (page-uri "index.html" params)]
(when debug?
Expand All @@ -383,12 +383,13 @@
params
(render-file (str "/html/" (:layout home-page))
(merge params
{:active-page "home"
:home true
:disqus? disqus?
:uri uri
:post home-page
:page home-page})))))
{:active-page "home"
:home true
:disqus? disqus?
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:uri uri
:post home-page
:page home-page})))))

(defn compile-archives
"Compiles the archives page into html and spits it out into the public folder"
Expand All @@ -402,7 +403,7 @@
{:active-page "archives"
:archives true
:groups (group-for-archive posts)
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:uri uri})))))

(defn compile-authors
Expand All @@ -420,7 +421,7 @@
(merge params
{:author author
:groups (group-for-archive posts)
:servlet-context (cryogen-io/path "/" blog-prefix "/")
:selmer/context (cryogen-io/path "/" blog-prefix "/")
:uri uri}))))))

(defn tag-posts
Expand Down

0 comments on commit 67ef4b2

Please sign in to comment.