From 60b395e0470d8e284b22c8f55d3f30761809744d Mon Sep 17 00:00:00 2001
From: Michael Jerger <michael.jerger@meissa-gmbh.de>
Date: Fri, 30 Dec 2016 23:43:13 +0100
Subject: [PATCH] added ability to select one page as home-page (add :home?
 true as meta) instead of newest post.

---
 .gitignore                    |  1 +
 project.clj                   |  6 ++++--
 src/cryogen_core/compiler.clj | 35 +++++++++++++++++++++++++----------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index d44b519..4c7af5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ pom.xml.asc
 .DS*
 /.idea/
 /cryogen-core.iml
+/bin/
diff --git a/project.clj b/project.clj
index 1265b13..da3d908 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject cryogen-core "0.1.46"
+(defproject org.domaindrivenarchitecture/cryogen-core "0.1.47-SNAPSHOT"
             :description "Cryogen's compiler"
             :url "https://github.com/cryogen-project/cryogen-core"
             :license {:name "Eclipse Public License"
@@ -14,4 +14,6 @@
                            [selmer "1.10.2"]
                            [pandect "0.6.1"]
                            [hawk "0.2.11"]
-                           [clj-tagsoup "0.3.0" :exclusions [org.clojure/clojure]]])
+                           [clj-tagsoup "0.3.0" :exclusions [org.clojure/clojure]]]
+            :deploy-repositories [["snapshots" :clojars]
+                                  ["releases" :clojars]])
diff --git a/src/cryogen_core/compiler.clj b/src/cryogen_core/compiler.clj
index e23f9b6..bdbf9a2 100644
--- a/src/cryogen_core/compiler.clj
+++ b/src/cryogen_core/compiler.clj
@@ -231,11 +231,13 @@
     (create-folder (path "/" blog-prefix page-root-uri))
     (doseq [{:keys [uri] :as page} pages]
       (println "\t-->" (cyan uri))
+      (println "\t-->" (cyan page))
       (write-html uri
                   params
                   (render-file (str "/html/" (:layout page))
                                (merge params
                                       {:active-page     "pages"
+                                       :home            false
                                        :servlet-context (path "/" blog-prefix "/")
                                        :page            page
                                        :uri             uri}))))))
@@ -248,6 +250,7 @@
     (create-folder (path "/" blog-prefix post-root-uri))
     (doseq [post posts]
       (println "\t-->" (cyan (:uri post)))
+      (println "\t-->" (cyan post))
       (write-html (:uri post)
                   params
                   (render-file (str "/html/" (:layout post))
@@ -350,16 +353,21 @@
   "Compiles the index page into html and spits it out into the public folder"
   [{:keys [disqus?] :as params}]
   (println (blue "compiling index"))
-  (let [uri (page-uri "index.html" params)]
+  (let [uri (page-uri "index.html" params)
+        home-page (-> params :home-page)
+        meta {:active-page "home"
+              :home        true
+              :disqus?     disqus?
+              :uri         uri
+              :post        home-page
+              :page        home-page}]
+    (println "\t-->" (cyan meta))
+    (println "\t-->" (cyan (first (-> params :latest-posts))))
     (write-html uri
                 params
-                (render-file "/html/home.html"
+                (render-file (str "/html/" (:layout home-page))
                              (merge params
-                                    {:active-page "home"
-                                     :home        true
-                                     :disqus?     disqus?
-                                     :post        (get-in params [:latest-posts 0])
-                                     :uri         uri})))))
+                                    meta)))))
 
 (defn compile-archives
   "Compiles the archives page into html and spits it out into the public folder"
@@ -455,17 +463,24 @@
   (let [{:keys [^String site-url blog-prefix rss-name recent-posts sass-src sass-dest sass-path compass-path keep-files ignored-files previews? author-root-uri] :as config} (read-config)
         posts (add-prev-next (read-posts config))
         pages (add-prev-next (read-pages config))
-        [navbar-pages sidebar-pages] (group-pages pages)
+        home-pages (filter #(boolean (:home? %)) pages)
+        pages-without-home (filter #(boolean (not (:home? %))) pages)
+        [navbar-pages sidebar-pages] (group-pages pages-without-home)
         posts-by-tag (group-by-tags posts)
         posts (tag-posts posts config)
+        latest-posts (->> posts (take recent-posts) vec)
         params (merge config
                       {:today         (java.util.Date.)
                        :title         (:site-title config)
                        :active-page   "home"
                        :tags          (map (partial tag-info config) (keys posts-by-tag))
-                       :latest-posts  (->> posts (take recent-posts) vec)
+                       :latest-posts  latest-posts
                        :navbar-pages  navbar-pages
                        :sidebar-pages sidebar-pages
+                       :home-page     (if (not-empty home-pages) 
+                                        (first home-pages) 
+                                        (merge (first latest-posts)
+                                               {:layout "home.html"}))                       
                        :archives-uri  (page-uri "archives.html" config)
                        :index-uri     (page-uri "index.html" config)
                        :tags-uri      (page-uri "tags.html" config)
@@ -480,7 +495,7 @@
     (println (blue "copying resources"))
     (copy-resources config)
     (copy-resources-from-markup-folders config)
-    (compile-pages params pages)
+    (compile-pages params pages-without-home)
     (compile-posts params posts)
     (compile-tags params posts-by-tag)
     (compile-tags-page params)