Fixes weavejester#15: route params should be urldecoded

Author: James Reeves

src/compojure/http/routes.clj

@@ -16,6 +16,7 @@
   (:use compojure.str-utils)
   (:use compojure.map-utils)
   (:use compojure.control)
+  (:use compojure.encodings)
   (:import java.util.regex.Pattern)
   (:import java.util.Map))
 
@@ -95,7 +96,7 @@
   (reduce
     (fn [m [k v]] (assoc-vec m k v))
     {}
-    (map vector keywords (rest groups))))
+    (map vector keywords groups)))
 
 (defmulti match-uri
   "Match a URL against a compiled URI-matcher or a regular expression. Returns
@@ -107,15 +108,15 @@
   (let [matcher (re-matcher (uri-matcher :regex) (or uri "/"))]
     (if (.matches matcher)
       (assoc-keywords-with-groups
-        (re-groups matcher)
+        (map urldecode (re-groups* matcher))
         (uri-matcher :keywords)))))
 
 (defmethod match-uri Pattern
   [uri-pattern uri]
   (let [matches (re-matches uri-pattern (or uri "/"))]
     (if matches
       (if (vector? matches)
-        (subvec matches 1)
+        (vec (map urldecode (rest matches)))
         []))))
 
 (defn match-method

src/compojure/str_utils.clj

@@ -52,6 +52,13 @@
   [string]
   (escape "\\.*+|?()[]{}$^" string))
 
+(defn re-groups*
+  "More consistant re-groups that always returns a vector of groups, even if
+  there is only one group."
+  [matcher]
+  (for [i (range (.groupCount matcher))]
+    (.group matcher (inc i))))
+
 (defn blank?
   "True if s = \"\" or nil"
   [s]

test/compojure/http/routes.clj

@@ -30,6 +30,11 @@
     "/:foo-bar" "/baz" {:foo-bar "baz"}
     "/:foo-"    "/baz" {:foo- "baz"}))
 
+(deftest urlencoded-keywords
+  (are (= (match-uri (compile-uri-matcher _1) _2) _3)
+    "/:x" "/foo%20bar" {:x "foo bar"}
+    "/:x" "/foo+bar"   {:x "foo bar"}))
+
 (deftest same-keyword-many-times
   (are (= (match-uri (compile-uri-matcher _1) _2) _3)
     "/:x/:x/:x" "/a/b/c" {:x ["a" "b" "c"]}