fix #36, bump up version

metosin · Mar 31, 2015 · 2c9e529 · 2c9e529
1 parent 6e44667
commit 2c9e529
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.19.3 (31.3.2015)
+
+- `:resourcePath` is now set correctly with Swagger 1.2 endpoints (fixes [#36](https://github.com/metosin/ring-swagger/issues/36).
+
 ## 0.19.2 (31.3.2015)
 
 - avoid reflection with regexps, thanks to [Michael Blume](https://github.com/MichaelBlume)

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject metosin/ring-swagger "0.19.2"
+(defproject metosin/ring-swagger "0.19.3"
   :description "Swagger Spec for Ring Apps"
   :url "https://github.com/metosin/ring-swagger"
   :license {:name "Eclipse Public License"

diff --git a/src/ring/swagger/core.clj b/src/ring/swagger/core.clj
@@ -236,7 +236,7 @@
         resource-defaults
         (select-keys parameters [:apiVersion :produces :consumes])
         {:basePath basepath
-         :resourcePath "/"
+         :resourcePath (str "/" api)
          :models (transform-models (extract-models details))
          :apis (for [{:keys [method uri metadata] :as route} (:routes details)
                      :let [{:keys [return summary notes nickname parameters

diff --git a/test/ring/swagger/core_test.clj b/test/ring/swagger/core_test.clj
@@ -423,7 +423,7 @@
     => {:swaggerVersion "1.2"
         :apiVersion "0.0.1"
         :basePath ..basepath..
-        :resourcePath "/"
+        :resourcePath (str "/" ..api..)
         :produces ["application/json"]
         :consumes ["application/json"]
         :models {}
@@ -462,7 +462,7 @@
     => {:swaggerVersion "1.2"
         :apiVersion ..version..
         :basePath ..basepath..
-        :resourcePath "/"
+        :resourcePath (str "/" ..api..)
         :produces ["application/json"
                    "application/xml"]
         :consumes ["application/json"
@@ -520,7 +520,7 @@
     => {:swaggerVersion "1.2"
         :apiVersion "0.0.1"
         :basePath ..basepath..
-        :resourcePath "/"
+        :resourcePath (str "/" ..api..)
         :produces ["application/json"]
         :consumes ["application/json"]
         :models {}