doc: update CHANGELOG.md

feat: support humanize options

.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+on:
+  release:
+    types:
+      - published # reacts to releases and prereleases, but not their drafts
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - name: "Setup Java"
+      uses: actions/setup-java@v5
+      with:
+        distribution: zulu
+        java-version: 11
+    - name: "Setup Clojure"
+      uses: DeLaGuardo/setup-clojure@master
+      with:
+        lein: 2.9.5
+    - name: Deploy to Clojars
+      run: ./scripts/lein-modules do clean, deploy clojars
+      env:
+        CLOJARS_USERNAME: metosinci
+        CLOJARS_PASSWORD: "${{ secrets.CLOJARS_DEPLOY_TOKEN }}"

CHANGELOG.md

@@ -12,6 +12,32 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
+## UNRELEASED
+
+* Improve & document how response schemas get picked in per-content-type coercion. See [docs](./doc/ring/coercion.md#per-content-type-coercion). [#745](https://github.com/metosin/reitit/issues/745).
+* **BREAKING** Remove unused `reitit.dependency` ns. [#763](https://github.com/metosin/reitit/pull/763)
+* Support passing options to malli humanize. See [docs](./doc/coercion/malli_coercion.md). [#467](https://github.com/metosin/reitit/issues/467)
+
+## 0.9.2 (2025-10-28)
+
+* 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)
+* Allow passing options (eg. `:malli.transform/add-optional-keys`) to malli's `default-value-transformer`. See [docs](./doc/coercion/malli_coercion.md). [#756](https://github.com/metosin/reitit/pull/756)
+* **FIX**: `match-by-name!` returning `nil` instead of throwing an exception for some partial matches [#758](https://github.com/metosin/reitit/issues/758)
+* Updated dependencies:
+
+```
+[com.fasterxml.jackson.core/jackson-core "2.20.0"] is available but we use "2.18.2"
+[com.fasterxml.jackson.core/jackson-databind "2.20.0"] is available but we use "2.18.2"
+[compojure "1.7.2"] is available but we use "1.7.1"
+[fipp "0.6.29"] is available but we use "0.6.27"
+[metosin/malli "0.19.2"] is available but we use "0.18.0"
+[ring "1.15.3"] is available but we use "1.14.1"
+[ring/ring-core "1.15.3"] is available but we use "1.14.1"
+[ring/ring-defaults "0.7.0"] is available but we use "0.6.0"
+```
+
 ## 0.9.1 (2025-05-27)
 
 * **FIX**: response coercion threw an exception for unlisted HTTP status codes if there was no `:default`. Broken in 0.9.0. [#742](https://github.com/metosin/reitit/issues/742)

README.md

@@ -66,7 +66,7 @@ modules will continue to be released under `metosin` for compatibility purposes.
 All main modules bundled:
 
 ```clj
-[metosin/reitit "0.9.1"]
+[metosin/reitit "0.9.2"]
 ```
 
 Optionally, the parts can be required separately.

doc/README.md

@@ -41,7 +41,7 @@ There is [#reitit](https://clojurians.slack.com/messages/reitit/) in [Clojurians
 All bundled:
 
 ```clj
-[metosin/reitit "0.9.1"]
+[metosin/reitit "0.9.2"]
 ```
 
 Optionally, the parts can be required separately.

doc/basics/error_messages.md

@@ -22,7 +22,7 @@ The default exception formatting uses `reitit.exception/exception`. It produces
 ## Pretty Errors
 
 ```clj
-[metosin/reitit-dev "0.9.1"]
+[metosin/reitit-dev "0.9.2"]
 ```
 
 For human-readable and developer-friendly exception messages, there is `reitit.dev.pretty/exception` (in the `reitit-dev` module). It is inspired by the lovely errors messages of [ELM](https://elm-lang.org/blog/compiler-errors-for-humans) and [ETA](https://twitter.com/jyothsnasrin/status/1037703436043603968) and uses [fipp](https://github.com/brandonbloom/fipp), [expound](https://github.com/bhb/expound) and [spell-spec](https://github.com/bhauman/spell-spec) for most of heavy lifting.

doc/coercion/malli_coercion.md

@@ -73,9 +73,10 @@ Using `create` with options to create the coercion instead of `coercion`:
   {:transformers {:body {:default reitit.coercion.malli/default-transformer-provider
                          :formats {"application/json" reitit.coercion.malli/json-transformer-provider}}
                   :string {:default reitit.coercion.malli/string-transformer-provider}
-                  :response {:default reitit.coercion.malli/default-transformer-provider}}
+                  :response {:default reitit.coercion.malli/default-transformer-provider
+                             :formats {"application/json" reitit.coercion.malli/json-transformer-provider}}}
    ;; set of keys to include in error messages
-   :error-keys #{:type :coercion :in :schema :value :errors :humanized #_:transformed}
+   :error-keys #{:type :coercion :in #_:schema :value #_:errors :humanized #_:transformed}
    ;; support lite syntax?
    :lite true
    ;; schema identity function (default: close all map schemas)
@@ -87,7 +88,37 @@ Using `create` with options to create the coercion instead of `coercion`:
    ;; strip-extra-keys (affects only predefined transformers)
    :strip-extra-keys true
    ;; add/set default values
+   ;; Can be false, true or a map of options to pass to malli.transform/default-value-transformer,
+   ;; for example {:malli.transform/add-optional-keys true}
    :default-values true
+   ;; encode-error
+   :encode-error nil
    ;; malli options
    :options nil})
 ```
+
+## Configuring humanize error messages
+
+Malli humanized error messages can be configured using `:options :errors`:
+
+```clj
+(reitit.coercion.malli/create
+ {:options
+  {:errors (assoc malli.error/default-errors
+                  :malli.core/missing-key {:error/message {:en "MISSING"}})}})
+```
+
+See the malli docs for more info.
+
+## Custom registry
+
+Malli registry can be configured conveniently via `:options :registry`:
+
+```clj
+(require '[malli.core :as m])
+
+(reitit.coercion.malli/create
+ {:options
+  {:registry {:registry (merge (m/default-schemas)
+                               {:my-type :string})}}})
+```

doc/development.md

@@ -25,6 +25,14 @@ clojure-lsp clean-ns
 The documentation lives under `doc` and it is hosted on [cljdoc](https://cljdoc.org). See their
 documentation for [library authors](https://github.com/cljdoc/cljdoc/blob/master/doc/userguide/for-library-authors.adoc)
 
+## Updating deps
+
+
+* `lein ancient upgrade`
+* Mention non-dev non-test dep upgrades in CHANGELOG.md
+* `npm update --save`
+* Make a PR, run CI
+
 ## Making a release
 
 We use [Break Versioning][breakver]. Remember our promise: patch-level bumps never include breaking changes!
@@ -32,29 +40,20 @@ We use [Break Versioning][breakver]. Remember our promise: patch-level bumps nev
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
 ```bash
-# Check that you're using Java 8! Making the release with a newer Java version
-# means that it is broken when used with Java 8.
-java -version
-
-# new version
+# create a release commit
 ./scripts/set-version "1.0.0"
 
-# create a release commit and a tag
-git add -u 
+# !!! update the changelog
+
+git add -u
 git commit -m "Release 1.0.0"
-git tag 1.0.0
 
-# works
-./scripts/lein-modules install
-lein test
-
-# deploy to clojars
-CLOJARS_USERNAME=*** CLOJARS_PASSWORD=*** ./scripts/lein-modules do clean, deploy clojars
-
-# push the commit and the tag
+# push the commit
 git push
-git push --tags
+
+# !!! check that tests pass on CI
 ```
 
-* Remembor to update the changelog!
+* Create a new release on github at <https://github.com/metosin/reitit/releases>
+  * This will trigger the automated release workflow <https://github.com/metosin/reitit/actions/workflows/release.yml>
 * Announce the release at least on #reitit in Clojurians.

doc/http/default_interceptors.md

@@ -1,7 +1,7 @@
 # Default Interceptors
 
 ```clj
-[metosin/reitit-interceptors "0.9.1"]
+[metosin/reitit-interceptors "0.9.2"]
 ```
 
 Just like the [ring default middleware](../ring/default_middleware.md), but for interceptors.

doc/http/interceptors.md

@@ -5,7 +5,7 @@ Reitit has also support for [interceptors](http://pedestal.io/reference/intercep
 ## Reitit-http
 
 ```clj
-[metosin/reitit-http "0.9.1"]
+[metosin/reitit-http "0.9.2"]
 ```
 
 A module for http-routing using interceptors instead of middleware. Builds on top of the [`reitit-ring`](../ring/ring.md) module having all the same features.

doc/http/pedestal.md

@@ -3,7 +3,7 @@
 [Pedestal](http://pedestal.io/) is a backend web framework for Clojure. `reitit-pedestal` provides an alternative routing engine for Pedestal.
 
 ```clj
-[metosin/reitit-pedestal "0.9.1"]
+[metosin/reitit-pedestal "0.9.2"]
 ```
 
 Why should one use reitit instead of the Pedestal [default routing](http://pedestal.io/reference/routing-quick-reference)?
@@ -26,8 +26,8 @@ A minimalistic example on how to to swap the default-router with a reitit router
 ```clj
 ; [io.pedestal/pedestal.service "0.5.5"]
 ; [io.pedestal/pedestal.jetty "0.5.5"]
-; [metosin/reitit-pedestal "0.9.1"]
-; [metosin/reitit "0.9.1"]
+; [metosin/reitit-pedestal "0.9.2"]
+; [metosin/reitit "0.9.2"]
 
 (require '[io.pedestal.http :as server])
 (require '[reitit.pedestal :as pedestal])

doc/http/sieppari.md

@@ -1,7 +1,7 @@
 # Sieppari
 
 ```clj
-[metosin/reitit-sieppari "0.9.1"]
+[metosin/reitit-sieppari "0.9.2"]
 ```
 
 [Sieppari](https://github.com/metosin/sieppari) is a new and fast interceptor implementation for Clojure, with pluggable async supporting [core.async](https://github.com/clojure/core.async), [Manifold](https://github.com/ztellman/manifold) and [Promesa](http://funcool.github.io/promesa/latest).

doc/http/transforming_interceptor_chain.md

@@ -65,7 +65,7 @@ There is an extra option in http-router (actually, in the underlying interceptor
 ### Printing Context Diffs
 
 ```clj
-[metosin/reitit-interceptors "0.9.1"]
+[metosin/reitit-interceptors "0.9.2"]
 ```
 
 Using `reitit.http.interceptors.dev/print-context-diffs` transformation, the context diffs between each interceptor are printed out to the console. To use it, add the following router option:

doc/ring/coercion.md

@@ -202,9 +202,11 @@ is:
                                                     "application/edn" {:schema {:x s/Int}}
                                                     :default {:schema {:ww s/Int}}}}}
                          :handler ...}}]]
-    {:data {:middleware [rrc/coerce-exceptions-middleware
-                         rrc/coerce-request-middleware
-                         rrc/coerce-response-middleware]}})))
+    {:data {:muuntaja muuntaja.core/instance
+            :middleware [reitit.ring.middleware.muuntaja/format-middleware
+                         reitit.ring.coercion/coerce-exceptions-middleware
+                         reitit.ring.coercion/coerce-request-middleware
+                         reitit.ring.coercion/coerce-response-middleware]}})))
 ```
 
 The resolution logic for response coercers is:
@@ -215,6 +217,17 @@ The resolution logic for response coercers is:
    3. `:body`
 3. If nothing was found, do not coerce
 
+To select the response content-type, you can either:
+1. Let muuntaja pick the content-type based on things like the request Accept header
+   - This is what most users want
+2. Set `:muuntaja/content-type` in the response to pick an explicit content type
+3. Set the `"Content-Type"` header in the response
+   - This disables muuntaja, so you need to encode your response body in some other way!
+   - This is not compatible with response schema checking, since coercion won't know what to do with the already-encoded response body.
+4. Use the `:extract-response-format` option to inject your own logic. See `reitit.coercion/extract-response-format-default` for the default.
+
+See also the [muuntaja content negotiation](./content_negotiation.md) docs.
+
 ## Pretty printing spec errors
 
 Spec problems are exposed as is in request & response coercion errors. Pretty-printers like [expound](https://github.com/bhb/expound) can be enabled like this:

doc/ring/default_middleware.md

@@ -1,7 +1,7 @@
 # Default Middleware
 
 ```clj
