Update URI#relativize based on JSON-LD Context#remove_base. This covers more cases where the base URI can be used.

Author: gkellogg

lib/rdf/model/uri.rb

@@ -311,12 +311,22 @@ def relative?; !absolute?; end
     # @param [#to_s] base_uri
     # @return [RDF::URI]
     def relativize(base_uri)
-      if base_uri.to_s.end_with?("/", "#") &&
+      if self.to_s.start_with?(base_uri.to_s) && %w(# ?).include?(self.to_s[base_uri.to_s.length, 1]) ||
+         base_uri.to_s.end_with?("/", "#") &&
          self.to_s.start_with?(base_uri.to_s)
-        RDF::URI(self.to_s[base_uri.to_s.length..-1])
+        return RDF::URI(self.to_s[base_uri.to_s.length..-1])
       else
-        self
+        # Create a list of parents, for which this IRI may be relative.
+        u = RDF::URI(base_uri)
+        iri_set = u.to_s.end_with?('/') ? [u.to_s] : []
+        iri_set << u.to_s while (u = u.parent)
+        iri_set.each_with_index do |bb, index|
+          next unless self.to_s.start_with?(bb)
+          rel = "../" * index + self.to_s[bb.length..-1]
+          return rel.empty? ? "./" : rel
+        end
       end
+      self
     end
 
     ##

spec/model_uri_spec.rb

@@ -778,12 +778,33 @@
     {
       "prefix with #" => ["http://example.com/#", "http://example.com/#foo", "foo"],
       "prefix with /" => ["http://example.com/", "http://example.com/#foo", "#foo"],
-      "prefix without / or #" => ["http://example.com/f", "http://example.com/foo", "http://example.com/foo"],
+      "prefix without / or #" => ["http://example.com/f", "http://example.com/foo", "foo"],
     }.each do |name, (base_uri,orig,result)|
       it "<#{base_uri}> + <#{orig}>: <#{result}>" do
         expect(described_class.new(orig).relativize(base_uri)).to eq result
       end
     end
+
+    context "json-ld compact#t0066" do
+      {
+        "https://w3c.github.io/json-ld-api/tests/compact/link" => "link",
+        "https://w3c.github.io/json-ld-api/tests/compact/0066-in.jsonld#fragment-works" => "#fragment-works",
+        "https://w3c.github.io/json-ld-api/tests/compact/0066-in.jsonld?query=works" => "?query=works",
+        "https://w3c.github.io/json-ld-api/tests/" =>          "../",
+        "https://w3c.github.io/json-ld-api/" =>                "../../",
+        "https://w3c.github.io/json-ld-api/parent" =>          "../../parent",
+        "https://w3c.github.io/json-ld-api/parent#fragment" => "../../parent#fragment",
+        "https://w3c.github.io/parent-parent-eq-root" =>       "../../../parent-parent-eq-root",
+        "https://w3c.github.io/still-root" =>                  "../../../still-root",
+        "https://w3c.github.io/too-many-dots" =>               "../../../too-many-dots",
+        "https://w3c.github.io/absolute" =>                    "../../../absolute",
+        "http://example.org/scheme-relative" =>                "http://example.org/scheme-relative"
+      }.each do |orig, result|
+        it "relativises #{orig} to #{result}" do
+          expect(described_class.new(orig).relativize("https://w3c.github.io/json-ld-api/tests/compact/0066-in.jsonld")).to eq result
+        end
+      end
+    end
   end
 
   describe "#request_uri" do
@@ -950,8 +971,8 @@
     end
 
     it "#=~" do
-      expect(RDF::URI('http://example.org/')).to match /example/
-      expect(RDF::URI('http://example.org/')).not_to match /foobar/
+      expect(RDF::URI('http://example.org/')).to match(/example/)
+      expect(RDF::URI('http://example.org/')).not_to match(/foobar/)
     end
 
     it "#to_str" do