earl-report 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1119b1b46c38387b9565ad9eefe96bcea4c05cd8
-  data.tar.gz: cee2b030f2a72dacc021d027aa98b253bf48c4b7
+  metadata.gz: 3e9d247fba459dcbd456748828fa9f9b9eb54299
+  data.tar.gz: 80656782c30c8009a93b0d7cad413f2a7968aa94
 SHA512:
-  metadata.gz: bc5068bdd7e743385e67a7b76090aa88365c59b3fa98e1b5fb1e14167798b79ce4e4ae73a953ba3860071d7f304444f70cb61723343a3cb81d31f727da8aacb6
-  data.tar.gz: 4cc8561f19460e2570f6d0fe9e1b29a38e274e7289563e47516cb3e5c0555eec80bd541db93c80ac70fd63904c78cfba69400e4001f2382ea5c3f364b74dbedb
+  metadata.gz: 44de180a4830bd4fc9d18224e2000089e1838de04b77efc07ee9d2d57e366dff0ca562f17a9f9caba1fc260f59ba5d4faa5225308f5164b89a43505760154c24
+  data.tar.gz: f6d34dd93d796502b9a913d7fd7d65229136dbd9f5b06032e99bffcf27fcc76637e63a435c366f642d7d7f61b1fc3459a7652cf4087e0d169c20362b4c7f1be8

data/VERSION

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

data/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'

data/lib/earl_report.rb

@@ -195,7 +195,7 @@ class EarlReport
     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 @@ class EarlReport
     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 @@ class EarlReport
       # 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 @@ class EarlReport
       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}"

data/spec/earl_report_spec.rb

@@ -40,7 +40,7 @@ describe EarlReport do
     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 @@ describe EarlReport do
     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 @@ describe EarlReport do
     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 @@ describe EarlReport do
     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__))

data/spec/test-files/results.html

@@ -73,8 +73,8 @@
       <h2 id='w3c-document-28-october-2015'>
         <abbr title='World Wide Web Consortium'>W3C</abbr>
         Document
-        <time class='dt-published' datetime='2016-12-28' property='dc:issued'>
-          28 December 2016
+        <time class='dt-published' datetime='2017-01-03' property='dc:issued'>
+          03 January 2017
         </time>
       </h2>
       <dl>
@@ -105,7 +105,7 @@
       </p>
       <hr />
     </div>
-    <section about='' id='abstract' typeof='Software doap:Project'>
+    <section about='' id='abstract' typeof='doap:Project Software'>
       <h2>Abstract</h2>
       <p>
         This document report test subject conformance for and related specifications for
@@ -230,7 +230,7 @@
         <span class='secno'>2.</span>
         Test Manifests
       </h2>
-      <section id='Description-for-Example-Test-Cases' resource='http://example/manifest.ttl' typeof='mf:Manifest Report'>
+      <section id='Description-for-Example-Test-Cases' resource='http://example/manifest.ttl' typeof='Report mf:Manifest'>
         <h2>
           <span class='secno'>2.1</span>
           <span property='dc:title mf:name'>Example Test Cases</span>
@@ -244,7 +244,7 @@
               <a href='#subj_0'>RDF::Turtle</a>
             </th>
           </tr>
-          <tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
+          <tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='http://www.w3.org/ns/rdftest#TestTurtleEval TestCase TestCriterion'>
             <td>
               <a href='#test_1fdd82ac4caf30510cabfdb0a5987ddd'>subm-test-00</a>
             </td>
@@ -260,12 +260,12 @@
               </span>
             </td>
           </tr>
-          <tr inlist='inlist' rel='mf:entries' resource='_:b0' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
+          <tr inlist='inlist' rel='mf:entries' resource='_:b2' typeof='http://www.w3.org/ns/rdftest#TestTurtleEval TestCase TestCriterion'>
             <td>
-              <a href='#test_9616fad74c7bf0cfba5d70f087ed0a96'>subm-test-01</a>
+              <a href='#test_9430e2f85f26fd582ac7fcccd7f50d46'>subm-test-01</a>
             </td>
             <td class='UNTESTED' property='earl:assertions' typeof='Assertion'>
