From 2166b7085e3788f81da7556f20434c17eb8e1a2b Mon Sep 17 00:00:00 2001
From: Yogthos <dmitri.sotnikov@gmail.com>
Date: Mon, 16 Jun 2014 23:01:19 -0400
Subject: [PATCH] cleanup

---
 project.clj                                 |  2 +-
 src/leiningen/new/luminus/dbs/h2_schema.clj |  2 +-
 src/leiningen/new/luminus/handler.clj       |  3 ++-
 src/leiningen/new/luminus/middleware.clj    | 13 -------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/project.clj b/project.clj
index 1e3e80f6..82cdf0d9 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject luminus/lein-template "1.12.07"
+(defproject luminus/lein-template "1.12.08"
   :description "a template for creating Luminus applications"
   :url "https://github.com/yogthos/luminus-template"
   :license {:name "MIT License"
diff --git a/src/leiningen/new/luminus/dbs/h2_schema.clj b/src/leiningen/new/luminus/dbs/h2_schema.clj
index 39d9c813..0512fe01 100644
--- a/src/leiningen/new/luminus/dbs/h2_schema.clj
+++ b/src/leiningen/new/luminus/dbs/h2_schema.clj
@@ -15,7 +15,7 @@
 (defn initialized?
   "checks to see if the database schema is present"
   []
-  (.exists (new java.io.File (str (io/resource-path) db-store ".h2.db"))))
+  (.exists (new java.io.File (str (io/resource-path) db-store ".mv.db"))))
 
 (defn create-users-table
   []
diff --git a/src/leiningen/new/luminus/handler.clj b/src/leiningen/new/luminus/handler.clj
index a360f21a..cc08cbec 100644
--- a/src/leiningen/new/luminus/handler.clj
+++ b/src/leiningen/new/luminus/handler.clj
@@ -7,6 +7,7 @@
             [taoensso.timbre :as timbre]
             [taoensso.timbre.appenders.rotor :as rotor]
             [selmer.parser :as parser]
+            [selmer.middleware :refer [wrap-error-page]]
             [environ.core :refer [env]]))
 
 (defroutes app-routes
@@ -46,7 +47,7 @@
            ;; add your application routes here
            [home-routes app-routes]
            ;; add custom middleware here
-           :middleware [middleware/template-error-page
+           :middleware [#(wrap-error-page % (env :dev))
                         middleware/log-request]
            ;; add access rules here
            :access-rules []
diff --git a/src/leiningen/new/luminus/middleware.clj b/src/leiningen/new/luminus/middleware.clj
index 4dce0771..f5f41f2d 100644
--- a/src/leiningen/new/luminus/middleware.clj
+++ b/src/leiningen/new/luminus/middleware.clj
@@ -9,16 +9,3 @@
       (timbre/debug req)
       (handler req))
     handler))
-
-(defn template-error-page [handler]
-  (if (env :dev)
-    (fn [request]
-      (try
-        (handler request)
-        (catch clojure.lang.ExceptionInfo ex
-          (let [{:keys [type error-template] :as data} (ex-data ex)]
-            (if (= :selmer-validation-error type)
-              {:status 500
-               :body (parser/render error-template data)}
-              (throw ex))))))
-    handler))
\ No newline at end of file