From 9ce7e6593c4ea0e7cc41c4a74743ca7a33cd4548 Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Sun, 18 Oct 2020 20:22:01 +0300
Subject: [PATCH] malli 0.2.0, update docs & tune

---
 CHANGELOG.md                                        |  6 +++++-
 .../src/reitit/http/interceptors/muuntaja.clj       | 13 ++++---------
 .../src/reitit/ring/middleware/muuntaja.clj         | 13 ++++---------
 project.clj                                         |  2 +-
 test/clj/reitit/ring/middleware/muuntaja_test.clj   |  1 +
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a3df66..bf7c83cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,13 +17,17 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 * updated deps:
 
 ```clj
-[metosin/malli "0.1.0"] is available but we use "0.0.1-20200924.063109-27"
+[metosin/malli "0.2.0"] is available but we use "0.0.1-20200924.063109-27"
 [com.fasterxml.jackson.core/jackson-core "2.11.3"] is available but we use "2.11.2"
 [com.fasterxml.jackson.core/jackson-databind "2.11.3"] is available but we use "2.11.2"
 [expound "0.8.6"] is available but we use "0.8.5"
 [ring/ring-core "1.8.2"] is available but we use "1.8.1"
 ```
 
+### `reitit-ring`
+
+* Fix resource handler path matching [#443](https://github.com/metosin/reitit/pull/443)
+
 ## 0.5.6 (2020-09-26)
 
 * updated deps:
diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj
index 47f00cbb..8b9fac7a 100644
--- a/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj
+++ b/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj
@@ -10,14 +10,7 @@
 (defn- stripped [x] (select-keys x [:enter :leave :error]))
 
 (defn- publish-swagger-data? [{:keys [form body]}]
-  (not (and (some? form)
-            (nil? body))))
-
-(defn- swagger-data [parameters muuntaja]
-  (if (publish-swagger-data? parameters)
-    {:data {:swagger {:produces (displace (m/encodes muuntaja))
-                      :consumes (displace (m/decodes muuntaja))}}}
-    {}))
+  (not (and (some? form) (nil? body))))
 
 (defn format-interceptor
   "Interceptor for content-negotiation, request and response formatting.
@@ -48,7 +41,9 @@
                (if-let [muuntaja (or muuntaja default-muuntaja)]
                  (merge
                    (stripped (muuntaja.interceptor/format-interceptor muuntaja))
-                   (swagger-data parameters muuntaja))))}))
+                   (if (publish-swagger-data? parameters)
+                     {:data {:swagger {:produces (displace (m/encodes muuntaja))
+                                       :consumes (displace (m/decodes muuntaja))}}}))))}))
 
 (defn format-negotiate-interceptor
   "Interceptor for content-negotiation.
diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj b/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj
index abe62733..351eaeca 100644
--- a/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj
+++ b/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj
@@ -9,14 +9,7 @@
 (defn- displace [x] (with-meta x {:displace true}))
 
 (defn- publish-swagger-data? [{:keys [form body]}]
-  (not (and (some? form)
-            (nil? body))))
-
-(defn- swagger-data [parameters muuntaja]
-  (if (publish-swagger-data? parameters)
-    {:data {:swagger {:produces (displace (m/encodes muuntaja))
-                      :consumes (displace (m/decodes muuntaja))}}}
-    {}))
+  (not (and (some? form) (nil? body))))
 
 (def format-middleware
   "Middleware for content-negotiation, request and response formatting.
@@ -41,7 +34,9 @@
    :compile (fn [{:keys [muuntaja parameters]} _]
               (if muuntaja
                 (merge
-                  (swagger-data parameters muuntaja)
+                  (if (publish-swagger-data? parameters)
+                    {:data {:swagger {:produces (displace (m/encodes muuntaja))
+                                      :consumes (displace (m/decodes muuntaja))}}})
                   {:wrap #(muuntaja.middleware/wrap-format % muuntaja)})))})
 
 (def format-negotiate-middleware
diff --git a/project.clj b/project.clj
index 25cb4860..d01a3bc5 100644
--- a/project.clj
+++ b/project.clj
@@ -33,7 +33,7 @@
                          [metosin/muuntaja "0.6.7"]
                          [metosin/jsonista "0.2.7"]
                          [metosin/sieppari "0.0.0-alpha13"]
-                         [metosin/malli "0.1.0"]
+                         [metosin/malli "0.2.0"]
 
                          ;; https://clojureverse.org/t/depending-on-the-right-versions-of-jackson-libraries/5111
                          [com.fasterxml.jackson.core/jackson-core "2.11.3"]
diff --git a/test/clj/reitit/ring/middleware/muuntaja_test.clj b/test/clj/reitit/ring/middleware/muuntaja_test.clj
index 0cd5beed..6483192c 100644
--- a/test/clj/reitit/ring/middleware/muuntaja_test.clj
+++ b/test/clj/reitit/ring/middleware/muuntaja_test.clj
@@ -88,6 +88,7 @@
         (is (= #{"application/edn"}
                (produces path)
                (consumes path)))))
+
     (testing "form parameters swagger-data"
       (let [path "/form-params"]
         (is (= #{}