-[metosin/reitit-middleware "0.9.1"]
+[metosin/reitit-middleware "0.9.2"]
 ```
 
 Any Ring middleware can be used with `reitit-ring`, but using data-driven middleware is preferred as they are easier to manage and in many cases yield better performance. `reitit-middleware` contains a set of common ring middleware, lifted into data-driven middleware.

doc/ring/exceptions.md

@@ -1,7 +1,7 @@
 # Exception Handling with Ring
 
 ```clj
-[metosin/reitit-middleware "0.9.1"]
+[metosin/reitit-middleware "0.9.2"]
 ```
 
 Exceptions thrown in router creation can be [handled with custom exception handler](../basics/error_messages.md). By default, exceptions thrown at runtime from a handler or a middleware are not caught by the `reitit.ring/ring-handler`. A good practice is to have a top-level exception handler to log and format errors for clients.

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,6 +52,20 @@ 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`.

doc/ring/ring.md

@@ -5,7 +5,7 @@
 Read more about the [Ring Concepts](https://github.com/ring-clojure/ring/wiki/Concepts).
 
 ```clj
-[metosin/reitit-ring "0.9.1"]
+[metosin/reitit-ring "0.9.2"]
 ```
 
 ## `reitit.ring/router`

doc/ring/swagger.md

@@ -1,7 +1,7 @@
 # Swagger Support
 
 ```
-[metosin/reitit-swagger "0.9.1"]
+[metosin/reitit-swagger "0.9.2"]
 ```
 
 Reitit supports [Swagger2](https://swagger.io/) documentation, thanks to [schema-tools](https://github.com/metosin/schema-tools) and [spec-tools](https://github.com/metosin/spec-tools). Documentation is extracted from route definitions, coercion `:parameters` and `:responses` and from a set of new documentation keys.
@@ -47,7 +47,7 @@ If you need to post-process the generated spec, just wrap the handler with a cus
 [Swagger-ui](https://github.com/swagger-api/swagger-ui) is a user interface to visualize and interact with the Swagger specification. To make things easy, there is a pre-integrated version of the swagger-ui as a separate module.
 
 ```
-[metosin/reitit-swagger-ui "0.9.1"]
+[metosin/reitit-swagger-ui "0.9.2"]
 ```
 
 `reitit.swagger-ui/create-swagger-ui-handler` can be used to create a ring-handler to serve the swagger-ui. It accepts the following options:

doc/ring/transforming_middleware_chain.md

@@ -59,7 +59,7 @@ There is an extra option in the Ring router (actually, in the underlying middlew
 ### Printing Request Diffs
 
 ```clj
-[metosin/reitit-middleware "0.9.1"]
+[metosin/reitit-middleware "0.9.2"]
 ```
 
 Using `reitit.ring.middleware.dev/print-request-diffs` transformation, the request diffs between each middleware are printed out to the console. To use it, add the following router option:

examples/buddy-auth/project.clj

@@ -2,6 +2,6 @@
   :description "Reitit Buddy Auth App"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [buddy "2.0.0"]]
   :repl-options {:init-ns example.server})

examples/frontend-auth/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-schema "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-schema "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/frontend-controllers/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-schema "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-schema "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/frontend-links/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.10.520"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-spec "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-spec "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/frontend-malli/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-malli "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-malli "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/frontend-prompt/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-spec "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-spec "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/frontend-re-frame/project.clj

@@ -1,7 +1,7 @@
 (defproject frontend-re-frame "0.1.0-SNAPSHOT"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [reagent "1.2.0"]
                  [re-frame "0.10.6"]
                  [cljsjs/react "17.0.2-0"]

examples/frontend/project.clj

@@ -10,9 +10,9 @@
                  [ring "1.12.1"]
                  [hiccup "1.0.5"]
                  [org.clojure/clojurescript "1.11.132"]
-                 [metosin/reitit "0.9.1"]
-                 [metosin/reitit-spec "0.9.1"]
-                 [metosin/reitit-frontend "0.9.1"]
+                 [metosin/reitit "0.9.2"]
+                 [metosin/reitit-spec "0.9.2"]
+                 [metosin/reitit-frontend "0.9.2"]
                  [cljsjs/react "17.0.2-0"]
                  [cljsjs/react-dom "17.0.2-0"]
                  ;; Just for pretty printting the match

examples/http-swagger/project.clj

@@ -3,6 +3,6 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
                  [aleph "0.7.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [metosin/ring-swagger-ui "5.9.0"]]
   :repl-options {:init-ns example.server})

examples/http/project.clj

@@ -5,5 +5,5 @@
                  [funcool/promesa "11.0.678"]
                  [manifold "0.4.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns example.server})

examples/just-coercion-with-ring/project.clj

@@ -2,4 +2,4 @@
   :description "Reitit coercion with vanilla ring"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]])
+                 [metosin/reitit "0.9.2"]])

examples/openapi/project.clj

@@ -3,7 +3,7 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [metosin/jsonista "0.3.8"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [metosin/ring-swagger-ui "5.9.0"]]
   :repl-options {:init-ns example.server}
   :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}})

examples/openapi/src/example/server.clj

