Merge pull request #130 from mvitz/fix-context-list-with-regex

Fix context use with list and regex.
weavejester · Dec 2, 2014 · a963e00 · a963e00
2 parents 2ae60a4 + 13bea7b
commit a963e00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/compojure/core.clj b/src/compojure/core.clj
@@ -195,7 +195,7 @@
        `(clout/route-compile ~(str route ":__path-info") ~re-context)
       (vector? route)
        `(clout/route-compile
-         ~(str (first route) ":__path-info")
+         (str ~(first route) ":__path-info")
          ~(merge (apply hash-map (rest route)) re-context))
       :else
        `(clout/route-compile (str ~route ":__path-info") ~re-context))))

diff --git a/test/compojure/core_test.clj b/test/compojure/core_test.clj
@@ -139,6 +139,12 @@
       (is (map? (handler (mock/request :get "/foo/10"))))
       (is (nil? (handler (mock/request :get "/bar/10"))))))
 
+  (testing "list with regex matching"
+    (let [handler (context [(str "/foo" "/:id") :id #"\d+"] [id] identity)]
+      (is (map? (handler (mock/request :get "/foo/10"))))
+      (is (nil? (handler (mock/request :get "/foo/ab"))))
+      (is (nil? (handler (mock/request :get "/bar/10"))))))
+
   (testing "context key"
     (let [handler (context "/foo/:id" [id] :context)]
       (are [url ctx] (= (handler (mock/request :get url)) ctx)