From 277cd7eb0f255cd7aa477a99f7c73d1fa1274d02 Mon Sep 17 00:00:00 2001
From: Yogthos <dmitri.sotnikov@gmail.com>
Date: Mon, 13 Jul 2015 00:37:37 -0400
Subject: [PATCH] moved wrap-reload to middleware

---
 src/leiningen/new/luminus/core/src/handler.clj  | 17 +++++++----------
 .../new/luminus/core/src/middleware.clj         |  2 ++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/leiningen/new/luminus/core/src/handler.clj b/src/leiningen/new/luminus/core/src/handler.clj
index 2d228b06..5b0aacb3 100644
--- a/src/leiningen/new/luminus/core/src/handler.clj
+++ b/src/leiningen/new/luminus/core/src/handler.clj
@@ -1,8 +1,7 @@
 (ns <<project-ns>>.handler
   (:require [compojure.core :refer [defroutes routes wrap-routes]]
-            [ring.middleware.reload :as reload]
-            [<<project-ns>>.routes.home :refer [home-routes]]
-            <<service-required>>
+            [<<project-ns>>.routes.home :refer [home-routes]]<% if service-required %>
+            <<service-required>><% endif %>
             [<<project-ns>>.middleware :as middleware]
             [<<project-ns>>.session :as session]
             [compojure.route :as route]
@@ -67,11 +66,9 @@
   (timbre/info "shutdown complete!"))
 
 (def app-base
-  (-> (routes<% if service-routes %>
-        <<service-routes>><% endif %>
-        (wrap-routes #'home-routes middleware/wrap-csrf)
-        #'base-routes)
-      middleware/wrap-base))
+  (routes<% if service-routes %>
+    <<service-routes>><% endif %>
+    (wrap-routes #'home-routes middleware/wrap-csrf)
+    #'base-routes))
 
-(def app
-  (if (env :dev) (reload/wrap-reload #'app-base) app-base))
+(def app (middleware/wrap-base #'app-base))
diff --git a/src/leiningen/new/luminus/core/src/middleware.clj b/src/leiningen/new/luminus/core/src/middleware.clj
index 5d7a17e4..4690f023 100644
--- a/src/leiningen/new/luminus/core/src/middleware.clj
+++ b/src/leiningen/new/luminus/core/src/middleware.clj
@@ -7,6 +7,7 @@
             [selmer.middleware :refer [wrap-error-page]]
             [prone.middleware :refer [wrap-exceptions]]
             [ring.util.response :refer [redirect]]
+            [ring.middleware.reload :as reload]
             [ring.middleware.defaults :refer [site-defaults wrap-defaults]]
             [ring.middleware.anti-forgery :refer [wrap-anti-forgery]]
             [ring.middleware.session-timeout :refer [wrap-idle-session-timeout]]
@@ -39,6 +40,7 @@
 (defn wrap-dev [handler]
   (if (env :dev)
     (-> handler
+        reload/wrap-reload
         wrap-error-page
         wrap-exceptions)
     handler))