luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2026-02-07 12:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ring/routes, fix async default handling

Browse source
This commit is contained in:
Tommi Reiman 2018-04-22 22:50:17 +03:00
parent f66850dacb
commit acbef8527c
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/reitit-ring/src/reitit/ring.cljc
View file

@ -15,6 +15,22 @@
[top (assoc childs k v)] [top (assoc childs k v)]
[(assoc top k v) childs])) [{} {}] data)) [(assoc top k v) childs])) [{} {}] data))
(defn routes
"Create a ring handler by combining several handlers into one."
[& handlers]
(let [single-arity (apply some-fn handlers)]
(fn
([request]
(single-arity request))
([request respond raise]
(letfn [(f [handlers]
(if (seq handlers)
(let [handler (first handlers)
respond' #(if % (respond %) (f (rest handlers)))]
(handler request respond' raise))
(respond nil)))]
(f handlers))))))
(defn create-default-handler (defn create-default-handler
"A default ring handler that can handle the following cases, "A default ring handler that can handle the following cases,
configured via options: configured via options:
@ -81,7 +97,7 @@
(impl/fast-assoc :path-params path-params) (impl/fast-assoc :path-params path-params)
(impl/fast-assoc ::r/match match) (impl/fast-assoc ::r/match match)
(impl/fast-assoc ::r/router router))] (impl/fast-assoc ::r/router router))]
(handler request respond raise)) ((routes handler default-handler) request respond raise))
(default-handler request respond raise)))) (default-handler request respond raise))))
{::r/router router})))) {::r/router router}))))

6
test/cljc/reitit/ring_test.cljc
View file

@ -17,7 +17,7 @@
(defn handler (defn handler
([{:keys [::mw]}] ([{:keys [::mw]}]
{:status 200 :body (conj mw :ok)}) {:status 200 :body (conj mw :ok)})
([request respond raise] ([request respond _]
(respond (handler request)))) (respond (handler request))))
(deftest ring-router-test (deftest ring-router-test
@ -227,11 +227,11 @@
(app {:request-method :post, :uri "/ping"} respond raise) (app {:request-method :post, :uri "/ping"} respond raise)
(is (= 405 (:status (respond)))) (is (= 405 (:status (respond))))
(is (= ::nil (raise))))) (is (= ::nil (raise)))))
(testing "if handler rejects, nil in still returned." (testing "if handler rejects"
(let [respond (promise) (let [respond (promise)
raise (promise)] raise (promise)]
(app {:request-method :get, :uri "/pong"} respond raise) (app {:request-method :get, :uri "/pong"} respond raise)
(is (= nil (respond))) (is (= 406 (:status (respond))))
(is (= ::nil (raise)))))))))) (is (= ::nil (raise))))))))))
(deftest middleware-transform-test (deftest middleware-transform-test