gered/blarg
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

reorganize 'render' functions a bit. added a 'render-response' function to allow using these in lower-level ring handlers/middleware (so all template rendering / http status handling happens in one place more or less)

Browse source
This commit is contained in:
Gered 2014-03-24 19:15:38 -04:00
parent 1f16054710
commit 3e365757cc
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/blarg/handler.clj
View file

@ -11,6 +11,7 @@
(:require [noir.util.middleware :refer [app-handler]] (:require [noir.util.middleware :refer [app-handler]]
[noir.response :as resp] [noir.response :as resp]
[compojure.route :as route] [compojure.route :as route]
[compojure.response :refer [render]]
[taoensso.timbre :as timbre] [taoensso.timbre :as timbre]
[taoensso.timbre.appenders.rotor :as rotor] [taoensso.timbre.appenders.rotor :as rotor]
[selmer.parser :as parser] [selmer.parser :as parser]
@ -19,7 +20,7 @@
(defroutes app-routes (defroutes app-routes
(route/resources "/") (route/resources "/")
(route/not-found (layout/render "notfound.html"))) (layout/render-handler "notfound.html" :status 404))
(defn init [] (defn init []
(timbre/set-config! (timbre/set-config!
@ -52,9 +53,11 @@
(handler request) (handler request)
(catch Throwable e (catch Throwable e
(timbre/error e) (timbre/error e)
{:status 500 (layout/render-response
:headers {"Content-Type" "text/html"} request
:body (layout/render-template request "error.html" {:error-info e})})))) "error.html"
:params {:error-info e}
:status 500)))))
(def app (app-handler (def app (app-handler
[auth-routes home-routes posts-routes files-routes rss-routes app-routes] [auth-routes home-routes posts-routes files-routes rss-routes app-routes]

18
src/blarg/views/layout.clj
View file

@ -7,21 +7,27 @@
(def template-path "blarg/views/templates/") (def template-path "blarg/views/templates/")
(defn render-template [request template params] (defn- render-template [request template params]
(parser/render-file (parser/render-file
(str template-path template) (str template-path template)
(assoc params (assoc params
:context (:context request) :context (:context request)
:user-id (session/get :user)))) :user-id (session/get :user))))
(deftype RenderableTemplate [template params status content-type] (defn render-response [request template & {:keys [params status content-type]}]
Renderable
(render [this request]
(-> (render-template request template params) (-> (render-template request template params)
(resp/response) (resp/response)
(resp/content-type (or content-type "text/html; charset=utf-8")) (resp/content-type (or content-type "text/html; charset=utf-8"))
(resp/status (or status 200))))) (resp/status (or status 200))))
(defn render-handler [template & {:keys [params status content-type]}]
(fn [request]
(render-response request template :params params :status status :content-type content-type)))
(deftype RenderableTemplate [template params status content-type]
Renderable
(render [this request]
(render-response request template :params params :status status :content-type content-type)))
(defn render [template & {:keys [params status content-type]}] (defn render [template & {:keys [params status content-type]}]
(RenderableTemplate. template params status content-type)) (RenderableTemplate. template params status content-type))