luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-18 08:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

read encodes and decodes from Muuntaja!

Browse source
This commit is contained in:
Tommi Reiman 2018-07-21 14:51:47 +03:00
parent 10ccbb72e3
commit b54ee1a86b
4 changed files with 73 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/reitit-middleware/src/reitit/ring/middleware/alpha/muuntaja.cljc
View file

@ -12,6 +12,6 @@
(if options
(let [m (m/create options)]
{:data {:swagger {:produces (m/encodes m)
:consumes (m/encodes m)}}
:consumes (m/decodes m)}}
:wrap (fn [handler]
(muuntaja.middleware/wrap-format handler m))}))))}))

3
modules/reitit-swagger/src/reitit/swagger.cljc
View file

@ -81,10 +81,11 @@
(merge {:swagger "2.0"
:x-id ids}))
accept-route #(-> % second :swagger :id (or ::default) ->set (set/intersection ids) seq)
transform-endpoint (fn [[method {{:keys [coercion no-doc swagger] :as data} :data}]]
transform-endpoint (fn [[method {{:keys [coercion no-doc swagger] :as data} :data middleware :middleware}]]
(if (and data (not no-doc))
[method
(meta-merge
(apply meta-merge (keep (comp :swagger :data) middleware))
(if coercion
(coercion/-get-apidocs coercion :swagger data))
(select-keys data [:tags :summary :description])

70
test/clj/reitit/ring/middleware/muuntaja_test.clj
View file

@ -2,7 +2,9 @@
(:require [clojure.test :refer [deftest testing is]]
[reitit.ring :as ring]
[reitit.ring.middleware.alpha.muuntaja :as muuntaja]
[muuntaja.core :as m]))
[muuntaja.core :as m]
[reitit.swagger :as swagger]
[reitit.core :as r]))
(deftest muuntaja-test
(let [data {:kikka "kukka"}
@ -15,4 +17,68 @@
:body
(m/decode m/instance "application/json"))))))
;; TODO: test swagger!
(deftest muuntaja-swagger-test
(let [with-defaults m/instance
no-edn-decode (m/create (-> m/default-options (update-in [:formats "application/edn"] dissoc :decoder)))
just-edn (m/create (-> m/default-options (m/select-formats ["application/edn"])))
app (ring/ring-handler
(ring/router
[["/defaults"
{:get identity}]
["/explicit-defaults"
{:muuntaja with-defaults
:get identity}]
["/no-edn-decode"
{:muuntaja no-edn-decode
:get identity}]
["/just-edn"
{:muuntaja just-edn
:get identity}]
["/swagger.json"
{:get {:no-doc true
:handler (swagger/create-swagger-handler)}}]]
{:data {:middleware [(muuntaja/create-format-middleware)]}}))
spec (fn [path]
(let [path (keyword path)]
(-> {:request-method :get :uri "/swagger.json"}
(app) :body
(->> (m/decode m/instance "application/json"))
:paths path :get)))
produces (comp set :produces spec)
consumes (comp set :consumes spec)]
(testing "with defaults"
(let [path "/defaults"]
(is (= #{"application/json"
"application/transit+msgpack"
"application/transit+json"
"application/edn"}
(produces path)
(consumes path)))))
(testing "with explicit muuntaja defaults"
(let [path "/explicit-defaults"]
(is (= #{"application/json"
"application/transit+msgpack"
"application/transit+json"
"application/edn"}
(produces path)
(consumes path)))))
(testing "without edn decode"
(let [path "/no-edn-decode"]
(is (= #{"application/json"
"application/transit+msgpack"
"application/transit+json"
"application/edn"}
(produces path)))
(is (= #{"application/json"
"application/transit+msgpack"
"application/transit+json"}
(consumes path)))))
(testing "just edn"
(let [path "/just-edn"]
(is (= #{"application/edn"}
(produces path)
(consumes path)))))))

4
test/cljc/reitit/swagger_test.clj
View file

@ -180,5 +180,5 @@
:handler (swagger/create-swagger-handler)}}]]))]
(is (= ["/ping"] (spec-paths app "/swagger.json")))
(is (= #{::swagger/default}
(-> {:request-method :get :uri "/swagger.json"}
(app) :body :x-id)))))
(-> {:request-method :get :uri "/swagger.json"}
(app) :body :x-id)))))