@@ -52,23 +52,34 @@
         {:get {:summary "Fetch a pizza | Multiple content-types, multiple examples"
                :responses {200 {:description "Fetch a pizza as json or EDN"
                                 :content {"application/json" {:schema [:map
+                                                                       [:format [:enum :json]]
                                                                        [:color :keyword]
                                                                        [:pineapple :boolean]]
                                                               :examples {:white {:description "White pizza with pineapple"
-                                                                                 :value {:color :white
+                                                                                 :value {:format :json
+                                                                                         :color :white
                                                                                          :pineapple true}}
                                                                          :red {:description "Red pizza"
-                                                                               :value {:color :red
+                                                                               :value {:format :json
+                                                                                       :color :red
                                                                                        :pineapple false}}}}
                                           "application/edn" {:schema [:map
+                                                                      [:format [:enum :edn]]
                                                                       [:color :keyword]
                                                                       [:pineapple :boolean]]
                                                              :examples {:red {:description "Red pizza with pineapple"
-                                                                              :value (pr-str {:color :red :pineapple true})}}}}}}
+                                                                              :value (pr-str {:format :edn :color :red :pineapple true})}}}}}}
                :handler (fn [_request]
-                          {:status 200
-                           :body {:color :red
-                                  :pineapple true}})}
+                          (rand-nth [{:status 200
+                                      :muuntaja/content-type "application/json"
+                                      :body {:format :json
+                                             :color :red
+                                             :pineapple true}}
+                                     {:status 200
+                                      :muuntaja/content-type "application/edn"
+                                      :body {:format :edn
+                                             :color :red
+                                             :pineapple true}}]))}
          :post {:summary "Create a pizza | Multiple content-types, multiple examples | Default response schema"
                 :request {:description "Create a pizza using json or EDN"
                           :content {"application/json" {:schema [:map

examples/pedestal-malli-swagger/project.clj

@@ -3,7 +3,7 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [io.pedestal/pedestal.service "0.6.3"]
                  [io.pedestal/pedestal.jetty "0.6.3"]
-                 [metosin/reitit-malli "0.9.1"]
-                 [metosin/reitit-pedestal "0.9.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit-malli "0.9.2"]
+                 [metosin/reitit-pedestal "0.9.2"]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns server})

examples/pedestal-swagger/project.clj

@@ -3,6 +3,6 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [io.pedestal/pedestal.service "0.6.3"]
                  [io.pedestal/pedestal.jetty "0.6.3"]
-                 [metosin/reitit-pedestal "0.9.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit-pedestal "0.9.2"]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns example.server})

examples/pedestal/project.clj

@@ -3,6 +3,6 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [io.pedestal/pedestal.service "0.6.3"]
                  [io.pedestal/pedestal.jetty "0.6.3"]
-                 [metosin/reitit-pedestal "0.9.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit-pedestal "0.9.2"]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns example.server})

examples/ring-example/project.clj

@@ -2,5 +2,5 @@
   :description "Reitit Ring App"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns example.server})

examples/ring-integrant/project.clj

@@ -2,7 +2,7 @@
   :description "Reitit Ring App with Integrant"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [integrant "0.8.1"]]
   :main example.server
   :repl-options {:init-ns user}

examples/ring-malli-lite-swagger/project.clj

@@ -3,6 +3,6 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [metosin/jsonista "0.3.8"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]]
+                 [metosin/reitit "0.9.2"]]
   :repl-options {:init-ns example.server}
   :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}})

examples/ring-malli-swagger/project.clj

@@ -3,7 +3,7 @@
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [metosin/jsonista "0.3.8"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [metosin/ring-swagger-ui "5.9.0"]]
   :repl-options {:init-ns example.server}
   :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}})

examples/ring-spec-swagger/project.clj

@@ -2,7 +2,7 @@
   :description "Reitit Ring App with Swagger"
   :dependencies [[org.clojure/clojure "1.11.2"]
                  [ring/ring-jetty-adapter "1.12.1"]
-                 [metosin/reitit "0.9.1"]
+                 [metosin/reitit "0.9.2"]
                  [metosin/ring-swagger-ui "5.9.0"]]
   :repl-options {:init-ns example.server}
   :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}})