-              <link href='_:b0' property='earl:test' />
+              <link href='_:b2' property='earl:test' />
               <link href='http://rubygems.org/gems/rdf-turtle' property='earl:subject' />
               <span property='earl:result' typeof='TestResult'>
                 <span property='earl:outcome' resource='earl:untested'>
@@ -300,7 +300,7 @@
             <span about='http://rubygems.org/gems/rdf-turtle' property='doap:name'>RDF::Turtle</span>
           </a>
         </dt>
-        <dd property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='Software doap:Project TestSubject'>
+        <dd property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='doap:Project Software TestSubject'>
           <dl>
             <dt>Description</dt>
             <dd lang='en' property='doap:description'>RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.</dd>
@@ -374,11 +374,11 @@
             <pre class='example actionDoc' property='mf:action' resource='http://example/test-00.ttl' title='subm-test-00 Input'>http://example/test-00.ttl not loaded</pre>
             <pre class='example resultDoc' property='mf:result' resource='http://example/test-00.out' title='subm-test-00 Result'>http://example/test-00.out not loaded</pre>
           </dd>
-          <dt id='test_9616fad74c7bf0cfba5d70f087ed0a96' resource='_:b0'>
+          <dt id='test_9430e2f85f26fd582ac7fcccd7f50d46' resource='_:b2'>
             Test
             <span property='dc:title mf:name'>subm-test-01</span>
           </dt>
-          <dd resource='_:b0'>
+          <dd resource='_:b2'>
             <p property='dc:description rdfs:comment'></p>
             <pre class='example actionDoc' property='mf:action' resource='http://example/test-01.ttl' title='subm-test-01 Input'>http://example/test-01.ttl not loaded</pre>
             <pre class='example resultDoc' property='mf:result' resource='http://example/test-01.out' title='subm-test-01 Result'>http://example/test-01.out not loaded</pre>
@@ -386,7 +386,7 @@
         </div>
       </dl>
     </section>
-    <section class='appendix' id='report-generation-software' property='earl:generatedBy' resource='http://rubygems.org/gems/earl-report' typeof='Software doap:Project'>
+    <section class='appendix' id='report-generation-software' property='earl:generatedBy' resource='http://rubygems.org/gems/earl-report' typeof='doap:Project Software'>
       <h2>
         <span class='secno'>D.</span>
         Report Generation Software
@@ -400,7 +400,7 @@
         <span property='doap:release' resource='https://github.com/gkellogg/earl-report/tree/0.4.3' typeof='doap:Version'>
           <span property='doap:revision'>0.4.3</span>
           <meta content='earl-report-0.4.3' property='doap:name' />
-          <meta content='2016-12-26' datatype='xsd:date' property='doap:created' />
+          <meta content='2016-12-28' datatype='xsd:date' property='doap:created' />
         </span>
         an
         <a href='http://unlicense.org' property='doap:license'>Unlicensed</a>

data/spec/test-files/results.jsonld

