Merge pull request #231 from clojure-liberator/andrewmcveigh-multi-me…

…thod-decisions Update of PR #189 multi method decisions
clojure-liberator · Oct 1, 2015 · f5b99e7 · f5b99e7
2 parents 198f18f + b4ed930
commit f5b99e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.markdown b/CHANGES.markdown
@@ -5,6 +5,10 @@
 * Values can be added to the context at the beginning of the execution
   flow using the :initialize-context action.
 
+## Bugs fixed
+
+* Support multimethods as decision functions.
+
 # New in 0.13
 
 * Optionally a value can be specified for ring-response

diff --git a/src/liberator/core.clj b/src/liberator/core.clj
@@ -71,9 +71,8 @@
 (declare handle-exception)
 
 (defn decide [name test then else {:keys [resource request] :as context}]
-  (if (or (fn? test)
-          (instance? clojure.lang.MultiFn test)
-          (contains? resource name))
+  (if (or test
+         (contains? resource name))
     (try
       (let [ftest (or (resource name) test)
             ftest (make-function ftest)