Merge f26dc1ab19 into 10700e0ca2

CHANGELOG.md

@@ -16,7 +16,6 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 * Allow multimethods as handlers when validating [#755](https://github.com/metosin/reitit/pull/755)
 * Improve error reporting when generating OpenAPI fails [#754](https://github.com/metosin/reitit/pull/754)
-* Allow middleware registry to be used when defining middleware in `ring-handler`. See [docs](./doc/ring/middleware_registry.md). [#739](https://github.com/metosin/reitit/pull/739)
 
 ## 0.9.1 (2025-05-27)
 

doc/ring/middleware_registry.md

@@ -2,7 +2,7 @@
 
 The `:middleware` syntax in `reitit-ring` also supports Keywords. Keywords are looked up from the Middleware Registry, which is a map of `keyword => IntoMiddleware`. Middleware registry should be stored under key `:reitit.middleware/registry` in the router options. If a middleware keyword isn't found in the registry, router creation fails fast with a descriptive error message.
 
-## Examples
+## Examples 
 
 Application using middleware defined in the Middleware Registry:
 
@@ -52,20 +52,6 @@ Router creation fails fast if the registry doesn't contain the middleware:
 ;| :bonus | reitit.ring_test$wrap_bonus@59fddabb |
 ```
 
-Middleware defined in the registry can also be used on the `ring-handler` level:
-
-```clj
-(def app
-  (ring/ring-handler
-    (ring/router
-      ["/api"
-       ["/bonus" {:get (fn [{:keys [bonus]}]
-                         {:status 200, :body {:bonus bonus}})}]]
-      {::middleware/registry {:bonus wrap-bonus}})
-    nil
-    {:middleware [[:bonus 15]]}))
-```
-
 ## When to use the registry?
 
 Middleware as Keywords helps to keep the routes (all but handlers) as literal data (i.e. data that evaluates to itself), enabling the routes to be persisted in external formats like EDN-files and databases. Duct is a good example, where the [middleware can be referenced from EDN-files](https://github.com/duct-framework/duct/wiki/Configuration). It should be easy to make Duct configuration a Middleware Registry in `reitit-ring`.

modules/reitit-ring/src/reitit/ring.cljc

@@ -370,7 +370,7 @@
   ([router default-handler {:keys [middleware inject-match? inject-router?]
                             :or {inject-match? true, inject-router? true}}]
    (let [default-handler (or default-handler (fn ([_]) ([_ respond _] (respond nil))))
-         wrap (if middleware #(middleware/chain middleware % nil (r/options router)) identity)
+         wrap (if middleware (partial middleware/chain middleware) identity)
          enrich-request (create-enrich-request inject-match? inject-router?)
          enrich-default-request (create-enrich-default-request inject-router?)]
      (with-meta

test/cljc/reitit/ring_test.cljc

@@ -114,25 +114,6 @@
         (is (= {:status 200, :body [:top :api :ok]}
                (app {:uri "/api/get" :request-method :get}))))))
 
-  (testing "middleware from registry"
-    (let [router (ring/router
-                  ["/api" {:middleware [:mw-foo]}
-                   ["/get" {:middleware [[:mw :inner]]
-                            :get handler}]]
-                  {::middleware/registry {:mw mw
-                                          :mw-foo #(mw % :foo)}})
-          app (ring/ring-handler router nil {:middleware [[:mw :top]]})]
-
-      (testing "router can be extracted"
-        (is (= router (ring/get-router app))))
-
-      (testing "not found"
-        (is (= nil (app {:uri "/favicon.ico"}))))
-
-      (testing "on match"
-        (is (= {:status 200, :body [:top :foo :inner :ok]}
-               (app {:uri "/api/get" :request-method :get}))))))
-
   (testing "named routes"
     (let [router (ring/router
                   [["/api"
@@ -762,7 +743,7 @@
                    (is (= (redirect "/docs/index.html") response)))
                  (let [response (app (request "/foobar"))]
                    (is (= 404 (:status response)))))))
-
+           
            (testing "with additional mime types"
              (let [app (ring/ring-handler
                         (ring/router