Don't ignore coercions that return false

Fixes weavejester#150.
zacyang · Jun 19, 2016 · d093486 · d093486
1 parent 46384c7
commit d093486
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/compojure/core.clj b/src/compojure/core.clj
@@ -111,7 +111,7 @@
   (if (vector? bindings)
     `(let [~@(vector-bindings bindings request)]
        ~(if-let [syms (application-symbols bindings)]
-          `(if (and ~@syms) (do ~@body))
+          `(if (and ~@(for [s syms] `(not (nil? ~s)))) (do ~@body))
           `(do ~@body)))
     `(let [~bindings ~request] ~@body)))
 

diff --git a/test/compojure/core_test.clj b/test/compojure/core_test.clj
@@ -56,6 +56,8 @@
                     (mock/request :get "/foo/bar")))))
     (is (not (nil? ((GET "/foo/:x" [x :<< coercions/as-int] (str x))
                     (mock/request :get "/foo/100")))))
+    (is (not (nil? ((GET "/foo/:x" [x :<< #(Boolean/valueOf %)] (str x))
+                    (mock/request :get "/foo/false")))))
     (is (nil? ((GET "/foo/:x" [x :<< coercions/as-int] (str x))
                (mock/request :get "/foo/bar")))))