Merge pull request #70 from Swirrl/opaque-base-uris

Opaque base uris

src/csv2rdf/util.clj

@@ -17,7 +17,7 @@
 (defn set-fragment
  "Sets the fragment on a URI to the given value."
  [^URI uri fragment]
- (URI. (.getScheme uri) (.getUserInfo uri) (.getHost uri) (.getPort uri) (.getPath uri) (.getQuery uri) fragment))
+ (URI. (.getScheme uri) (.getSchemeSpecificPart uri) fragment))
 
 (defn remove-fragment
  "Sets the fragment on a URI to nil."

test/csv2rdf/util_test.clj

@@ -6,6 +6,15 @@
  [clojure.test.check.clojure-test :refer [defspec]])
  (:import [java.net URI]))
 
+
+(deftest set-fragment-test
+ (testing "transparent uri"
+ (is (= (URI. "http:8080//example.org/path?param=bar#new-fragment")
+ (set-fragment (URI. "http:8080//example.org/path?param=bar#fragment") "new-fragment"))))
+ (testing "opaque uri"
+ (is (= (URI. "jar:file:///some/path!/inside/zip/path#new-fragment")
+ (set-fragment (URI. "jar:file:///some/path!/inside/zip/path#fragment") "new-fragment")))))
+
 (defspec filter-values-test 100
  (prop/for-all
  [m (gen/map gen/keyword gen/int)]
@@ -54,4 +63,4 @@
  (let [[expected-prefix expected-suffix] (split-at n xs)
  [prefix suffix] (eager-split-at n xs)]
  (and (= expected-prefix prefix)
- (= (seq expected-suffix) (seq suffix))))))
+ (= (seq expected-suffix) (seq suffix))))))