Fix detecting path-parameters from uri

Fixes #196

Author: Deraen

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+* Fixed path parameter handling in cases where path parameter is followed by an extension
+([#196](https://github.com/metosin/compojure-api/issues/196), [metosin/ring-swagger#82](https://github.com/metosin/ring-swagger/issues/82))
 * [Updated ring-swagger](https://github.com/metosin/ring-swagger/blob/master/CHANGELOG.md#Unreleased)
 * Added `compojure.api.exception/with-logging` helper to add logging to exception handlers.
   * Check extended wiki guide on [exception handling](https://github.com/metosin/compojure-api/wiki/Exception-handling#logging)

src/compojure/api/swagger.clj

@@ -151,8 +151,12 @@
 ;; ensure path parameters
 ;;
 
-(defn path-params [s]
-  (map (comp keyword second) (re-seq #":(.[^:|(/]*)[/]?" s)))
+(defn path-params
+  "Finds path-parameter keys in an uri.
+
+  Regex copied from Clout and Ring-swagger."
+  [s]
+  (map (comp keyword second) (re-seq #":([\p{L}_][\p{L}_0-9-]*)" s)))
 
 (defn string-path-parameters [uri]
   (let [params (path-params uri)]

test/compojure/api/swagger_test.clj

@@ -169,3 +169,14 @@
            '(r1 r2)))
   => {:paths {"/:id" {:get {:parameters {:path {:id String}}}}
               "/kukka/:id" {:get {:parameters {:path {:id Long}}}}}})
+
+(fact "string-path-parameters"
+  (string-path-parameters "/:foo.json") => {:foo String})
+
+(fact "path params followed by an extension"
+  (first
+   (swagger-info
+    '(GET* "/:foo.json" []
+       :path-params [foo :- String]
+       identity)))
+  => {:paths {"/:foo.json" {:get {:parameters {:path {:foo String}}}}}})