modules/reitit-core/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-core "0.9.1"
+(defproject metosin/reitit-core "0.9.2"
   :description "Snappy data-driven router for Clojure(Script)"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-core/src/reitit/coercion.cljc

@@ -152,8 +152,10 @@
          rcs (request-coercers coercion parameters (cond-> opts route-request (assoc ::skip #{:body})))]
      (if (and crc rcs) (into crc (vec rcs)) (or crc rcs)))))
 
-(defn extract-response-format-default [request _]
-  (-> request :muuntaja/response :format))
+(defn extract-response-format-default [request response]
+  (or (get-in response [:headers "Content-Type"])
+      (:muuntaja/content-type response)
+      (-> request :muuntaja/response :format)))
 
 (defn -format->coercer [coercion {:keys [content body]} _opts]
   (->> (concat (when body

modules/reitit-core/src/reitit/dependency.cljc

@@ -1,52 +0,0 @@
-(ns reitit.dependency
-  "Dependency resolution for middleware/interceptors."
-  (:require [reitit.exception :as exception]))
-
-(defn- providers
-  "Map from provision key to provider. `get-provides` should return the provision keys of a dependent."
-  [get-provides nodes]
-  (reduce (fn [acc dependent]
-            (into acc
-                  (map (fn [provide]
-                         (when (contains? acc provide)
-                           (exception/fail!
-                            (str "multiple providers for: " provide)
-                            {::multiple-providers provide}))
-                         [provide dependent]))
-                  (get-provides dependent)))
-          {} nodes))
-
-(defn- get-provider
-  "Get the provider for `k`, throw if no provider can be found for it."
-  [providers k]
-  (if (contains? providers k)
-    (get providers k)
-    (exception/fail!
-     (str "provider missing for dependency: " k)
-     {::missing-provider k})))
-
-(defn post-order
-  "Put `nodes` in post-order. Can also be described as a reverse topological sort.
-  `get-provides` and `get-requires` are callbacks that you can provide to compute the provide and depend
-  key sets of nodes, the defaults are `:provides` and `:requires`."
-  ([nodes] (post-order :provides :requires nodes))
-  ([get-provides get-requires nodes]
-   (let [providers-by-key (providers get-provides nodes)]
-     (letfn [(toposort [node path colors]
-               (case (get colors node)
-                 :white (let [requires (get-requires node)
-                              [nodes* colors] (toposort-seq (map (partial get-provider providers-by-key) requires)
-                                                            (conj path node)
-                                                            (assoc colors node :grey))]
-                          [(conj nodes* node)
-                           (assoc colors node :black)])
-                 :grey (exception/fail! "circular dependency" {:cycle (drop-while #(not= % node) (conj path node))})
-                 :black [() colors]))
-
-             (toposort-seq [nodes path colors]
-               (reduce (fn [[nodes* colors] node]
-                         (let [[nodes** colors] (toposort node path colors)]
-                           [(into nodes* nodes**) colors]))
-                       [[] colors] nodes))]
-
-       (first (toposort-seq nodes [] (zipmap nodes (repeat :white))))))))

modules/reitit-core/src/reitit/impl.cljc

@@ -198,9 +198,8 @@
     (:path route)))
 
 (defn throw-on-missing-path-params [template required path-params]
-  (when-not (every? #(contains? path-params %) required)
-    (let [defined (-> path-params keys set)
-          missing (set/difference required defined)]
+  (let [missing (set (remove #(get path-params %) required))]
+    (when-not (empty? missing)
       (ex/fail!
        (str "missing path-params for route " template " -> " missing)
        {:path-params path-params, :required required}))))

modules/reitit-core/src/reitit/spec.cljc

@@ -37,8 +37,11 @@
 ;; Default data
 ;;
 
+(defn -multi? [x]
+  (instance? #?(:clj clojure.lang.MultiFn :cljs cljs.core.MultiFn) x))
+
 (s/def ::name keyword?)
-(s/def ::handler (s/or :fn fn? :var var?))
+(s/def ::handler (s/or :fn fn? :var var? :multi -multi?))
 (s/def ::no-doc boolean?)
 (s/def ::conflicting boolean?)
 (s/def ::default-data

modules/reitit-dev/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-dev "0.9.1"
+(defproject metosin/reitit-dev "0.9.2"
   :description "Snappy data-driven router for Clojure(Script)"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-frontend/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-frontend "0.9.1"
+(defproject metosin/reitit-frontend "0.9.2"
   :description "Reitit: Clojurescript frontend routing core"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-http/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-http "0.9.1"
+(defproject metosin/reitit-http "0.9.2"
   :description "Reitit: HTTP routing with interceptors"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-interceptors/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-interceptors "0.9.1"
+(defproject metosin/reitit-interceptors "0.9.2"
   :description "Reitit, common interceptors bundled"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-malli/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-malli "0.9.1"
+(defproject metosin/reitit-malli "0.9.2"
   :description "Reitit: Malli coercion"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-malli/src/reitit/coercion/malli.cljc

@@ -9,8 +9,7 @@
             [malli.swagger :as swagger]
             [malli.transform :as mt]
             [malli.util :as mu]
-            [reitit.coercion :as coercion]
-            [clojure.string :as string]))
+            [reitit.coercion :as coercion]))
 
 ;;
 ;; coercion
@@ -31,7 +30,7 @@
       (mt/transformer
        (if strip-extra-keys (mt/strip-extra-keys-transformer))
        transformer
-       (if default-values (mt/default-value-transformer))))))
+       (if default-values (mt/default-value-transformer (if (map? default-values) default-values {})))))))
 
 (def string-transformer-provider (-provider (mt/string-transformer)))
 (def json-transformer-provider (-provider (mt/json-transformer)))
@@ -116,7 +115,9 @@
    :enabled true
    ;; strip-extra-keys (affects only predefined transformers)
    :strip-extra-keys true
-   ;; add/set default values
+   ;; add/set default values.
+   ;; Can be false, true or a map of options to pass to malli.transform/default-value-transformer,
+   ;; for example {:malli.transform/add-optional-keys true}
    :default-values true
    ;; encode-error
    :encode-error nil
@@ -187,7 +188,8 @@
        (-open-model [_ schema] schema)
        (-encode-error [_ error]
          (cond-> error
-           (show? :humanized) (assoc :humanized (me/humanize error {:wrap :message}))
+           (show? :humanized) (assoc :humanized (me/humanize error (cond-> {:wrap :message}
+                                                                     options (merge options))))
            (show? :schema) (update :schema edn/write-string opts)
            (show? :errors) (-> (me/with-error-messages opts)
                                (update :errors (partial map #(update % :schema edn/write-string opts))))

modules/reitit-middleware/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-middleware "0.9.1"
+(defproject metosin/reitit-middleware "0.9.2"
   :description "Reitit, common middleware bundled"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj

@@ -58,7 +58,10 @@
   "Creates a Middleware to handle the multipart params, based on
   ring.middleware.multipart-params, taking same options. Mounts only
   if endpoint has `[:parameters :multipart]` defined. Publishes coerced
-  parameters into `[:parameters :multipart]` under request."
+  parameters into `[:parameters :multipart]` under request.
+
+  Note! You want to have multipart-middleware after coerce-request-middleware,
+  because coerce-request-middleware overwrites `:parameters`."
   ([]
    (create-multipart-middleware nil))
   ([options]
@@ -69,5 +72,8 @@
   "Middleware to handle the multipart params, based on
   ring.middleware.multipart-params, taking same options. Mounts only
   if endpoint has `[:parameters :multipart]` defined. Publishes coerced
-  parameters into `[:parameters :multipart]` under request."
+  parameters into `[:parameters :multipart]` under request.
+
+  Note! You want to have multipart-middleware after coerce-request-middleware,
+  because coerce-request-middleware overwrites `:parameters`."
   (create-multipart-middleware))

modules/reitit-openapi/project.clj

@@ -1,4 +1,4 @@
-(defproject fi.metosin/reitit-openapi "0.9.1"
+(defproject fi.metosin/reitit-openapi "0.9.2"
   :description "Reitit: OpenAPI-support"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-openapi/src/reitit/openapi.clj

@@ -206,20 +206,23 @@
            accept-route (fn [route]
                           (-> route second :openapi :id (or ::default) (trie/into-set) (set/intersection ids) seq))
            definitions (volatile! {})
-           transform-endpoint (fn [[method {{:keys [coercion no-doc openapi] :as data} :data
-                                            middleware :middleware
-                                            interceptors :interceptors}]]
-                                (if (and data (not no-doc))
-                                  [method
-                                   (meta-merge
-                                    (apply meta-merge (keep (comp :openapi :data) middleware))
-                                    (apply meta-merge (keep (comp :openapi :data) interceptors))
-                                    (if coercion
-                                      (-get-apidocs-openapi coercion data definitions))
-                                    (select-keys data [:tags :summary :description])
-                                    (strip-top-level-keys openapi))]))
+           transform-endpoint (fn [path [method {{:keys [coercion no-doc openapi] :as data} :data
+                                                 middleware :middleware
+                                                 interceptors :interceptors}]]
+                                (try
+                                  (if (and data (not no-doc))
+                                    [method
+                                     (meta-merge
+                                      (apply meta-merge (keep (comp :openapi :data) middleware))
+                                      (apply meta-merge (keep (comp :openapi :data) interceptors))
+                                      (if coercion
+                                        (-get-apidocs-openapi coercion data definitions))
+                                      (select-keys data [:tags :summary :description])
+                                      (strip-top-level-keys openapi))])
+                                  (catch Throwable t
+                                    (throw (ex-info "While building openapi docs" {:path path :method method} t)))))
            transform-path (fn [[p _ c]]
-                            (if-let [endpoint (some->> c (keep transform-endpoint) (seq) (into {}))]
+                            (if-let [endpoint (some->> c (keep (partial transform-endpoint p)) (seq) (into {}))]
                               [(openapi-path p (r/options router)) endpoint]))
            map-in-order #(->> % (apply concat) (apply array-map))
            paths (->> router (r/compiled-routes) (filter accept-route) (map transform-path) map-in-order)]

modules/reitit-pedestal/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-pedestal "0.9.1"
+(defproject metosin/reitit-pedestal "0.9.2"
   :description "Reitit + Pedestal Integration"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-ring/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-ring "0.9.1"
+(defproject metosin/reitit-ring "0.9.2"
   :description "Reitit: Ring routing"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

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

@@ -298,7 +298,8 @@
      | :index-redirect?    | optional boolean: if true (default false), redirect to index file, if false serve it directly
      | :canonicalize-uris? | optional boolean: if true (default), try to serve index files for non directory paths (paths that end with slash)
      | :not-found-handler  | optional handler function to use if the requested resource is missing (404 Not Found)
-     | :mime-types         | optional map of filename extensions to mime-types that will be used to guess the content type in addition to the ones defined in ring.util.mime-type/default-mime-types"
+     | :mime-types         | optional map of filename extensions to mime-types that will be used to guess the content type in addition to the ones defined in ring.util.mime-type/default-mime-types
+     | :allow-symlinks?    | allow symlinks that lead to paths outside the root classpath directories, defaults to false"
      ([]
       (create-resource-handler nil))
      ([opts]
@@ -318,7 +319,8 @@
      | :index-redirect?    | optional boolean: if true (default false), redirect to index file, if false serve it directly
      | :canonicalize-uris? | optional boolean: if true (default), try to serve index files for non directory paths (paths that end with slash)
      | :not-found-handler  | optional handler function to use if the requested resource is missing (404 Not Found)
-     | :mime-types         | optional map of filename extensions to mime-types that will be used to guess the content type in addition to the ones defined in ring.util.mime-type/default-mime-types"
+     | :mime-types         | optional map of filename extensions to mime-types that will be used to guess the content type in addition to the ones defined in ring.util.mime-type/default-mime-types
+     | :allow-symlinks?    | allow symlinks that lead to paths outside the root classpath directories, defaults to false"
      ([]
       (create-file-handler nil))
      ([opts]
@@ -370,7 +372,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 (partial middleware/chain middleware) identity)
+         wrap (if middleware #(middleware/chain middleware % nil (r/options router)) identity)
          enrich-request (create-enrich-request inject-match? inject-router?)
          enrich-default-request (create-enrich-default-request inject-router?)]
      (with-meta

modules/reitit-schema/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-schema "0.9.1"
+(defproject metosin/reitit-schema "0.9.2"
   :description "Reitit: Plumatic Schema coercion"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-sieppari/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-sieppari "0.9.1"
+(defproject metosin/reitit-sieppari "0.9.2"
   :description "Reitit: Sieppari Interceptors"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-spec/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-spec "0.9.1"
+(defproject metosin/reitit-spec "0.9.2"
   :description "Reitit: clojure.spec coercion"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-swagger-ui/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-swagger-ui "0.9.1"
+(defproject metosin/reitit-swagger-ui "0.9.2"
   :description "Reitit: Swagger-ui support"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit-swagger/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-swagger "0.9.1"
+(defproject metosin/reitit-swagger "0.9.2"
   :description "Reitit: Swagger-support"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

modules/reitit/project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit "0.9.1"
+(defproject metosin/reitit "0.9.2"
   :description "Snappy data-driven router for Clojure(Script)"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"

package.json

@@ -2,13 +2,13 @@
   "name": "reitit",
   "private": true,
   "devDependencies": {
-    "@seriousme/openapi-schema-validator": "^2.4.0",
+    "@seriousme/openapi-schema-validator": "^2.7.0",
     "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-cli": "^2.0.0",
     "karma-cljs-test": "^0.1.0"
   },
   "dependencies": {
-    "shadow-cljs": "^2.28.22"
+    "shadow-cljs": "^3.2.1"
   }
 }

project.clj

@@ -1,4 +1,4 @@
-(defproject metosin/reitit-parent "0.9.1"
+(defproject metosin/reitit-parent "0.9.2"
   :description "Snappy data-driven router for Clojure(Script)"
   :url "https://github.com/metosin/reitit"
   :license {:name "Eclipse Public License"
@@ -6,7 +6,8 @@
   :test-paths ["test/clj" "test/cljc"]
   :deploy-repositories [["clojars" {:url "https://repo.clojars.org"
                                     :username :env/clojars_username
-                                    :password :env/clojars_password}]]
+                                    :password :env/clojars_password
+                                    :sign-releases false}]]
   :repositories [["clojars" {:url "https://repo.clojars.org"
                              :username :env/clojars_username
                              :password :env/clojars_password}]]
@@ -15,48 +16,47 @@
           :metadata {:doc/format :markdown}}
   :scm {:name "git"
         :url "https://github.com/metosin/reitit"}
-  ;; TODO: need to verify that the code actually worked with Java1.8, see #242
   ;; Ring 1.13.1 drops support for Java 1.8 so lets target 11
   :javac-options ["-Xlint:unchecked" "-target" "11" "-source" "11"]
-  :managed-dependencies [[metosin/reitit "0.9.1"]
-                         [metosin/reitit-core "0.9.1"]
-                         [metosin/reitit-dev "0.9.1"]
-                         [metosin/reitit-spec "0.9.1"]
-                         [metosin/reitit-malli "0.9.1"]
-                         [metosin/reitit-schema "0.9.1"]
-                         [metosin/reitit-ring "0.9.1"]
-                         [metosin/reitit-middleware "0.9.1"]
-                         [metosin/reitit-http "0.9.1"]
-                         [metosin/reitit-interceptors "0.9.1"]
-                         [metosin/reitit-swagger "0.9.1"]
-                         [fi.metosin/reitit-openapi "0.9.1"]
-                         [metosin/reitit-swagger-ui "0.9.1"]
-                         [metosin/reitit-frontend "0.9.1"]
-                         [metosin/reitit-sieppari "0.9.1"]
-                         [metosin/reitit-pedestal "0.9.1"]
+  :managed-dependencies [[metosin/reitit "0.9.2"]
+                         [metosin/reitit-core "0.9.2"]
+                         [metosin/reitit-dev "0.9.2"]
+                         [metosin/reitit-spec "0.9.2"]
+                         [metosin/reitit-malli "0.9.2"]
+                         [metosin/reitit-schema "0.9.2"]
+                         [metosin/reitit-ring "0.9.2"]
+                         [metosin/reitit-middleware "0.9.2"]
+                         [metosin/reitit-http "0.9.2"]
+                         [metosin/reitit-interceptors "0.9.2"]
+                         [metosin/reitit-swagger "0.9.2"]
+                         [fi.metosin/reitit-openapi "0.9.2"]
+                         [metosin/reitit-swagger-ui "0.9.2"]
+                         [metosin/reitit-frontend "0.9.2"]
+                         [metosin/reitit-sieppari "0.9.2"]
+                         [metosin/reitit-pedestal "0.9.2"]
                          [metosin/ring-swagger-ui "5.20.0"]
-                         [metosin/spec-tools "0.10.7"]
+                         [metosin/spec-tools "0.10.8"]
                          [metosin/schema-tools "0.13.1"]
                          [metosin/muuntaja "0.6.11"]
                          [metosin/jsonista "0.3.13"]
                          [metosin/sieppari "0.0.0-alpha13"]
-                         [metosin/malli "0.18.0"]
+                         [metosin/malli "0.19.2"]
 
                          ;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111
-                         [com.fasterxml.jackson.core/jackson-core "2.18.2"]
-                         [com.fasterxml.jackson.core/jackson-databind "2.18.2"]
+                         [com.fasterxml.jackson.core/jackson-core "2.20.0"]
+                         [com.fasterxml.jackson.core/jackson-databind "2.20.0"]
 
                          [meta-merge "1.0.0"]
-                         [fipp "0.6.27" :exclusions [org.clojure/core.rrb-vector]]
+                         [fipp "0.6.29" :exclusions [org.clojure/core.rrb-vector]]
                          ;; Deep-diff uses this version, override olders versiom from fipp.
                          [org.clojure/core.rrb-vector "0.2.0"]
                          [expound "0.9.0"]
                          [lambdaisland/deep-diff "0.0-47"]
                          [com.bhauman/spell-spec "0.1.2"]
                          [mvxcvi/arrangement "2.1.0"]
-                         [ring/ring-core "1.14.1"]
+                         [ring/ring-core "1.15.3"]
 
-                         [io.pedestal/pedestal.service "0.6.4"]]
+                         [io.pedestal/pedestal.service "0.6.4" :upgrade false]]
 
   :plugins [[jonase/eastwood "1.4.3"]
             ;[lein-virgil "0.1.7"]
@@ -90,25 +90,25 @@
                    :java-source-paths ["modules/reitit-core/java-src"]
 
                    :dependencies [[org.clojure/clojure "1.11.4"]
-                                  [thheller/shadow-cljs "2.28.22"]
-                                  [org.clojure/clojurescript "1.11.132"]
+                                  [thheller/shadow-cljs "3.2.1"]
+                                  [org.clojure/clojurescript "1.12.42"]
 
                                   ;; modules dependencies
                                   [metosin/schema-tools "0.13.1"]
-                                  [metosin/spec-tools "0.10.7"]
+                                  [metosin/spec-tools "0.10.8"]
                                   [metosin/muuntaja "0.6.11"]
                                   [metosin/sieppari "0.0.0-alpha13"]
                                   [metosin/jsonista "0.3.13"]
-                                  [metosin/malli "0.18.0"]
+                                  [metosin/malli "0.19.2"]
                                   [lambdaisland/deep-diff "0.0-47"]
                                   [meta-merge "1.0.0"]
                                   [com.bhauman/spell-spec "0.1.2"]
                                   [expound "0.9.0"]
-                                  [fipp "0.6.27"]
+                                  [fipp "0.6.29"]
 
                                   [orchestra "2021.01.01-1"]
 
-                                  [ring "1.14.1"]
+                                  [ring "1.15.3"]
                                   [ikitommi/immutant-web "3.0.0-alpha1"]
                                   [metosin/ring-http-response "0.9.5"]
                                   [metosin/ring-swagger-ui "5.20.0"]
@@ -117,16 +117,17 @@
                                   [criterium "0.4.6"]
                                   [org.clojure/test.check "1.1.1"]
                                   [org.clojure/tools.namespace "1.5.0"]
-                                  [com.gfredericks/test.chuck "0.2.14"]
-                                  [nubank/matcher-combinators "3.9.1"]
+                                  [com.gfredericks/test.chuck "0.2.15"]
+                                  [nubank/matcher-combinators "3.9.2"]
 
-                                  [io.pedestal/pedestal.service "0.6.4"]
+                                  ;; TODO: adapt to breaking changes in pedestal 0.7 and 0.8
+                                  [io.pedestal/pedestal.service "0.6.4" :upgrade false]
 
-                                  [org.clojure/core.async "1.7.701"]
+                                  [org.clojure/core.async "1.8.741"]
                                   [manifold "0.4.3"]
                                   [funcool/promesa "11.0.678"]
 
-                                  [com.clojure-goes-fast/clj-async-profiler "1.6.1"]
+                                  [com.clojure-goes-fast/clj-async-profiler "1.6.2"]
                                   [ring-cors "0.1.13"]
 
                                   [com.bhauman/rebel-readline "0.1.5"]]}
@@ -135,18 +136,18 @@
                                          "-Xmx4096m"
                                          "-Dclojure.compiler.direct-linking=true"]
                     :test-paths ["perf-test/clj"]
-                    :dependencies [[compojure "1.7.1"]
-                                   [ring/ring-defaults "0.6.0"]
+                    :dependencies [[compojure "1.7.2"]
+                                   [ring/ring-defaults "0.7.0"]
                                    [ikitommi/immutant-web "3.0.0-alpha1"]
-                                   [io.pedestal/pedestal.service "0.6.4"]
-                                   [io.pedestal/pedestal.jetty "0.6.4"]
+                                   [io.pedestal/pedestal.service "0.6.4" :upgrade false]
+                                   [io.pedestal/pedestal.jetty "0.6.4" :upgrade false]
                                    [calfpath "0.8.1"]
-                                   [org.clojure/core.async "1.7.701"]
+                                   [org.clojure/core.async "1.8.741"]
                                    [manifold "0.4.3"]
                                    [funcool/promesa "11.0.678"]
                                    [metosin/sieppari]
                                    [yada "1.2.16"]
-                                   [aleph "0.8.3"]
+                                   [aleph "0.9.3"]
                                    [ataraxy "0.4.3"]
                                    [bidi "2.1.6"]
                                    [janus "1.3.2"]]}

test/cljc/reitit/coercion_test.cljc

@@ -140,6 +140,36 @@
         (let [m (r/match-by-path r "/none/kikka/abba")]
           (is (= nil (coercion/coerce! m))))))))
 
+(deftest malli-query-parameter-coercion-test
+  (let [router (fn [coercion]
+                 (r/router ["/test"
+                            {:coercion coercion
+                             :parameters {:query [:map
+                                                  [:a [:string {:default "a"}]]
+                                                  [:x {:optional true} [:keyword {:default :a}]]]}}]
+                           {:compile coercion/compile-request-coercers}))]
+    (testing "default values for :optional query keys do not get added"
+      (is (= {:query {:a "a"}}
+             (-> (r/match-by-path (router reitit.coercion.malli/coercion) "/test")
+                 (assoc :query-params {})
+                 (coercion/coerce!)))))
+    (testing "default values for :optional query keys get added when :malli.transform/add-optional-keys is set"
+      (is (= {:query {:a "a" :x :a}}
+             (-> (r/match-by-path (router (reitit.coercion.malli/create
+                                           (assoc reitit.coercion.malli/default-options
+                                                  :default-values {:malli.transform/add-optional-keys true}))) "/test")
+                 (assoc :query-params {})
+                 (coercion/coerce!)))))
+    (testing "default values can be disabled"
+      (is (thrown-with-msg?
+           ExceptionInfo
+           #"Request coercion failed"
+           (-> (r/match-by-path (router (reitit.coercion.malli/create
+                                         (assoc reitit.coercion.malli/default-options
+                                                :default-values false))) "/test")
+               (assoc :query-params {})
+               (coercion/coerce!)))))))
+
 (defn match-by-path-and-coerce! [router path]
   (if-let [match (r/match-by-path router path)]
     (assoc match :parameters (coercion/coerce! match))))

test/cljc/reitit/core_test.cljc

@@ -13,8 +13,7 @@
 
   (testing "routers handling wildcard paths"
     (are [r name]
-      (testing "wild"
-
+      (testing (str name)
         (testing "simple"
           (let [router (r/router ["/api" ["/ipa" ["/:size" ::beer]]] {:router r})]
             (is (= name (r/router-name router)))
@@ -52,10 +51,17 @@
                        :path-params nil})
                      (r/match-by-name router ::beer)))
               (is (r/partial-match? (r/match-by-name router ::beer)))
+              (is (r/partial-match? (r/match-by-name router ::beer {:size nil}))
+                  "nil counts as missing")
               (is (thrown-with-msg?
                    ExceptionInfo
                    #"^missing path-params for route /api/ipa/:size -> \#\{:size\}$"
-                   (r/match-by-name! router ::beer))))))
+                   (r/match-by-name! router ::beer)))
+              (is (thrown-with-msg?
+                   ExceptionInfo
+                   #"^missing path-params for route /api/ipa/:size -> \#\{:size\}$"
+                   (r/match-by-name! router ::beer {:size nil}))
+                  "nil counts as missing"))))
 
         (testing "decode %-encoded path params"
           (let [router (r/router [["/one-param-path/:param1" ::one]

test/cljc/reitit/dependency_test.cljc

@@ -1,33 +0,0 @@
-(ns reitit.dependency-test
-  (:require [clojure.test :refer [are deftest is testing]]
-            [reitit.dependency :as rc])
-  #?(:clj (:import [clojure.lang ExceptionInfo])))
-
-(deftest post-order-test
-  (let [base-middlewares [{:name ::bar, :provides #{:bar}, :requires #{:foo}, :wrap identity}
-                          {:name ::baz, :provides #{:baz}, :requires #{:bar :foo}, :wrap identity}
-                          {:name ::foo, :provides #{:foo}, :requires #{}, :wrap identity}]]
-    (testing "happy cases"
-      (testing "default ordering works"
-        (is (= (rc/post-order base-middlewares)
-               (into (vec (drop 2 base-middlewares)) (take 2 base-middlewares)))))
-
-      (testing "custom provides and requires work"
-        (is (= (rc/post-order (comp hash-set :name)
-                              (fn [node] (into #{} (map (fn [k] (keyword "reitit.dependency-test" (name k))))
-                                               (:requires node)))
-                              base-middlewares)
-               (into (vec (drop 2 base-middlewares)) (take 2 base-middlewares))))))
-
-    (testing "errors"
-      (testing "missing dependency detection"
-        (is (thrown-with-msg? ExceptionInfo #"missing"
-                              (rc/post-order (drop 1 base-middlewares)))))
-
-      (testing "ambiguous dependency detection"
-        (is (thrown-with-msg? ExceptionInfo #"multiple providers"
-                              (rc/post-order (update-in base-middlewares [0 :provides] conj :foo)))))
-
-      (testing "circular dependency detection"
-        (is (thrown-with-msg? ExceptionInfo #"circular"
-                              (rc/post-order (assoc-in base-middlewares [2 :requires] #{:baz}))))))))

test/cljc/reitit/openapi_test.clj

@@ -18,6 +18,7 @@
             [reitit.swagger-ui :as swagger-ui]
             [schema.core :as s]
             [schema-tools.core]
+            [clojure.spec.alpha :as sp]
             [spec-tools.core :as st]
             [spec-tools.data-spec :as ds]))
 
@@ -901,13 +902,11 @@
                                  :request {:description "body description"
                                            :content {"application/json" {:schema {:x int?, :y int?}
                                                                          :examples {"1+1" {:value {:x 1, :y 1}}
-                                                                                    "1+2" {:value {:x 1, :y 2}}}
-                                                                         :openapi {:example {:x 2, :y 2}}}}}
+                                                                                    "1+2" {:value {:x 1, :y 2}}}}}}
                                  :responses {200 {:description "success"
                                                   :content {"application/json" {:schema {:total int?}
                                                                                 :examples {"2" {:value {:total 2}}
-                                                                                           "3" {:value {:total 3}}}
-                                                                                :openapi {:example {:total 4}}}}}}
+                                                                                           "3" {:value {:total 3}}}}}}}
                                  :handler (fn [request]
                                             (let [{:keys [x y]} (-> request :parameters :body)]
                                               {:status 200, :body {:total (+ x y)}}))}}]]]
@@ -925,16 +924,14 @@
                                                                                        :required [:x :y],
                                                                                        :additionalProperties false},
                                                                               :examples {"1+1" {:value {:x 1, :y 1}}
-                                                                                         "1+2" {:value {:x 1, :y 2}}},
-                                                                              :example {:x 2, :y 2}}}},
+                                                                                         "1+2" {:value {:x 1, :y 2}}}}}},
                                   :responses {200 {:description "success",
                                                    :content {"application/json" {:schema {:type "object",
                                                                                           :properties {:total {:type "integer"}},
                                                                                           :required [:total],
                                                                                           :additionalProperties false},
                                                                                  :examples {"2" {:value {:total 2}},
-                                                                                            "3" {:value {:total 3}}},
-                                                                                 :example {:total 4}}}}},
+                                                                                            "3" {:value {:total 3}}}}}}},
                                   :summary "plus with body"}}}
            (:paths spec)))
     (is (nil? (validate spec))))
