luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2026-01-28 17:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dep

Browse source
This commit is contained in:
Tommi Reiman 2019-12-28 09:40:09 +02:00
parent d00c327f5c
commit fa0c00c5b2
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/ring-malli-swagger/src/example/server.clj
View file

@ -70,7 +70,7 @@
;;:reitit.spec/wrap spell/closed ;; strict top-level validation ;;:reitit.spec/wrap spell/closed ;; strict top-level validation
:exception pretty/exception :exception pretty/exception
:data {:coercion (reitit.coercion.malli/create :data {:coercion (reitit.coercion.malli/create
{:error-keys #{:type :coercion :in :humanized #_:schema #_:value #_:transformed #_:errors}}) {:error-keys #{#_:type :coercion :in :humanized :schema :value #_:transformed #_:errors}})
:muuntaja m/instance :muuntaja m/instance
:middleware [;; swagger feature :middleware [;; swagger feature
swagger/swagger-feature swagger/swagger-feature

5
modules/reitit-malli/src/reitit/coercion/malli.cljc
View file

@ -26,6 +26,7 @@
(def default-transformer (def default-transformer
mt/strip-extra-keys-transformer) mt/strip-extra-keys-transformer)
;; TODO: are these needed?
(defmulti coerce-response? identity :default ::default) (defmulti coerce-response? identity :default ::default)
(defmethod coerce-response? ::default [_] true) (defmethod coerce-response? ::default [_] true)
@ -37,7 +38,7 @@
(m/explainer schema opts)))) (m/explainer schema opts))))
{:keys [formats default]} (transformers type) {:keys [formats default]} (transformers type)
default-coercer (->coercer default) default-coercer (->coercer default)
format-coercers (some->> (for [[f t] formats] [f (->coercer t)]) (keep second) (seq) (into {})) format-coercers (some->> (for [[f t] formats] [f (->coercer t)]) (filter second) (seq) (into {}))
get-coercer (cond format-coercers (fn [format] (or (get format-coercers format) default-coercer)) get-coercer (cond format-coercers (fn [format] (or (get format-coercers format) default-coercer))
default-coercer (constantly default-coercer))] default-coercer (constantly default-coercer))]
(if get-coercer (if get-coercer
@ -152,7 +153,7 @@
(show? :schema) (update :schema edn/write-string opts) (show? :schema) (update :schema edn/write-string opts)
(show? :errors) (-> (me/with-error-messages opts) (show? :errors) (-> (me/with-error-messages opts)
(update :errors (partial map #(update % :schema edn/write-string opts)))) (update :errors (partial map #(update % :schema edn/write-string opts))))
true (select-keys error-keys))) (seq error-keys) (select-keys error-keys)))
(-request-coercer [_ type schema] (-request-coercer [_ type schema]
(-coercer schema type transformers :decode options)) (-coercer schema type transformers :decode options))
(-response-coercer [_ schema] (-response-coercer [_ schema]

2
project.clj
View file

@ -33,7 +33,7 @@
[metosin/muuntaja "0.6.5"] [metosin/muuntaja "0.6.5"]
[metosin/jsonista "0.2.5"] [metosin/jsonista "0.2.5"]
[metosin/sieppari "0.0.0-alpha7"] [metosin/sieppari "0.0.0-alpha7"]
[metosin/malli "0.0.1-SNAPSHOT"] [metosin/malli "0.0.1-20191228.073043-6"]
[meta-merge "1.0.0"] [meta-merge "1.0.0"]
[fipp "0.6.21" :exclusions [org.clojure/core.rrb-vector]] [fipp "0.6.21" :exclusions [org.clojure/core.rrb-vector]]