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

Change default-options-handler to default-options-resource

Browse source 
To make the options resource more customizable.
This commit is contained in:
Caio Oliveira 2020-04-11 20:39:35 -04:00
parent c5dc91af89
commit 5796df494e
No known key found for this signature in database
GPG key ID: 45C322D391B0CA40
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,11 @@
(update acc method expand opts)
acc)) data http-methods)])
(defn compile-result [[path data] {::keys [default-options-handler] :as opts}]
(defn compile-result [[path data] {::keys [default-options-resource] :as opts}]
(let [[top childs] (group-keys data)
childs (cond-> childs
(and (not (:options childs)) (not (:handler top)) default-options-handler)
(assoc :options {:no-doc true, :handler default-options-handler}))
(and (not (:options childs)) (not (:handler top)) default-options-resource)
(assoc :options default-options-resource))
->endpoint (fn [p d m s]
(-> (middleware/compile-result [p d] opts s)
(map->Endpoint)
@ -65,6 +65,10 @@
([request respond _]
(respond (handle request))))))
(def default-options-resource
{:no-doc true
:handler default-options-handler})
;;
;; public api
;;
@ -74,11 +78,11 @@
support for http-methods and Middleware. See documentation on [[reitit.core/router]] for
available options. In addition, the following options are available:
| key | description
| ---------------------------------------|-------------
| `:reitit.middleware/transform` | Function or vector of functions of type `[Middleware] => [Middleware]` to transform the expanded Middleware (default: identity)
| `:reitit.middleware/registry` | Map of `keyword => IntoMiddleware` to replace keyword references into Middleware
| `:reitit.ring/default-options-handler` | Default handler for `:options` method in endpoints (default: default-options-handler)
| key | description
| ----------------------------------------|-------------
| `:reitit.middleware/transform` | Function or vector of functions of type `[Middleware] => [Middleware]` to transform the expanded Middleware (default: identity)
| `:reitit.middleware/registry` | Map of `keyword => IntoMiddleware` to replace keyword references into Middleware
| `:reitit.ring/default-options-resource` | Default resource for `:options` method in endpoints (default: default-options-resource)
Example:
@ -91,9 +95,10 @@
([data]
(router data nil))
([data opts]
(let [opts (merge {:coerce coerce-handler
:compile compile-result
::default-options-handler default-options-handler} opts)]
(let [opts (merge {:coerce coerce-handler
:compile compile-result
::default-options-resource default-options-resource}
opts)]
(r/router data opts))))
(defn routes

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

@ -241,7 +241,7 @@
[["/get" {:get (constantly response)}]
["/options" {:options (constantly response)}]
["/any" (constantly response)]]
{::ring/default-options-handler nil}))]
{::ring/default-options-resource nil}))]
(testing "endpoint with a non-options handler"
(is (= response (app {:request-method :get, :uri "/get"})))