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

better default checked route error handlers

Browse source
This commit is contained in:
Gered 2015-02-14 21:05:22 -05:00
parent 28377f0ef2
commit bb8cd87475
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/clj_webtoolbox/routes/checked.clj
View file

@ -1,6 +1,7 @@
(ns clj-webtoolbox.routes.checked (ns clj-webtoolbox.routes.checked
"Functions and macros to assist with writing more declarative Compojure route validations." "Functions and macros to assist with writing more declarative Compojure route validations."
(:require (:require
[clojure.string :as string]
[clojure.edn :as edn] [clojure.edn :as edn]
[compojure.core :refer [routing]] [compojure.core :refer [routing]]
[ring.util.response :refer [response?]] [ring.util.response :refer [response?]]
@ -23,13 +24,21 @@
(~fail-response result#)) (~fail-response result#))
result#))) result#)))
(def default-wrap-checks-error-response (defn default-wrap-checks-error-response
(-> (response/content "Handler checks did not all pass.") [{:keys [validation-errors] :as request}]
(response/status 500))) (let [validation-errors-str (string/join "," validation-errors)]
(-> (response/content (str "Handler checks did not all pass."
(if (seq validation-errors)
(str " Errors in: " validation-errors-str))))
(response/status 500))))
(def default-check-error-response (defn default-check-error-response
(-> (response/content "Route checks did not all pass.") [{:keys [validation-errors] :as request}]
(response/status 500))) (let [validation-errors-str (string/join "," validation-errors)]
(-> (response/content (str "Route checks did not all pass."
(if (seq validation-errors)
(str " Errors in: " validation-errors-str))))
(response/status 500))))
(defmacro checked-routes (defmacro checked-routes
"Wraps a handler (e.g. subset of routes) with one or more filters (aka 'checks' or "Wraps a handler (e.g. subset of routes) with one or more filters (aka 'checks' or
@ -44,7 +53,7 @@
[checks :on-fail fail-response & body])} [checks :on-fail fail-response & body])}
[checks & body] [checks & body]
(let [has-fail-response? (= :on-fail (first body)) (let [has-fail-response? (= :on-fail (first body))
fail-response (if has-fail-response? (second body) default-wrap-checks-error-response) fail-response (if has-fail-response? (second body) `default-wrap-checks-error-response)
body (if has-fail-response? (drop 2 body) body)] body (if has-fail-response? (drop 2 body) body)]
`(fn [request#] `(fn [request#]
(let [result# (threaded-checks request# ~checks ~fail-response)] (let [result# (threaded-checks request# ~checks ~fail-response)]
@ -66,7 +75,7 @@
[:on-fail fail-response & body])} [:on-fail fail-response & body])}
[& body] [& body]
(let [has-fail-response? (= :on-fail (first body)) (let [has-fail-response? (= :on-fail (first body))
fail-response (if has-fail-response? (second body) default-check-error-response) fail-response (if has-fail-response? (second body) `default-check-error-response)
body (if has-fail-response? (drop 2 body) body)] body (if has-fail-response? (drop 2 body) body)]
`(fn [request#] `(fn [request#]
(threaded-checks request# ~body ~fail-response)))) (threaded-checks request# ~body ~fail-response))))