Add support for multiple resource/file middleware

If :resources or :files is given a collection of paths, multiple
wrap-resource and wrap-file middleware will be used.

Author: weavejester

src/ring/middleware/defaults.clj

@@ -69,6 +69,14 @@
       (middleware handler options)
       handler)))
 
+(defn- wrap-multi [handler middleware args]
+  (wrap handler
+        (fn [handler args]
+          (if (coll? args)
+            (reduce middleware handler args)
+            (middleware handler args)))
+        args))
+
 (defn- wrap-xss-protection [handler options]
   (x/wrap-xss-protection handler (:enable? options true) (dissoc options :enable?)))
 
@@ -97,8 +105,8 @@
       (wrap wrap-params           (get-in config [:params :urlencoded] false))
       (wrap wrap-cookies          (get-in config [:cookies] false))
       (wrap wrap-absolute-redirects (get-in config [:responses :absolute-redirects] false))
-      (wrap wrap-resource         (get-in config [:static :resources] false))
-      (wrap wrap-file             (get-in config [:static :files] false))
+      (wrap-multi wrap-resource   (get-in config [:static :resources] false))
+      (wrap-multi wrap-file       (get-in config [:static :files] false))
       (wrap wrap-content-type     (get-in config [:responses :content-types] false))
       (wrap wrap-default-charset  (get-in config [:responses :default-charset] false))
       (wrap wrap-not-modified     (get-in config [:responses :not-modified-responses] false))

test/ring/assets/public1/foo.txt

@@ -0,0 +1 @@
+foo1

test/ring/assets/public2/bar.txt

@@ -0,0 +1 @@
+bar

test/ring/assets/public2/foo.txt

@@ -0,0 +1 @@
+foo2

test/ring/middleware/defaults_test.clj

@@ -126,6 +126,40 @@
     (let [handler (wrap-defaults (constantly nil) site-defaults)]
       (is (nil? (handler (request :get "/"))))))
 
+  (testing "single resource path"
+    (let [handler (wrap-defaults
+                   (constantly nil)
+                   (assoc-in site-defaults [:static :resources] "ring/assets/public1"))]
+      (is (= (slurp (:body (handler (request :get "/foo.txt")))) "foo1\n"))
+      (is (nil? (handler (request :get "/bar.txt"))))))
+
+  (testing "multiple resource paths"
+    (let [handler (wrap-defaults
+                   (constantly nil)
+                   (assoc-in site-defaults
+                             [:static :resources]
+                             ["ring/assets/public1"
+                              "ring/assets/public2"]))]
+      (is (= (slurp (:body (handler (request :get "/foo.txt")))) "foo2\n"))
+      (is (= (slurp (:body (handler (request :get "/bar.txt")))) "bar\n"))))
+
+  (testing "single file path"
+    (let [handler (wrap-defaults
+                   (constantly nil)
+                   (assoc-in site-defaults [:static :files] "test/ring/assets/public1"))]
+      (is (= (slurp (:body (handler (request :get "/foo.txt")))) "foo1\n"))
+      (is (nil? (handler (request :get "/bar.txt"))))))
+
+  (testing "multiple file paths"
+    (let [handler (wrap-defaults
+                   (constantly nil)
+                   (assoc-in site-defaults
+                             [:static :files]
+                             ["test/ring/assets/public1"
+                              "test/ring/assets/public2"]))]
+      (is (= (slurp (:body (handler (request :get "/foo.txt")))) "foo2\n"))
+      (is (= (slurp (:body (handler (request :get "/bar.txt")))) "bar\n"))))
+
   (testing "async handlers"
     (let [handler (-> (fn [_ respond _] (respond (response "foo")))
                       (wrap-defaults api-defaults))