@@ -103,8 +103,8 @@
   },
   "@id": "",
   "@type": [
-    "Software",
-    "doap:Project"
+    "doap:Project",
+    "Software"
   ],
   "assertions": [
     "/Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl"
@@ -114,25 +114,25 @@
     {
       "@id": "http://example/manifest.ttl",
       "@type": [
-        "mf:Manifest",
-        "Report"
+        "Report",
+        "mf:Manifest"
       ],
       "entries": [
         {
           "@id": "http://example/manifest.ttl#testeval00",
           "@type": [
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
             "TestCase",
-            "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "TestCriterion"
           ],
           "assertions": [
             {
-              "@id": "_:b0",
+              "@id": "_:b4",
               "@type": "Assertion",
               "assertedBy": "http://greggkellogg.net/foaf#me",
               "mode": "earl:automatic",
               "result": {
-                "@id": "_:b1",
+                "@id": "_:b3",
                 "@type": "TestResult",
                 "outcome": "earl:passed"
               },
@@ -148,17 +148,17 @@
         {
           "@id": "_:b2",
           "@type": [
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
             "TestCase",
-            "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "TestCriterion"
           ],
           "assertions": [
             {
-              "@id": "_:b3",
+              "@id": "_:b0",
               "@type": "Assertion",
               "assertedBy": null,
               "result": {
-                "@id": "_:b4",
+                "@id": "_:b1",
                 "@type": "TestResult",
                 "outcome": "earl:untested"
               },
@@ -179,8 +179,8 @@
   "generatedBy": {
     "@id": "http://rubygems.org/gems/earl-report",
     "@type": [
-      "Software",
-      "doap:Project"
+      "doap:Project",
+      "Software"
     ],
     "developer": [
       {
@@ -201,7 +201,7 @@
     "release": {
       "@id": "https://github.com/gkellogg/earl-report/tree/0.4.3",
       "@type": "doap:Version",
-      "created": "2016-12-26",
+      "created": "2016-12-28",
       "name": "earl-report-0.4.3",
       "revision": "0.4.3"
     },
@@ -212,8 +212,8 @@
     {
       "@id": "http://rubygems.org/gems/rdf-turtle",
       "@type": [
-        "Software",
         "doap:Project",
+        "Software",
         "TestSubject"
       ],
       "developer": [

data/spec/test-files/results.ttl

@@ -7,8 +7,8 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<> a earl:Software,
-     doap:Project;
+<> a doap:Project,
+     earl:Software;
    dc:bibliographicCitation "[[TURTLE]]";
    doap:name "Turtle Test Results";
    mf:entries (<http://example/manifest.ttl>);
@@ -18,15 +18,15 @@
 
 # Manifests
 
-<http://example/manifest.ttl> a mf:Manifest,
-     earl:Report;
+<http://example/manifest.ttl> a earl:Report,
+     mf:Manifest;
    rdfs:comment "Description for Example Test Cases";
-   mf:entries (<http://example/manifest.ttl#testeval00> _:g70287090109560);
+   mf:entries (<http://example/manifest.ttl#testeval00> _:g70336025838220);
    mf:name "Example Test Cases" .
 
-<http://example/manifest.ttl#testeval00> a earl:TestCase,
-     earl:TestCriterion,
-     <http://www.w3.org/ns/rdftest#TestTurtleEval>;
+<http://example/manifest.ttl#testeval00> a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+     earl:TestCase,
+     earl:TestCriterion;
    rdfs:comment "Blank subject";
    mf:action <http://example/test-00.ttl>;
    mf:name "subm-test-00";
@@ -43,9 +43,9 @@
      earl:test <http://example/manifest.ttl#testeval00>
    ] .
 
-_:g70287090109560 a earl:TestCase,
-     earl:TestCriterion,
-     <http://www.w3.org/ns/rdftest#TestTurtleEval>;
+_:g70336025838220 a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+     earl:TestCase,
+     earl:TestCriterion;
    rdfs:comment "@prefix and qnames";
    mf:action <http://example/test-01.ttl>;
    mf:name "subm-test-01";
@@ -57,13 +57,13 @@ _:g70287090109560 a earl:TestCase,
        earl:outcome earl:untested
      ];
      earl:subject <http://rubygems.org/gems/rdf-turtle>;
-     earl:test _:g70287090109560
+     earl:test _:g70336025838220
    ] .
 
 # Test Subjects
 
-<http://rubygems.org/gems/rdf-turtle> a earl:Software,
-     doap:Project,
+<http://rubygems.org/gems/rdf-turtle> a doap:Project,
+     earl:Software,
      earl:TestSubject;
    doap:description "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en;
    doap:developer <http://greggkellogg.net/foaf#me>;
@@ -78,8 +78,8 @@ _:g70287090109560 a earl:TestCase,
 
 # Report Generation Software
 
-<http://rubygems.org/gems/earl-report> a earl:Software,
-     doap:Project;
+<http://rubygems.org/gems/earl-report> a doap:Project,
+     earl:Software;
    doap:description "EarlReport generates HTML+RDFa rollups of multiple EARL reports"@en;
    doap:developer <http://greggkellogg.net/foaf#me>;
    doap:homepage <https://github.com/gkellogg/earl-report>;
@@ -90,6 +90,6 @@ _:g70287090109560 a earl:TestCase,
    doap:shortdesc "Earl Report summary generator"@en .
 
 <https://github.com/gkellogg/earl-report/tree/0.4.3> a doap:Version;
-   doap:created "2016-12-26"^^xsd:date;
+   doap:created "2016-12-28"^^xsd:date;
    doap:name "earl-report-0.4.3";
    doap:revision "0.4.3" .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata