Finish 0.4.4

.travis.yml

@@ -10,3 +10,7 @@ rvm:
   - rbx
 cache: bundler
 sudo: false
+matrix:
+  allow_failures:
+    - rvm: rbx
+

VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

bin/earl-report

@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 $:.unshift(File.expand_path("../../lib", __FILE__))
-begin
-  require "bundler/setup"
-rescue LoadError
-  #skip
-end
 require 'earl_report'
 require 'getoptlong'
 require 'yaml'

lib/earl_report.rb

@@ -195,7 +195,7 @@ def initialize(*files)
     man_opts[:base_uri] = RDF::URI(@options[:base]) if @options[:base]
     @graph = RDF::Graph.new
     Array(@options[:manifest]).each do |man|
-      g = RDF::Graph.load(man, man_opts)
+      g = RDF::Graph.load(man, unique_bnodes: true, **man_opts)
       status "  loaded #{g.count} triples from #{man}"
       graph << g
     end
@@ -305,17 +305,21 @@ def initialize(*files)
     end
 
     status "query assertions"
+    assertion_stats = {}
     SPARQL.execute(ASSERTION_QUERY, assertion_graph).each do |solution|
       subject = solution[:subject]
       unless tests[solution[:test]]
+        assertion_stats["Skipped"] = assertion_stats["Skipped"].to_i + 1
         $stderr.puts "Skipping result for #{solution[:test]} for #{subject}, which is not defined in manifests"
         next
       end
       unless subjects[subject]
+        assertion_stats["Missing Subject"] = assertion_stats["Missing Subject"].to_i + 1
         $stderr.puts "No test result subject found for #{subject}: in #{subjects.keys.join(', ')}"
         next
       end
       found_solutions[subject] = true
+      assertion_stats["Found"] = assertion_stats["Found"].to_i + 1
 
       # Add this solution at the appropriate index within that list
       ndx = subjects.keys.find_index(subject)
@@ -338,6 +342,7 @@ def initialize(*files)
       # Fill any missing entries with an untested outcome
       ary.each_with_index do |a, ndx|
         unless a
+          assertion_stats["Untested"] = assertion_stats["Untested"].to_i + 1
           ary[ndx] = a = RDF::Node.new
           graph << RDF::Statement(a, RDF.type, EARL.Assertion)
           graph << RDF::Statement(a, EARL.subject, subjects.keys[ndx])
@@ -353,6 +358,8 @@ def initialize(*files)
       end
     end
 
+    assertion_stats.each {|stat, count| status("Assertions #{stat}: #{count}")}
+
     # See if any subject did not report results, which may indicate a formatting error in the EARL source
     subjects.reject {|s| found_solutions[s]}.each do |sub|
       $stderr.puts "No results found for #{sub} using #{ASSERTION_QUERY}"

spec/earl_report_spec.rb

@@ -40,7 +40,7 @@
     context "with base" do
       it "loads manifest relative to base" do
         expect(RDF::Graph).to receive(:load)
-          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {:base_uri => "http://example.com/base/"})
+          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {unique_bnodes: true, base_uri: "http://example.com/base/"})
           .and_return(manifest)
         expect(RDF::Graph).to receive(:load)
           .with(File.expand_path("../test-files/report-complete.ttl", __FILE__))
@@ -56,7 +56,7 @@
     context "complete report" do
       before(:each) do
         expect(RDF::Graph).to receive(:load)
-          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {})
+          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {unique_bnodes: true, })
           .and_return(manifest)
         expect(RDF::Graph).to receive(:load)
           .with(File.expand_path("../test-files/report-complete.ttl", __FILE__))
@@ -90,7 +90,7 @@
     context "no doap report" do
       before(:each) do
         expect(RDF::Graph).to receive(:load)
-          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {})
+          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {unique_bnodes: true, })
           .and_return(manifest)
         expect(RDF::Graph).to receive(:load)
           .with(File.expand_path("../test-files/report-no-doap.ttl", __FILE__))
@@ -127,7 +127,7 @@
     context "no foaf report" do
       before(:each) do
         expect(RDF::Graph).to receive(:load)
-          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {})
+          .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {unique_bnodes: true, })
           .and_return(manifest)
         expect(RDF::Graph).to receive(:load)
           .with(File.expand_path("../test-files/report-no-foaf.ttl", __FILE__))