Merge pull request weavejester#7 from ptaoussanis/master

Added support for scheme-relative URLs.

Author: weavejester

README.md

@@ -33,6 +33,15 @@ Clout can also match absolute routes:
                           (request :get "http://subdomain.example.com/"))
     {}
 
+And scheme-relative routes:
+
+    user=> (route-matches "//subdomain.example.com/"
+                          (request :get "http://subdomain.example.com/"))
+    {}
+    user=> (route-matches "//subdomain.example.com/"
+                          (request :get "https://subdomain.example.com/"))
+    {}
+
 Clout supports both keywords and wildcards. Keywords (like ":title") will
 match any character but the following: `/ . , ; ?`. Wildcards (*) will match
 anything.

src/clout/core.clj

@@ -112,9 +112,9 @@
           (recur results src clauses))))))
 
 (defn- absolute-url?
-  "True if the path contains an absolute URL."
+  "True if the path contains an absolute or scheme-relative URL."
   [path]
-  (boolean (re-matches #"https?://.*" path)))
+  (boolean (re-matches #"(https?:)?//.*" path)))
 
 (defn route-compile
   "Compile a path string using the routes syntax into a uri-matcher struct."
@@ -131,6 +131,7 @@
           (apply str
             (lex path
               splat   "(.*?)"
+              #"^//"  "https?://"
               word    #(str "(" (word-regex %) ")")
               literal #(re-escape (.group ^Matcher %)))))
         (remove nil?

test/clout/test/core.clj

@@ -74,7 +74,17 @@
         "http://localhost/"
         {:scheme  :http
          :headers {"host" "localhost"}
-         :uri     "/"})))
+         :uri     "/"}))
+  (is (route-matches
+       "//localhost/"
+       {:scheme  :http
+        :headers {"host" "localhost"}
+        :uri     "/"}))
+  (is (route-matches
+       "//localhost/"
+       {:scheme  :https
+        :headers {"host" "localhost"}
+        :uri     "/"})))
 
 (deftest url-port-paths
   (let [req (request :get "http://localhost:8080/")]