@@ -1031,3 +1028,36 @@
                 "reitit.openapi-test.Y" {:type "integer"}}}}
              spec))
       (is (nil? (validate spec))))))
+
+(sp/def ::address string?)
+(sp/def ::zip int?)
+(sp/def ::city string?)
+(sp/def ::street string?)
+(sp/def ::or-and-schema (sp/keys :req-un [(or (and ::address ::zip) (and ::city ::street))]))
+
+(deftest openapi-spec-tests
+  (testing "s/keys + or maps to :anyOf"
+    (let [app (ring/ring-handler
+               (ring/router
+                [["/openapi.json"
+                  {:get {:no-doc true
+                         :openapi {:info {:title "" :version "0.0.1"}}
+                         :handler (openapi/create-openapi-handler)}}]
+
+                 ["/spec" {:coercion spec/coercion
+                           :post {:summary "or-and-schema"
+                                  :request {:content {"application/json" {:schema ::or-and-schema}}}
+                                  :handler identity}}]]
+                {:validate reitit.ring.spec/validate
+                 :data {:middleware [openapi/openapi-feature]}}))
+          spec (:body (app {:request-method :get :uri "/openapi.json"}))]
+      (is (nil? (validate spec)))
+      (is (= {:title "reitit.openapi-test/or-and-schema"
+              :type "object"
+              :properties {"address" {:type "string"}
+                           "zip" {:type "integer" :format "int64"}
+                           "city" {:type "string"}
+                           "street" {:type "string"}}
+              :anyOf [{:required ["address" "zip"]}
+                      {:required ["city" "street"]}]}
+             (get-in spec [:paths "/spec" :post :requestBody :content "application/json" :schema]))))))

