coerce! with tests

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

@@ -132,3 +132,6 @@
 (defn compile-request-coercers [[p {:keys [parameters coercion]}] opts]
   (if (and parameters coercion)
     (request-coercers coercion parameters opts)))
+
+(defn coerce! [match]
+  (coerce-request (:result match) {:path-params (:params match)}))

test/cljc/reitit/coercion_test.cljc

@@ -1,147 +1,40 @@
 (ns reitit.coercion-test
   (:require [clojure.test :refer [deftest testing is]]
             [schema.core :as s]
-            [reitit.ring :as ring]
+            [reitit.core :as r]
-            [reitit.ring.coercion-middleware :as coercion-middleware]
+            [reitit.coercion :as coercion]
             [reitit.coercion.spec :as spec]
             [reitit.coercion.schema :as schema])
   #?(:clj
      (:import (clojure.lang ExceptionInfo))))
 
-(defn handler [{{{:keys [a]} :query
-                 {:keys [b]} :body
-                 {:keys [c]} :form
-                 {:keys [d]} :header
-                 {:keys [e]} :path} :parameters}]
-  {:status 200
-   :body {:total (+ a b c d e)}})
-
-(def valid-request
-  {:uri "/api/plus/5"
-   :request-method :get
-   :query-params {"a" "1"}
-   :body-params {:b 2}
-   :form-params {:c 3}
-   :header-params {:d 4}})
-
-(def invalid-request
-  {:uri "/api/plus/5"
-   :request-method :get})
-
-(def invalid-request2
-  {:uri "/api/plus/5"
-   :request-method :get
-   :query-params {"a" "1"}
-   :body-params {:b 2}
-   :form-params {:c 3}
-   :header-params {:d -40}})
-
 (deftest spec-coercion-test
-  (let [create (fn [middleware]
+  (let [r (r/router
-                 (ring/ring-handler
+            [["/schema" {:coercion schema/coercion}
-                   (ring/router
+              ["/:number/:keyword" {:name ::user
-                     ["/api"
+                                    :parameters {:path {:number s/Int
-                      ["/plus/:e"
+                                                        :keyword s/Keyword}}}]]
-                       {:get {:parameters {:query {:a int?}
+             ["/spec" {:coercion spec/coercion}
-                                           :body {:b int?}
+              ["/:number/:keyword" {:name ::user
-                                           :form {:c int?}
+                                    :parameters {:path {:number int?
-                                           :header {:d int?}
+                                                        :keyword keyword?}}}]]]
-                                           :path {:e int?}}
+            {:compile coercion/compile-request-coercers})]
-                              :responses {200 {:schema {:total pos-int?}}}
-                              :handler handler}}]]
-                     {:data {:middleware middleware
-                             :coercion spec/coercion}})))]
 
-    (testing "withut exception handling"
+    (testing "schema-coercion"
-      (let [app (create [coercion-middleware/coerce-request-middleware
+      (testing "succeeds"
-                         coercion-middleware/coerce-response-middleware])]
+        (let [m (r/match-by-path r "/schema/1/abba")]
+          (is (= {:path {:keyword :abba, :number 1}}
+                 (coercion/coerce! m)))))
+      (testing "throws with invalid input"
+        (let [m (r/match-by-path r "/schema/kikka/abba")]
+          (is (thrown? ExceptionInfo (coercion/coerce! m))))))
 
-        (testing "all good"
+    (testing "spec-coercion"
-          (is (= {:status 200
+      (testing "succeeds"
-                  :body {:total 15}}
+        (let [m (r/match-by-path r "/spec/1/abba")]
-                 (app valid-request))))
+          (is (= {:path {:keyword :abba, :number 1}}
+                 (coercion/coerce! m)))))
+      (testing "throws with invalid input"
+        (let [m (r/match-by-path r "/spec/kikka/abba")]
+          (is (thrown? ExceptionInfo (coercion/coerce! m))))))))
 
-        (testing "invalid request"
-          (is (thrown-with-msg?
-                ExceptionInfo
-                #"Request coercion failed"
-                (app invalid-request))))
-
-        (testing "invalid response"
-          (is (thrown-with-msg?
-                ExceptionInfo
-                #"Response coercion failed"
-                (app invalid-request2))))))
-
-    (testing "with exception handling"
-      (let [app (create [coercion-middleware/coerce-exceptions-middleware
-                         coercion-middleware/coerce-request-middleware
-                         coercion-middleware/coerce-response-middleware])]
-
-        (testing "all good"
-          (is (= {:status 200
-                  :body {:total 15}}
-                 (app valid-request))))
-
-        (testing "invalid request"
-          (let [{:keys [status body]} (app invalid-request)]
-            (is (= 400 status))))
-
-        (testing "invalid response"
-          (let [{:keys [status body]} (app invalid-request2)]
-            (is (= 500 status))))))))
-
-(deftest schema-coercion-test
-  (let [create (fn [middleware]
-                 (ring/ring-handler
-                   (ring/router
-                     ["/api"
-                      ["/plus/:e"
-                       {:get {:parameters {:query {:a s/Int}
-                                           :body {:b s/Int}
-                                           :form {:c s/Int}
-                                           :header {:d s/Int}
-                                           :path {:e s/Int}}
-                              :responses {200 {:schema {:total (s/constrained s/Int pos? 'positive)}}}
-                              :handler handler}}]]
-                     {:data {:middleware middleware
-                             :coercion schema/coercion}})))]
-
-    (testing "withut exception handling"
-      (let [app (create [coercion-middleware/coerce-request-middleware
-                         coercion-middleware/coerce-response-middleware])]
-
-        (testing "all good"
-          (is (= {:status 200
-                  :body {:total 15}}
-                 (app valid-request))))
-
-        (testing "invalid request"
-          (is (thrown-with-msg?
-                ExceptionInfo
-                #"Request coercion failed"
-                (app invalid-request))))
-
-        (testing "invalid response"
-          (is (thrown-with-msg?
-                ExceptionInfo
-                #"Response coercion failed"
-                (app invalid-request2))))
-
-        (testing "with exception handling"
-          (let [app (create [coercion-middleware/coerce-exceptions-middleware
-                             coercion-middleware/coerce-request-middleware
-                             coercion-middleware/coerce-response-middleware])]
-
-            (testing "all good"
-              (is (= {:status 200
-                      :body {:total 15}}
-                     (app valid-request))))
-
-            (testing "invalid request"
-              (let [{:keys [status body]} (app invalid-request)]
-                (is (= 400 status))))
-
-            (testing "invalid response"
-              (let [{:keys [status body]} (app invalid-request2)]
-                (is (= 500 status))))))))))

test/cljc/reitit/ring_coercion_test.cljc

@@ -0,0 +1,147 @@
+(ns reitit.ring-coercion-test
+  (:require [clojure.test :refer [deftest testing is]]
+            [schema.core :as s]
+            [reitit.ring :as ring]
+            [reitit.ring.coercion-middleware :as coercion-middleware]
+            [reitit.coercion.spec :as spec]
+            [reitit.coercion.schema :as schema])
+  #?(:clj
+     (:import (clojure.lang ExceptionInfo))))
+
+(defn handler [{{{:keys [a]} :query
+                 {:keys [b]} :body
+                 {:keys [c]} :form
+                 {:keys [d]} :header
+                 {:keys [e]} :path} :parameters}]
+  {:status 200
+   :body {:total (+ a b c d e)}})
+
+(def valid-request
+  {:uri "/api/plus/5"
+   :request-method :get
+   :query-params {"a" "1"}
+   :body-params {:b 2}
+   :form-params {:c 3}
+   :header-params {:d 4}})
+
+(def invalid-request
+  {:uri "/api/plus/5"
+   :request-method :get})
+
+(def invalid-request2
+  {:uri "/api/plus/5"
+   :request-method :get
+   :query-params {"a" "1"}
+   :body-params {:b 2}
+   :form-params {:c 3}
+   :header-params {:d -40}})
+
+(deftest spec-coercion-test
+  (let [create (fn [middleware]
+                 (ring/ring-handler
+                   (ring/router
+                     ["/api"
+                      ["/plus/:e"
+                       {:get {:parameters {:query {:a int?}
+                                           :body {:b int?}
+                                           :form {:c int?}
+                                           :header {:d int?}
+                                           :path {:e int?}}
+                              :responses {200 {:schema {:total pos-int?}}}
+                              :handler handler}}]]
+                     {:data {:middleware middleware
+                             :coercion spec/coercion}})))]
+
+    (testing "withut exception handling"
+      (let [app (create [coercion-middleware/coerce-request-middleware
+                         coercion-middleware/coerce-response-middleware])]
+
+        (testing "all good"
+          (is (= {:status 200
+                  :body {:total 15}}
+                 (app valid-request))))
+
+        (testing "invalid request"
+          (is (thrown-with-msg?
+                ExceptionInfo
+                #"Request coercion failed"
+                (app invalid-request))))
+
+        (testing "invalid response"
+          (is (thrown-with-msg?
+                ExceptionInfo
+                #"Response coercion failed"
+                (app invalid-request2))))))
+
+    (testing "with exception handling"
+      (let [app (create [coercion-middleware/coerce-exceptions-middleware
+                         coercion-middleware/coerce-request-middleware
+                         coercion-middleware/coerce-response-middleware])]
+
+        (testing "all good"
+          (is (= {:status 200
+                  :body {:total 15}}
+                 (app valid-request))))
+
+        (testing "invalid request"
+          (let [{:keys [status body]} (app invalid-request)]
+            (is (= 400 status))))
+
+        (testing "invalid response"
+          (let [{:keys [status body]} (app invalid-request2)]
+            (is (= 500 status))))))))
+
+(deftest schema-coercion-test
+  (let [create (fn [middleware]
+                 (ring/ring-handler
+                   (ring/router
+                     ["/api"
+                      ["/plus/:e"
+                       {:get {:parameters {:query {:a s/Int}
+                                           :body {:b s/Int}
+                                           :form {:c s/Int}
+                                           :header {:d s/Int}
+                                           :path {:e s/Int}}
+                              :responses {200 {:schema {:total (s/constrained s/Int pos? 'positive)}}}
+                              :handler handler}}]]
+                     {:data {:middleware middleware
+                             :coercion schema/coercion}})))]
+
+    (testing "withut exception handling"
+      (let [app (create [coercion-middleware/coerce-request-middleware
+                         coercion-middleware/coerce-response-middleware])]
+
+        (testing "all good"
+          (is (= {:status 200
+                  :body {:total 15}}
+                 (app valid-request))))
+
+        (testing "invalid request"
+          (is (thrown-with-msg?
+                ExceptionInfo
+                #"Request coercion failed"
+                (app invalid-request))))
+
+        (testing "invalid response"
+          (is (thrown-with-msg?
+                ExceptionInfo
+                #"Response coercion failed"
+                (app invalid-request2))))
+
+        (testing "with exception handling"
+          (let [app (create [coercion-middleware/coerce-exceptions-middleware
+                             coercion-middleware/coerce-request-middleware
+                             coercion-middleware/coerce-response-middleware])]
+
+            (testing "all good"
+              (is (= {:status 200
+                      :body {:total 15}}
+                     (app valid-request))))
+
+            (testing "invalid request"
+              (let [{:keys [status body]} (app invalid-request)]
+                (is (= 400 status))))
+
+            (testing "invalid response"
+              (let [{:keys [status body]} (app invalid-request2)]
+                (is (= 500 status))))))))))