Make resolve-uri work with types other than string.

Author: wtetzner

src/org/bovinegenius/exploding_fish.clj

@@ -522,7 +522,7 @@ this document: http://www.ics.uci.edu/~fielding/url/test2.html"
     ;; need to handle this case separately:
     ;; resolve-uri "http://a/b/c" "//c"
     ;; since path is nil, the resolve fails
-    (if (re-find #"^//" target-uri)
+    (if (re-find #"^//" (str target-uri))
       (scheme target-uri
               (scheme src-uri))
       (-> src-uri

test/org/bovinegenius/uri_test.clj

@@ -248,8 +248,12 @@
            "http://a/g"))
     (is (= (resolve-uri the-base-uri "//g")
            "http://g"))
+    (is (= (resolve-uri the-base-uri (URI. "//g"))
+           (URI. "http://g")))
     (is (= (resolve-uri the-base-uri "g?y")
            "http://a/b/c/g?y"))
+    (is (= (resolve-uri (URI. the-base-uri) "g?y")
+           (URI. "http://a/b/c/g?y")))
     (is (let [resolved-uri (resolve-uri the-base-uri "g?y/./x")]
           (or (= resolved-uri "http://a/b/c/g?y/./x")
              (= resolved-uri "http://a/b/c/g?y/x"))))