test/cljc/reitit/ring_coercion_test.cljc

@@ -1,8 +1,10 @@
 (ns reitit.ring-coercion-test
   (:require [clojure.test :refer [deftest is testing]]
             [malli.experimental.lite :as l]
-            #?@(:clj [[muuntaja.middleware]
-                      [jsonista.core :as j]])
+            #?@(:clj [[muuntaja.core]
+                      [muuntaja.middleware]
+                      [jsonista.core :as j]
+                      [reitit.ring.middleware.muuntaja]])
             [malli.core :as m]
             [malli.util :as mu]
             [meta-merge.core :refer [meta-merge]]
@@ -581,103 +583,168 @@
                                                   :request-method :get}))]
 
         (is (= {:status 200, :body {:total "FOO: this, BAR: that"}} (call m/schema custom-meta-merge-checking-schema)))
-        (is (= {:status 200, :body {:total "FOO: this, BAR: that"}} (call identity custom-meta-merge-checking-parameters)))))))
+        (is (= {:status 200, :body {:total "FOO: this, BAR: that"}} (call identity custom-meta-merge-checking-parameters)))))
+
+    (testing "malli options"
+      (let [->app (fn [options]
+                    (ring/ring-handler
+                     (ring/router
+                      ["/api" {:get {:parameters {:body [:map
+                                                         [:i :int]
+                                                         [:x :string]]}
+                                     :handler (fn [{{:keys [body]} :parameters}]
+                                                {:status 200 :body body})}}]
+                      {:data {:middleware [rrc/coerce-exceptions-middleware
+                                           rrc/coerce-request-middleware
+                                           rrc/coerce-response-middleware]
+                              :coercion (malli/create options)}})))
+            request {:uri "/api"
+                     :request-method :get
+                     :muuntaja/request {:format "application/json"}}]
+        (testing "humanize options"
+          (is (= {:i ["should be an integer"] :x ["missing required key"]}
+                 (-> ((->app nil) (assoc request :body-params {:i "x"}))
+                     :body
+                     :humanized)))
+          (is (= {:i ["SHOULD INT"] :x ["MISSING"]}
+                 (-> ((->app {:options {:errors {:int {:error/message {:en "SHOULD INT"}}
+                                                 :malli.core/missing-key {:error/message {:en "MISSING"}}}}})
+                      (assoc request :body-params {:i "x"}))
+                     :body
+                     :humanized))))
+        (testing "overriding registry"
+          (is (= {:body {:i "x" :x "x"} :status 200}
+                 (-> ((->app {:options {:registry (merge (m/default-schemas)
+                                                         {:int :string})}})
+                      (assoc request :body-params {:i "x" :x "x"}))))))))))
 
 #?(:clj
 (deftest per-content-type-test
-  (doseq [[coercion json-request edn-request default-request json-response edn-response default-response]
-          [[malli/coercion
-            [:map [:request [:enum :json]] [:response any?]]
-            [:map [:request [:enum :edn]] [:response any?]]
-            [:map [:request [:enum :default]] [:response any?]]
-            [:map [:request any?] [:response [:enum :json]]]
-            [:map [:request any?] [:response [:enum :edn]]]
-            [:map [:request any?] [:response [:enum :default]]]]
-           [schema/coercion
-            {:request (s/eq :json) :response s/Any}
-            {:request (s/eq :edn) :response s/Any}
-            {:request (s/eq :default) :response s/Any}
-            {:request s/Any :response (s/eq :json)}
-            {:request s/Any :response (s/eq :edn)}
-            {:request s/Any :response (s/eq :default)}]
-           [spec/coercion
-            {:request (clojure.spec.alpha/spec #{:json}) :response any?}
-            {:request (clojure.spec.alpha/spec #{:edn}) :response any?}
-            {:request (clojure.spec.alpha/spec #{:default}) :response any?}
-            {:request any? :response (clojure.spec.alpha/spec #{:json})}
-            {:request any? :response (clojure.spec.alpha/spec #{:end})}
-            {:request any? :response (clojure.spec.alpha/spec #{:default})}]]]
-    (testing (str coercion)
-      (doseq [{:keys [name app]}
-              [{:name "using top-level :body"
-                :app (ring/ring-handler
-                      (ring/router
-                       ["/foo" {:post {:request {:content {"application/json" {:schema json-request}
-                                                           "application/edn" {:schema edn-request}}
-                                                 :body default-request}
-                                       :responses {200 {:content {"application/json" {:schema json-response}
-                                                                  "application/edn" {:schema edn-response}}
-                                                        :body default-response}}
-                                       :handler (fn [req]
-                                                  {:status 200
-                                                   :body (-> req :parameters :request)})}}]
-                       {:validate reitit.ring.spec/validate
-                        :data {:middleware [rrc/coerce-request-middleware
-                                            rrc/coerce-response-middleware]
-                               :coercion coercion}}))}
-               {:name "using :default content"
-                :app (ring/ring-handler
-                      (ring/router
-                       ["/foo" {:post {:request {:content {"application/json" {:schema json-request}
-                                                           "application/edn" {:schema edn-request}
-                                                           :default {:schema default-request}}
-                                                 :body json-request} ;; not applied as :default exists
-                                       :responses {200 {:content {"application/json" {:schema json-response}
-                                                                  "application/edn" {:schema edn-response}
-                                                                  :default {:schema default-response}}
-                                                        :body json-response}} ;; not applied as :default exists
-                                       :handler (fn [req]
-                                                  {:status 200
-                                                   :body (-> req :parameters :request)})}}]
-                       {:validate reitit.ring.spec/validate
-                        :data {:middleware [rrc/coerce-request-middleware
-                                            rrc/coerce-response-middleware]
-                               :coercion coercion}}))}]]
-        (testing name
-          (let [call (fn [request]
+  (let [normalize-json (fn [resp]
+                         (update resp :body #(-> % j/write-value-as-string (j/read-value j/keyword-keys-object-mapper))))]
+    (doseq [[coercion json-request edn-request default-request json-response edn-response default-response]
+            [[malli/coercion
+              [:map [:request [:enum :json]] [:response any?]]
+              [:map [:request [:enum :edn]] [:response any?]]
+              [:map [:request [:enum :default]] [:response any?]]
+              [:map [:request any?] [:response [:enum :json]]]
+              [:map [:request any?] [:response [:enum :edn]]]
+              [:map [:request any?] [:response [:enum :default]]]]
+             [schema/coercion
+              {:request (s/eq :json) :response s/Any}
+              {:request (s/eq :edn) :response s/Any}
+              {:request (s/eq :default) :response s/Any}
+              {:request s/Any :response (s/eq :json)}
+              {:request s/Any :response (s/eq :edn)}
+              {:request s/Any :response (s/eq :default)}]
+             [spec/coercion
+              {:request (clojure.spec.alpha/spec #{:json}) :response any?}
+              {:request (clojure.spec.alpha/spec #{:edn}) :response any?}
+              {:request (clojure.spec.alpha/spec #{:default}) :response any?}
+              {:request any? :response (clojure.spec.alpha/spec #{:json})}
+              {:request any? :response (clojure.spec.alpha/spec #{:end})}
+              {:request any? :response (clojure.spec.alpha/spec #{:default})}]]]
+      (testing (str coercion)
+        (doseq [{:keys [name app]}
+                [{:name "using top-level :body"
+                  :app (ring/ring-handler
+                        (ring/router
+                         ["/foo" {:post {:request {:content {"application/json" {:schema json-request}
+                                                             "application/edn" {:schema edn-request}}
+                                                   :body default-request}
+                                         :responses {200 {:content {"application/json" {:schema json-response}
+                                                                    "application/edn" {:schema edn-response}}
+                                                          :body default-response}}
+                                         :handler (fn [req]
+                                                    {:status 200
+                                                     :body (-> req :parameters :request)})}}]
+                         {:validate reitit.ring.spec/validate
+                          :data {:middleware [rrc/coerce-request-middleware
+                                              rrc/coerce-response-middleware]
+                                 :coercion coercion}}))}
+                 {:name "using :default content"
+                  :app (ring/ring-handler
+                        (ring/router
+                         ["/foo" {:post {:request {:content {"application/json" {:schema json-request}
+                                                             "application/edn" {:schema edn-request}
+                                                             :default {:schema default-request}}
+                                                   :body json-request} ;; not applied as :default exists
+                                         :responses {200 {:content {"application/json" {:schema json-response}
+                                                                    "application/edn" {:schema edn-response}
+                                                                    :default {:schema default-response}}
+                                                          :body json-response}} ;; not applied as :default exists
+                                         :handler (fn [req]
+                                                    {:status 200
+                                                     :body (-> req :parameters :request)})}}]
+                         {:validate reitit.ring.spec/validate
+                          :data {:middleware [rrc/coerce-request-middleware
+                                              rrc/coerce-response-middleware]
+                                 :coercion coercion}}))}]]
+          (testing name
+            (let [call (fn [request]
+                         (try
+                           (app request)
+                           (catch ExceptionInfo e
+                             (select-keys (ex-data e) [:type :in]))))
+                  request (fn [request-format response-format body]
+                            {:request-method :post
+                             :uri "/foo"
+                             :muuntaja/request {:format request-format}
+                             :muuntaja/response {:format response-format}
+                             :body-params body})]
+              (testing "succesful call"
+                (is (= {:status 200 :body {:request "json", :response "json"}}
+                       (normalize-json (call (request "application/json" "application/json" {:request :json :response :json})))))
+                (is (= {:status 200 :body {:request "edn", :response "json"}}
+                       (normalize-json (call (request "application/edn" "application/json" {:request :edn :response :json})))))
+                (is (= {:status 200 :body {:request :default, :response :default}}
+                       (call (request "application/transit" "application/transit" {:request :default :response :default})))))
+              (testing "request validation fails"
+                (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
+                       (call (request "application/edn" "application/json" {:request :json :response :json}))))
+                (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
+                       (call (request "application/json" "application/json" {:request :edn :response :json}))))
+                (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
+                       (call (request "application/transit" "application/json" {:request :edn :response :json})))))
+              (testing "response validation fails"
+                (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
+                       (call (request "application/json" "application/json" {:request :json :response :edn}))))
+                (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
+                       (call (request "application/json" "application/edn" {:request :json :response :json}))))
+                (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
+                       (call (request "application/json" "application/transit" {:request :json :response :json}))))))))
+        (testing "explicit response content type"
+          (let [response (atom nil)
+                app (ring/ring-handler
+                     (ring/router
+                      ["/foo" {:post {:responses {200 {:content {"application/json" {:schema json-response}
+                                                                 "application/edn" {:schema edn-response}
+                                                                 :default {:schema default-response}}}}
+                                      :handler (fn [req]
+                                                 @response)}}]
+                      {:validate reitit.ring.spec/validate
+                       :data {:middleware [rrc/coerce-request-middleware
+                                           rrc/coerce-response-middleware]
+                              :coercion coercion}}))
+                call (fn [request]
                        (try
                          (app request)
                          (catch ExceptionInfo e
+                           #_(ex-data e)
                            (select-keys (ex-data e) [:type :in]))))
-                request (fn [request-format response-format body]
+                request (fn [request-format body resp]
+                          (reset! response resp)
                           {:request-method :post
                            :uri "/foo"
                            :muuntaja/request {:format request-format}
-                           :muuntaja/response {:format response-format}
-                           :body-params body})
-                normalize-json (fn[body]
-                                 (-> body j/write-value-as-string (j/read-value j/keyword-keys-object-mapper)))]
-            (testing "succesful call"
-              (is (= {:status 200 :body {:request "json", :response "json"}}
-                     (normalize-json (call (request "application/json" "application/json" {:request :json :response :json})))))
-              (is (= {:status 200 :body {:request "edn", :response "json"}}
-                     (normalize-json (call (request "application/edn" "application/json" {:request :edn :response :json})))))
-              (is (= {:status 200 :body {:request :default, :response :default}}
-                     (call (request "application/transit" "application/transit" {:request :default :response :default})))))
-            (testing "request validation fails"
-              (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
-                     (call (request "application/edn" "application/json" {:request :json :response :json}))))
-              (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
-                     (call (request "application/json" "application/json" {:request :edn :response :json}))))
-              (is (= {:type :reitit.coercion/request-coercion :in [:request :body-params]}
-                     (call (request "application/transit" "application/json" {:request :edn :response :json})))))
-            (testing "response validation fails"
-              (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
-                     (call (request "application/json" "application/json" {:request :json :response :edn}))))
-              (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
-                     (call (request "application/json" "application/edn" {:request :json :response :json}))))
-              (is (= {:type :reitit.coercion/response-coercion :in [:response :body]}
-                     (call (request "application/json" "application/transit" {:request :json :response :json}))))))))))))
+                           :body-params body})]
+            (testing "via :muuntaja/content-type"
+              (is (= {:status 200 :body {:request "json" :response "json"} :muuntaja/content-type "application/json"}
+                     (normalize-json (call (request "application/json" {:request :json :response :json} {:status 200 :body {:request :json :response :json} :muuntaja/content-type "application/json"}))))
+                  "valid reponse")
+              (is (= {:in [:response :body] :type :reitit.coercion/response-coercion}
+                     (call (request "application/json" {:request :json :response :json} {:status 200 :body {:request :json :response :invalid} :muuntaja/content-type "application/json"})))
+                  "invalid reponse")))))))))
 
 
 #?(:clj
@@ -801,3 +868,100 @@
                         (app) :body slurp (read-string))]
            (is (= data-edn (e2e (assoc data-edn :EXTRA "VALUE"))))
            (is (thrown? ExceptionInfo (e2e data-json))))))))
+
+#?(:clj
+   (deftest muuntaja-per-content-type-coercion-test
+     ;; Test integration between per-content-type coercion and muuntaja.
+     ;; Malli-only for now.
+     (let [response (atom nil)
+           app (ring/ring-handler
+                (ring/router
+                 ["/foo" {:post {:request {:content {"application/json" {:schema [:map [:request [:enum :json]]]}
+                                                     "application/edn" {:schema [:map [:request [:enum :edn]]]}
+                                                     :default {:schema [:map [:request [:enum :default]]]}}}
+                                 :responses {200 {:content {"application/json" {:schema [:map [:response [:enum :json]]]}
+                                                            "application/edn" {:schema [:map [:response [:enum :edn]]]}
+                                                            :default {}}}}
+                                 :handler (fn [req] @response)}}]
+                 {:data {:middleware [reitit.ring.middleware.muuntaja/format-middleware
+                                      rrc/coerce-request-middleware
+                                      rrc/coerce-response-middleware]
+                         :muuntaja muuntaja.core/instance
+                         :coercion malli/coercion}}))
+           maybe-slurp #(if (instance? java.io.InputStream %)
+                          (slurp %)
+                          %)
+           call (fn [request resp]
+                  (reset! response resp)
+                  (try
+                    (-> (merge {:request-method :post :uri "/foo"} request)
+                        (update :body #(ByteArrayInputStream. (.getBytes % "UTF-8")))
+                        (app))
+                    (catch ExceptionInfo e
+                      #_(ex-data e)
+                      (select-keys (ex-data e) [:in :type]))))
+           read-json #(j/read-value % (j/object-mapper {:decode-key-fn true}))
+           json-response? (fn [resp]
+                            (and (.startsWith (get-in resp [:headers "Content-Type"]) "application/json") ;; ignore the ;charset=utf-8 part
+                                 (= {:response "json"} (read-json (maybe-slurp (:body resp))))))
+           edn-response? (fn [resp]
+                           (and (.startsWith (get-in resp [:headers "Content-Type"]) "application/edn") ;; ignore the ;charset=utf-8 part
+                                (= {:response :edn} (read-string (maybe-slurp (:body resp))))))
+           custom-response? (fn [resp]
+                              (and (= (get-in resp [:headers "Content-Type"]) "application/custom")
+                                   (= "custom data" (maybe-slurp (:body resp)))))]
+       (testing "response content-type defaults to json"
+         (is (json-response?
+              (call {:headers {"content-type" "application/json"}
+                     :body (j/write-value-as-string {:request :json})}
+                    {:status 200
+                     :body {:response :json}})))
+         (is (json-response?
+              (call {:headers {"content-type" "application/edn"}
+                     :body (pr-str {:request :edn})}
+                    {:status 200
+                     :body {:response :json}})))
+         (is (= {:in [:response :body] :type :reitit.coercion/response-coercion}
+                (call {:headers {"content-type" "application/json"}
+                       :body (j/write-value-as-string {:request :json})}
+                      {:status 200
+                       :body {:response :invalid}}))
+             "invalid response"))
+       (testing "response content-type negotiated via accept header"
+         (is (json-response?
+              (call {:headers {"content-type" "application/json" "accept" "application/json"}
+                     :body (j/write-value-as-string {:request :json})}
+                    {:status 200
+                     :body {:response :json}})))
+         (is (edn-response?
+              (call {:headers {"content-type" "application/json" "accept" "application/edn"}
+                     :body (j/write-value-as-string {:request :json})}
+                    {:status 200
+                     :body {:response :edn}})))
+         (is (= {:in [:response :body] :type :reitit.coercion/response-coercion}
+                (call {:headers {"content-type" "application/json" "accept" "application/edn"}
+                       :body (j/write-value-as-string {:request :json})}
+                      {:status 200
+                       :body {:response :invalid}}))
+             "invalid response"))
+       (testing "response content-type set via :muuntaja/content-type"
+         (is (edn-response?
+              (call {:headers {"content-type" "application/json" "accept" "application/json"}
+                     :body (j/write-value-as-string {:request :json})}
+                    {:status 200
+                     :muuntaja/content-type "application/edn"
+                     :body {:response :edn}})))
+         (is (= {:in [:response :body] :type :reitit.coercion/response-coercion}
+                (call {:headers {"content-type" "application/json" "accept" "application/json"}
+                       :body (j/write-value-as-string {:request :json})}
+                      {:status 200
+                       :muuntaja/content-type "application/edn"
+                       :body {:response :invalid}}))
+             "invalid response"))
+       (testing "response content-type set via Content-Type header. muuntaja disabled for response."
+         (is (custom-response?
+              (call {:headers {"content-type" "application/json" "accept" "application/json"}
+                     :body (j/write-value-as-string {:request :json})}
+                    {:status 200
+                     :headers {"Content-Type" "application/custom"}
+                     :body "custom data"})))))))

test/cljc/reitit/ring_spec_test.cljc

@@ -12,6 +12,9 @@
 (s/def ::role #{:admin :user})
 (s/def ::roles (s/and (s/coll-of ::role :into #{}) set?))
 
+(defmulti my-multi (constantly :default))
+(defmethod my-multi :default [x] x)
+
 (deftest route-data-validation-test
   (testing "validation is turned off by default"
     (is (r/router?
@@ -85,6 +88,12 @@
          (ring/router
           ["/api" {:handler identity
                    :middleware '()}]
+          {:validate rrs/validate}))))
+
+  (testing "handler can be a multimethod"
+    (is (r/router?
+         (ring/router
+          ["/api" {:get {:handler my-multi}}]
           {:validate rrs/validate})))))
 
 (deftest coercion-spec-test

test/cljc/reitit/ring_test.cljc

@@ -114,6 +114,25 @@
         (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"
@@ -743,7 +762,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