Fixed file and resource routes

src/compojure/route.clj

@@ -13,7 +13,7 @@
   keys:
     :root - the root path where the files are stored. Defaults to 'public'."
   [path & [options]]
-  (GET (add-wildcard path) {{file-path "*"} :params}
+  (GET (add-wildcard path) {{file-path :*} :route-params}
     (let [options (merge {:root "public"} options)]
       (file-response file-path options))))
 
@@ -22,7 +22,7 @@
   keys:
     :root - the root prefix to get the resources from. Defaults to '/public'."
   [path & [options]]
-  (GET (add-wildcard path) {{resource-path "*"} :params}
+  (GET (add-wildcard path) {{resource-path :*} :route-params}
     (let [options (merge {:root "/public"} options)]
       (resource-response resource-path options))))
 

test/compojure/test/route.clj

@@ -1,15 +1,16 @@
 (ns compojure.test.route
   (:use clojure.test
+        ring.mock.request
         [clojure.contrib.io :only (slurp*)])
   (:require [compojure.route :as route]))
 
 (deftest not-found-route
-  (let [response ((route/not-found "foo") {})]
+  (let [response ((route/not-found "foo") (request :get "/"))]
     (is (= (:status response) 404))
     (is (= (:body response) "foo"))))
 
 (deftest resources-route
   (let [route    (route/resources "/foo" {:root "/resources"})
-        response (route {:request-method :get, :uri "/foo/test.txt"})]
+        response (route (request :get "/foo/test.txt"))]
     (is (= (:status response) 200))
     (is (= (slurp* (:body response)) "foobar\n"))))