@@ -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,7 +108,7 @@ (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 @@ -115,7 +116,7 @@ (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/http/routes.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] src/compojure/str_utils.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"]} test/compojure/http/routes.clj 81fae95902f645ef3912fabb38dfcef9d29b6224 James Reeves jim@bonobo.(none) http://github.com/abedra/compojure/commit/513769433e9fae4919268c4ca67dfb108eb6f9e2 513769433e9fae4919268c4ca67dfb108eb6f9e2 2009-09-26T11:20:00-07:00 2009-09-26T11:20:00-07:00 Fixes #15: route params should be urldecoded 724058b3284920067351d894123e16b55e908bbb James Reeves jim@bonobo.(none)