Release 1.1.5:

* Fix URI base resolution and include tests.

Author: gkellogg

.travis.yml

@@ -17,3 +17,7 @@ env:
   global:
     - CI=true
 cache: bundler
+sudo: false
+matrix:
+  allow_failures:
+      - rvm: jruby

VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

example-files/iri-resolution.rdf

@@ -17,8 +17,8 @@ class Foo < RDF::Vocabulary('http://example.com#')
 leaf1 = RDF::Node.new
 leaf2 = RDF::Node.new
 
-g.insert([leaf1, RDF::DC.title, 'Hi'   ])
-g.insert([leaf2, RDF::DC.title, 'There'])
+g.insert([leaf1, RDF::URI("http://purl.org/dc/terms/title"), 'Hi'   ])
+g.insert([leaf2, RDF::URI("http://purl.org/dc/terms/title"), 'There'])
 g.insert([list1,  RDF.first,     leaf1  ])
 g.insert([list1,  RDF.rest,      list2  ])
 g.insert([list2,  RDF.first,     leaf2  ])

example-files/jcoyne.rb

@@ -64,10 +64,11 @@ def extract_from_ancestors(el, &cb)
 
       # Extract Evaluation Context from an element
       def extract_from_element(el, &cb)
-        b = el.base
-        lang = el.language
-        self.base = self.base.join(b) if b
-        self.language = lang if lang
+        self.language = el.language if el.language
+        if b = el.base
+          b = RDF::URI(b)
+          self.base = b.absolute? ? b : self.base.join(b)
+        end
         self.uri_mappings.merge!(extract_mappings(el, &cb))
       end
 
@@ -302,7 +303,7 @@ def nodeElement(el, ec)
           # If there is an attribute a in propertyAttr with a.URI == rdf:type
           # then u:=uri(identifier:=resolve(a.string-value))
           # and the following triple is added to the graph:
-          u = ec.base.join(attr.value)
+          u = uri(ec.base, attr.value)
           add_triple(attr, subject, RDF.type, u)
         elsif is_propertyAttr?(attr)
           # Attributes not RDF.type
@@ -530,12 +531,12 @@ def nodeElement(el, ec)
             # Reification
             reify(id, child, subject, predicate, literal, child_ec) if id
           else
-            if resourceAttr
-              resource = ec.base.join(resourceAttr)
+            resource = if resourceAttr
+              uri(ec.base, resourceAttr)
             elsif nodeID
-              resource = bnode(nodeID)
+              bnode(nodeID)
             else
-              resource = RDF::Node.new
+              RDF::Node.new
             end
 
             # produce triples for attributes
@@ -605,7 +606,7 @@ def parse_subject(el, ec)
       when about
         about = RDF::NTriples.unescape(about.value)
         add_debug(el) {"parse_subject, about: #{about.inspect}"}
-        ec.base.join(about)
+        uri(ec.base, about)
       else
         add_debug(el, "parse_subject, BNode")
         RDF::Node.new
@@ -687,8 +688,15 @@ def old_property_check(el)
     end
 
     def uri(value, append = nil)
-      value = RDF::URI.new(value)
-      value = value.join(append) if append
+      append = RDF::URI(append)
+      value = RDF::URI(value)
+      value = if append.absolute?
+        value = append
+      elsif append
+        value = value.join(append)
+      else
+        value
+      end
       value.validate! if validate?
       value.canonicalize! if canonicalize?
       value = RDF::URI.intern(value) if intern?

lib/rdf/rdfxml/reader.rb

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'open-uri-cached', '~> 0.0', '>= 0.0.5'
   gem.add_development_dependency 'spira',           '= 0.0.12'
   gem.add_development_dependency 'json-ld',         '~> 1.1'
-  gem.add_development_dependency 'rspec',           '~> 3.0'
+  gem.add_development_dependency 'rspec',           '~> 3.2'
   gem.add_development_dependency 'rspec-its',       '~> 1.0'
   gem.add_development_dependency 'rdf-isomorphic',  '~> 1.1'
   gem.add_development_dependency 'rdf-turtle',      '~> 1.1'

rdf-rdfxml.gemspec

@@ -99,6 +99,9 @@ def run_tc(tc, options)
 }
   end
 
+  options[:result_count][result] ||= 0
+  options[:result_count][result] += 1
+
   puts "#{"test result:" unless options[:quiet]} #{result}"
 end
 
@@ -142,9 +145,15 @@ manifest = Fixtures::SuiteTest::BASE + "manifest.ttl"
 
 earl_preamble(options) if options[:earl]
 
+result_count = {}
+
 Fixtures::SuiteTest::Manifest.open(manifest) do |m|
   m.entries.each do |tc|
     next unless ARGV.empty? || ARGV.any? {|n| tc.name.match(/#{n}/)}
-    run_tc(tc, options)
+    run_tc(tc, options.merge(result_count: result_count))
   end
 end
+
+result_count.each do |result, count|
+  puts "#{result}: #{count}"
+end

script/tc

@@ -3,12 +3,10 @@
 require 'rdf/spec/format'
 
 describe RDF::RDFXML::Format do
-  before :each do
-    @format_class = RDF::RDFXML::Format
+  it_behaves_like 'an RDF::Format' do
+    let(:format_class) {RDF::RDFXML::Format}
   end
 
-  include RDF_Format
-
   describe ".for" do
     formats = [
       :rdfxml,
@@ -18,29 +16,29 @@
       {:content_type   => 'application/rdf+xml'},
     ].each do |arg|
       it "discovers with #{arg.inspect}" do
-        expect(RDF::Format.for(arg)).to eq @format_class
+        expect(RDF::Format.for(arg)).to eq described_class
       end
     end
 
     {
       :rdfxml   => '<rdf:RDF about="foo"></rdf:RDF>',
     }.each do |sym, str|
       it "detects #{sym}" do
-        expect(@format_class.for {str}).to eq @format_class
+        expect(RDF::Format.for {str}).to eq described_class
       end
     end
   end
 
   describe "#to_sym" do
-    specify {expect(@format_class.to_sym).to eq :rdfxml}
+    specify {expect(described_class.to_sym).to eq :rdfxml}
   end
 
   describe ".detect" do
     {
       :rdfxml => '<rdf:RDF about="foo"></rdf:RDF>',
     }.each do |sym, str|
       it "detects #{sym}" do
-        expect(@format_class.detect(str)).to be_truthy
+        expect(described_class.detect(str)).to be_truthy
       end
     end
 
@@ -59,7 +57,7 @@
       :STRING_LITERAL_LONG2 => %(<a> <b> """\nliteral\n""" .),
     }.each do |sym, str|
       it "does not detect #{sym}" do
-        expect(@format_class.detect(str)).to be_falsey
+        expect(described_class.detect(str)).to be_falsey
       end
     end
 

spec/format_spec.rb

@@ -22,7 +22,7 @@
 describe RDF::RDFXML::Writer, skip: ("Nokogiri not loaded" unless have_nokogiri) do
   context "resource without type" do
     subject do
-      @graph = RDF::Repository.new << [RDF::URI.new("http://release/"), RDF::DC.title, "foo"]
+      @graph = RDF::Repository.new << [RDF::URI.new("http://release/"), RDF::URI("http://purl.org/dc/terms/title"), "foo"]
       serialize(:max_depth => 1, :attributes => :untyped)
     end