From f19aae6e77530a6cc68e3cca143bd90ebfc2be5e Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Sun, 23 Sep 2018 16:42:45 +0300 Subject: [PATCH] fix #150 --- CHANGELOG.md | 4 ++++ examples/ring-spec-swagger/project.clj | 4 ++-- examples/ring-swagger/project.clj | 4 ++-- .../src/reitit/ring/middleware/parameters.clj | 4 +--- .../reitit/ring/middleware/parameters_test.clj | 16 ++++++++++++++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f783b436..46d4ff1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,10 @@ [ring/ring-core "1.7.0"] is available but we use "1.6.3" ``` +## `reitit-middleware` + +* fix `reitit.ring.middleware.parameters/parameters-middleware` + ## 0.2.2 (2018-09-09) * better documentation for interceptors diff --git a/examples/ring-spec-swagger/project.clj b/examples/ring-spec-swagger/project.clj index 98a21bf4..b189761b 100644 --- a/examples/ring-spec-swagger/project.clj +++ b/examples/ring-spec-swagger/project.clj @@ -1,6 +1,6 @@ (defproject ring-example "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" :dependencies [[org.clojure/clojure "1.9.0"] - [ring/ring-jetty-adapter "1.7.0-RC2"] - [metosin/reitit "0.2.2"]] + [ring/ring-jetty-adapter "1.7.0"] + [metosin/reitit "0.2.3-SNAPSHOT"]] :repl-options {:init-ns example.server}) diff --git a/examples/ring-swagger/project.clj b/examples/ring-swagger/project.clj index 98a21bf4..b189761b 100644 --- a/examples/ring-swagger/project.clj +++ b/examples/ring-swagger/project.clj @@ -1,6 +1,6 @@ (defproject ring-example "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" :dependencies [[org.clojure/clojure "1.9.0"] - [ring/ring-jetty-adapter "1.7.0-RC2"] - [metosin/reitit "0.2.2"]] + [ring/ring-jetty-adapter "1.7.0"] + [metosin/reitit "0.2.3-SNAPSHOT"]] :repl-options {:init-ns example.server}) diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj b/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj index 84355093..20eef688 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj @@ -10,6 +10,4 @@ :form-params - a map of parameters from the body :params - a merged map of all types of parameter" {:name ::parameters - :enter (fn [ctx] - (let [request (:request ctx)] - (assoc ctx :request (params/params-request request))))}) + :wrap params/wrap-params}) diff --git a/test/clj/reitit/ring/middleware/parameters_test.clj b/test/clj/reitit/ring/middleware/parameters_test.clj index 880a81d9..e9658a1f 100644 --- a/test/clj/reitit/ring/middleware/parameters_test.clj +++ b/test/clj/reitit/ring/middleware/parameters_test.clj @@ -1,3 +1,15 @@ -(ns reitit.ring.middleware.parameters-test) +(ns reitit.ring.middleware.parameters-test + (:require [clojure.test :refer [deftest testing is]] + [reitit.ring.middleware.parameters :as parameters] + [reitit.ring :as ring])) -;; TODO +(deftest parameters-test + (let [app (ring/ring-handler + (ring/router + ["/ping" {:get #(select-keys % [:params :query-params])}] + {:data {:middleware [parameters/parameters-middleware]}}))] + (is (= {:query-params {"kikka" "kukka"} + :params {"kikka" "kukka"}} + (app {:request-method :get + :uri "/ping" + :query-string "kikka=kukka"})))))