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

allow alternate param parents to be specified. allow nested params.

Browse source
This commit is contained in:
Gered 2015-01-04 23:31:24 -05:00
parent a5010e423e
commit 4fb8b7a002
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,23 +72,41 @@
(defn safe (defn safe
"Marks one or more parameters as safe (copying them from the request's :params "Marks one or more parameters as safe (copying them from the request's :params
map to :safe-params)." map to :safe-params). The params argument is a vector of keywords referring
[request & params] to parameters to be marked as safe. Each parameter itself can refer to a nested
(let [safe-params (select-keys (:params request) params)] value by specifying the parameter as another vector of keywords. All params are
(update-in request [:safe-params] merge safe-params))) assumed to be located under :params in the request unless otherwise specified
via parent."
([request params] (safe request :params params))
([request parent params]
(reduce
(fn [request param]
(let [src-k (if (sequential? param) (concat [parent] param) [parent param])
dst-k (if (sequential? param) (concat [:safe-params] param) [:safe-params param])]
(assoc-in request dst-k (get-in request src-k))))
request
params)))
(defn validate (defn validate
"Validates the specified parameter using function f which gets passed the value "Validates the specified parameter using function f which gets passed the value
of the parameter and any additional arguments given. If f returns a 'truthy' value of the parameter. If f returns a 'truthy' value the parameter is marked safe.
the parameter is marked safe." A nested parameter can be checked by specifying it as a vector of keywords.
[request param f & args] Parameters are assumed to be located under :params in the request unless
(if (apply f (get-in request [:params param]) args) otherwise specified via parent."
(safe request param))) ([request param f] (validate request :params param f))
([request parent param f]
(let [k (if (sequential? param) (concat [parent] param) [parent param])]
(if (f (get-in request k))
(safe request parent [param])))))
(defn transform (defn transform
"Transforms the specified parameter using function f which gets passed the value "Transforms the specified parameter using function f which gets passed the value
of the parameter and any additional arguments given. Note that this does not of the parameter. A nested parameter can be transformed by specifying it as a
mark a parameter safe after transformation. This is intended to be used to vector of keywords. Parameters are assumed to be located under :params in the
perform any pre-validation transformations if necessary." request unless otherwise specified via parent. Note that this does not mark a
[request param f & args] parameter safe after transformation. This is intended to be used to perform any
(apply update-in request [:params param] f args)) pre-validation transformations if necessary."
([request param f] (transform request :params param f))
([request parent param f]
(let [k (if (sequential? param) (concat [parent] param) [parent param])]
(update-in request k f))))