path-for doesn't lose the trailing path part. fixes #150

Author: ikitommi

src/compojure/api/routes.clj

@@ -3,27 +3,28 @@
             [clojure.string :as string]
             [cheshire.core :as json]
             [ring.swagger.swagger2 :as rss]
-            [compojure.api.middleware :as mw]))
+            [compojure.api.middleware :as mw]
+            [clojure.string :as str]))
+
+(defn- un-quote [s]
+  (str/replace s #"^\"(.+(?=\"$))\"$" "$1"))
 
 (defn ->path [s params]
-  (->> s
-       (re-seq #"(.*?):(.[^:|(/]*)([/]?)")
-       (map (comp vec rest))
-       (map #(update-in % [1] keyword))
-       flatten
-       (map (fn [token]
-              (if (keyword? token)
-                (string/replace
-                  (json/generate-string
-                    (or (token params)
-                        (throw
-                          (IllegalArgumentException.
-                            (str "Missing path-parameter "
-                                 token " for path " s)))))
-                  #"^\"(.+(?=\"$))\"$"
-                  "$1")
-                token)))
-       (apply str)))
+  (-> s
+      (str/replace #":([^/]+)" " :$1 ")
+      (str/split #" ")
+      (->> (map
+             (fn [[head :as token]]
+               (if (= head \:)
+                 (let [key (keyword (subs token 1))
+                       value (key params)]
+                   (if value
+                     (un-quote (json/generate-string value))
+                     (throw
+                       (IllegalArgumentException.
+                         (str "Missing path-parameter " key " for path " s)))))
+                 token)))
+           (apply str))))
 
 (defn- duplicates [seq]
   (for [[id freq] (frequencies seq)

test/compojure/api/integration_test.clj

@@ -806,13 +806,13 @@
   (let [app (api (swagger-docs {:basePath "/serve/from/here"}))]
     (fact "override it"
       (let [[status spec] (get* app "/swagger.json")]
-          status => 200 
+          status => 200
           (:basePath spec) => "/serve/from/here")))
 
   (let [app (api (swagger-docs {:basePath "/"}))]
     (fact "can set it to the default"
       (let [[status spec] (get* app "/swagger.json")]
-          status => 200 
+          status => 200
           (:basePath spec) => "/"))))
 
 (fact "multiple different models with same name"
@@ -914,6 +914,18 @@
           body => {:country "FI"
                    :zip 33200}))))
 
+  (fact "https://github.com/metosin/compojure-api/issues/150"
+    (let [app (api
+                (GET* "/companies/:company-id/refresh" []
+                  :path-params [company-id :- s/Int]
+                  :name :refresh-company
+                  :return String
+                  (ok (path-for :refresh-company {:company-id company-id}))))]
+      (fact "path-for resolution"
+        (let [[status body] (get* app "/companies/4/refresh")]
+          status => 200
+          body => "/companies/4/refresh"))))
+
   (fact "multiple routes with same name fail at compile-time"
     (let [app' `(api
                   (GET* "/api/pong" []

test/compojure/api/routes_test.clj

@@ -13,7 +13,7 @@
     => (throws com.fasterxml.jackson.core.JsonGenerationException))
 
   (fact "happy path"
-    (->path "/a/:b/:c/d/:e" {:b (org.joda.time.LocalDate/parse "2015-05-22")
-                             :c 12345
-                             :e :kikka})
-    => "/a/2015-05-22/12345/d/kikka"))
+    (->path "/a/:b/:c/d/:e/f" {:b (org.joda.time.LocalDate/parse "2015-05-22")
+                               :c 12345
+                               :e :kikka})
+    => "/a/2015-05-22/12345/d/kikka/f"))