fix complex pre-route url issue

Signed-off-by: Chris Granger <ibdknox@gmail.com>
andrewvc · Oct 7, 2011 · 3133daa · 3133daa
1 parent 1b04e62
commit 3133daa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/noir/core.clj b/src/noir/core.clj
@@ -142,8 +142,11 @@
 
   (pre-route '/admin/*' {} (when-not (is-admin?) (redirect '/login')))"
   [& args]
-  (let [{:keys [action destruct url body]} (parse-args args)]
-    `(swap! pre-routes assoc ~url (~action ~url {:as request#} ((fn [~destruct] ~@body) request#)))))
+  (let [{:keys [action destruct url body]} (parse-args args)
+        safe-url (if (vector? url) 
+                   (first url)
+                   url)]
+    `(swap! pre-routes assoc ~safe-url (~action ~url {:as request#} ((fn [~destruct] ~@body) request#)))))
 
 (defmacro post-route
   "Adds a route to the end of the route table and passes the entire request to