From ec2199847820a1c14a06b3305e4e4641c794bb94 Mon Sep 17 00:00:00 2001
From: Juho Teperi <juho.teperi@iki.fi>
Date: Thu, 5 Mar 2020 14:47:23 +0200
Subject: [PATCH] Rename old reitit.ring.spec and move multipart specs to new
 ns

---
 CHANGELOG.md                                  | 17 ++++++++++++++
 doc/ring/route_data_validation.md             |  4 ++--
 .../ring-malli-swagger/src/example/server.clj |  6 ++---
 .../ring-spec-swagger/src/example/server.clj  |  5 ++--
 examples/ring-swagger/src/example/server.clj  |  5 ++--
 modules/reitit-http/src/reitit/http/spec.cljc |  2 +-
 .../src/reitit/ring/middleware/multipart.clj  | 23 +------------------
 .../src/reitit/ring/{ => validate}/spec.cljc  |  2 +-
 modules/reitit-spec/src/reitit/ring/spec.cljc | 23 +++++++++++++++++++
 ...test.cljc => ring_validate_spec_test.cljc} |  6 ++---
 10 files changed, 57 insertions(+), 36 deletions(-)
 rename modules/reitit-ring/src/reitit/ring/{ => validate}/spec.cljc (98%)
 create mode 100644 modules/reitit-spec/src/reitit/ring/spec.cljc
 rename test/cljc/reitit/{ring_spec_test.cljc => ring_validate_spec_test.cljc} (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfccf21fe..58a1cd804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,23 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
+## Unreleased
+
+### `reitit-ring`
+
+- **BREAKING:** `reitit.ring.spec` namespace has been renamed to `reitit.ring.validate.spec`
+
+### `reitit-spec`
+
+- **BREAKING:** Added `reitit.ring.spec` namespace with specs for multipart parameter coercion.
+**This replaces old `reitit.ring.spec` namespace with different namespace.**
+
+### `reitit-middleware`
+
+- **BREAKING:** `temp-file-part`, `bytes-part` and related specs have been removed from
+`reitit.ring.middleware.multipart` namespace and been moved to `reitit.ring.spec`
+namespace.
+
 ## 0.4.2 (2020-01-17)
 
 ### `reitit`
diff --git a/doc/ring/route_data_validation.md b/doc/ring/route_data_validation.md
index 9609dc709..18d06cbfc 100644
--- a/doc/ring/route_data_validation.md
+++ b/doc/ring/route_data_validation.md
@@ -2,7 +2,7 @@
 
 Ring route validation works [just like with core router](../basics/route_data_validation.md), with few differences:
 
-* `reitit.ring.spec/validate` should be used instead of `reitit.spec/validate` - to support validating all endpoints (`:get`, `:post` etc.)
+* `reitit.ring.validate.spec/validate` should be used instead of `reitit.spec/validate` - to support validating all endpoints (`:get`, `:post` etc.)
 * With `clojure.spec` validation, Middleware can contribute to route spec via `:specs` key. The effective route data spec is router spec merged with middleware specs.
 
 ## Example
@@ -12,7 +12,7 @@ A simple app with spec-validation turned on:
 ```clj
 (require '[clojure.spec.alpha :as s])
 (require '[reitit.ring :as ring])
-(require '[reitit.ring.spec :as rrs])
+(require '[reitit.ring.validate.spec :as rrs])
 (require '[reitit.spec :as rs])
 (require '[expound.alpha :as e])
 
diff --git a/examples/ring-malli-swagger/src/example/server.clj b/examples/ring-malli-swagger/src/example/server.clj
index 1a5d7d89b..f2b638c4c 100644
--- a/examples/ring-malli-swagger/src/example/server.clj
+++ b/examples/ring-malli-swagger/src/example/server.clj
@@ -10,9 +10,9 @@
             [reitit.ring.middleware.exception :as exception]
             [reitit.ring.middleware.multipart :as multipart]
             [reitit.ring.middleware.parameters :as parameters]
-    ;       [reitit.ring.middleware.dev :as dev]
-    ;       [reitit.ring.spec :as spec]
-    ;       [spec-tools.spell :as spell]
+            ; [reitit.ring.middleware.dev :as dev]
+            ; [reitit.ring.validate.spec :as spec]
+            ; [spec-tools.spell :as spell]
             [ring.adapter.jetty :as jetty]
             [muuntaja.core :as m]
             [clojure.java.io :as io]
diff --git a/examples/ring-spec-swagger/src/example/server.clj b/examples/ring-spec-swagger/src/example/server.clj
index 696158001..bb2e845bc 100644
--- a/examples/ring-spec-swagger/src/example/server.clj
+++ b/examples/ring-spec-swagger/src/example/server.clj
@@ -9,16 +9,17 @@
             [reitit.ring.middleware.exception :as exception]
             [reitit.ring.middleware.multipart :as multipart]
             [reitit.ring.middleware.parameters :as parameters]
+            [reitit.ring.spec :as ring-spec]
             ;; Uncomment to use
             ; [reitit.ring.middleware.dev :as dev]
-            ; [reitit.ring.spec :as spec]
+            ; [reitit.ring.validate.spec :as spec]
             ; [spec-tools.spell :as spell]
             [ring.adapter.jetty :as jetty]
             [muuntaja.core :as m]
             [clojure.spec.alpha :as s]
             [clojure.java.io :as io]))
 
-(s/def ::file multipart/temp-file-part)
+(s/def ::file ring-spec/temp-file-part)
 (s/def ::file-params (s/keys :req-un [::file]))
 
 (s/def ::name string?)
diff --git a/examples/ring-swagger/src/example/server.clj b/examples/ring-swagger/src/example/server.clj
index 8416c2b49..9fc745160 100644
--- a/examples/ring-swagger/src/example/server.clj
+++ b/examples/ring-swagger/src/example/server.clj
@@ -9,9 +9,10 @@
             [reitit.ring.middleware.exception :as exception]
             [reitit.ring.middleware.multipart :as multipart]
             [reitit.ring.middleware.parameters :as parameters]
+            [reitit.ring.spec :as ring-spec]
             ;; Uncomment to use
             ; [reitit.ring.middleware.dev :as dev]
-            ; [reitit.ring.spec :as spec]
+            ; [reitit.ring.validate.spec :as spec]
             ; [spec-tools.spell :as spell]
             [ring.adapter.jetty :as jetty]
             [muuntaja.core :as m]
@@ -31,7 +32,7 @@
 
         ["/upload"
          {:post {:summary "upload a file"
-                 :parameters {:multipart {:file multipart/temp-file-part}}
+                 :parameters {:multipart {:file ring-spec/temp-file-part}}
                  :responses {200 {:body {:name string?, :size int?}}}
                  :handler (fn [{{{:keys [file]} :multipart} :parameters}]
                             {:status 200
diff --git a/modules/reitit-http/src/reitit/http/spec.cljc b/modules/reitit-http/src/reitit/http/spec.cljc
index f665c2503..327dc70cd 100644
--- a/modules/reitit-http/src/reitit/http/spec.cljc
+++ b/modules/reitit-http/src/reitit/http/spec.cljc
@@ -1,6 +1,6 @@
 (ns reitit.http.spec
   (:require [clojure.spec.alpha :as s]
-            [reitit.ring.spec :as rrs]
+            [reitit.ring.validate.spec :as rrs]
             [reitit.interceptor :as interceptor]
             [reitit.exception :as exception]
             [reitit.spec :as rs]))
diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj b/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj
index 07a1d8c29..169372878 100644
--- a/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj
+++ b/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj
@@ -1,28 +1,7 @@
 (ns reitit.ring.middleware.multipart
   (:refer-clojure :exclude [compile])
   (:require [reitit.coercion :as coercion]
-            [ring.middleware.multipart-params :as multipart-params]
-            [clojure.spec.alpha :as s]
-            [spec-tools.core :as st])
-  (:import (java.io File)))
-
-(s/def ::filename string?)
-(s/def ::content-type string?)
-(s/def ::tempfile (partial instance? File))
-(s/def ::bytes bytes?)
-(s/def ::size int?)
-
-(def temp-file-part
-  "Spec for file param created by ring.middleware.multipart-params.temp-file store."
-  (st/spec
-    {:spec (s/keys :req-un [::filename ::content-type ::tempfile ::size])
-     :swagger/type "file"}))
-
-(def bytes-part
-  "Spec for file param created by ring.middleware.multipart-params.byte-array store."
-  (st/spec
-    {:spec (s/keys :req-un [::filename ::content-type ::bytes])
-     :swagger/type "file"}))
+            [ring.middleware.multipart-params :as multipart-params]))
 
 (defn- coerced-request [request coercers]
   (if-let [coerced (if coercers (coercion/coerce-request coercers request))]
diff --git a/modules/reitit-ring/src/reitit/ring/spec.cljc b/modules/reitit-ring/src/reitit/ring/validate/spec.cljc
similarity index 98%
rename from modules/reitit-ring/src/reitit/ring/spec.cljc
rename to modules/reitit-ring/src/reitit/ring/validate/spec.cljc
index ec047d5a5..1b1cb2a73 100644
--- a/modules/reitit-ring/src/reitit/ring/spec.cljc
+++ b/modules/reitit-ring/src/reitit/ring/validate/spec.cljc
@@ -1,4 +1,4 @@
-(ns reitit.ring.spec
+(ns reitit.ring.validate.spec
   (:require [clojure.spec.alpha :as s]
             [reitit.middleware :as middleware]
             [reitit.spec :as rs]
diff --git a/modules/reitit-spec/src/reitit/ring/spec.cljc b/modules/reitit-spec/src/reitit/ring/spec.cljc
new file mode 100644
index 000000000..15018be7a
--- /dev/null
+++ b/modules/reitit-spec/src/reitit/ring/spec.cljc
@@ -0,0 +1,23 @@
+(ns reitit.ring.spec
+  (:require [spec-tools.core :as st]
+            [clojure.spec.alpha :as s])
+  (:import (java.io File)))
+
+(s/def ::filename string?)
+(s/def ::content-type string?)
+(s/def ::tempfile (partial instance? File))
+(s/def ::bytes bytes?)
+(s/def ::size int?)
+
+(def temp-file-part
+  "Spec for file param created by ring.middleware.multipart-params.temp-file store."
+  (st/spec
+    {:spec (s/keys :req-un [::filename ::content-type ::tempfile ::size])
+     :swagger/type "file"}))
+
+(def bytes-part
+  "Spec for file param created by ring.middleware.multipart-params.byte-array store."
+  (st/spec
+    {:spec (s/keys :req-un [::filename ::content-type ::bytes])
+     :swagger/type "file"}))
+
diff --git a/test/cljc/reitit/ring_spec_test.cljc b/test/cljc/reitit/ring_validate_spec_test.cljc
similarity index 97%
rename from test/cljc/reitit/ring_spec_test.cljc
rename to test/cljc/reitit/ring_validate_spec_test.cljc
index 9a615efde..81d0dd2ad 100644
--- a/test/cljc/reitit/ring_spec_test.cljc
+++ b/test/cljc/reitit/ring_validate_spec_test.cljc
@@ -1,7 +1,7 @@
-(ns reitit.ring-spec-test
+(ns reitit.ring-validate-spec-test
   (:require [clojure.test :refer [deftest testing is]]
             [reitit.ring :as ring]
-            [reitit.ring.spec :as rrs]
+            [reitit.ring.validate.spec :as rrs]
             [reitit.ring.coercion :as rrc]
             [reitit.coercion.spec]
             [clojure.spec.alpha :as s]
@@ -51,7 +51,7 @@
     (testing "predicates are not allowed"
       (is (thrown-with-msg?
             ExceptionInfo
-            #":reitit.ring.spec/invalid-specs"
+            #":reitit.ring.validate.spec/invalid-specs"
             (ring/router
               ["/api" {:handler "identity"}]
               {:spec any?