earl-report 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e76543b490f30df2542076f3beb58514e02346c964e716aed470ea1f1dd1dcac
-  data.tar.gz: e03701faad62e4ea150911a1bdca0a875839276ddc28604e1066a5a532ac0509
+  metadata.gz: 49a823f243638c7162903264e52f226f6f02e8e85943f1a4cd97a12594b080ab
+  data.tar.gz: b4855bcd3dbddc0e3b8eff04dbfd1ff8e8ed062827878471268e11b0fd509dbb
 SHA512:
-  metadata.gz: 7a5f474b6b1fe4d1f1c259d93048b2a2299dd56ff88fd82d215f8f55cf6f51c20706ccac8189bf6d250d16a0a1c5f614d90c30f6f0212c2beaab65ddf13a03b2
-  data.tar.gz: fa242658e76b29269cf820834f83df03b6bef2d3b30e018d420ace79dd0b2b0afdde97708fb8183a3afbbce397f9339a7920795cbe697b2eeeef15035d9aaf3d
+  metadata.gz: c971edc43f724554263423eb192fde98aa810cf2eaed21a5349f3199e765550087e8ce34ee0e8191c073b075415cf49f40ae5905b41bcc5954b0221fb7667c36
+  data.tar.gz: bf787b883a24228aab04490fb93b32e26b9763dd67e00565f61040b0a1bfd0e1bef4a41e91353182c685c5bf7913e8c5d17a141feeac691abfb7d3b36695bc91

data/README.md

@@ -34,6 +34,11 @@ of the reported software, in the following form:
       doap:developer     <http://greggkellogg.net/foaf#me> ;
       doap:homepage      <http://ruby-rdf.github.com/rdf-turtle> ;
       doap:description   "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
+      doap:release [
+                         doap:name "RDF::Turtle 3.1.0" ;
+                         doap:created "2015-09-27"^^xsd:date ;
+                         doap:revision "3.1.0"
+      ] ;
       doap:programming-language "Ruby" .
 
 The [DOAP]() description may be included in the [EARL]() report. If not found,

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.5.0

data/lib/earl_report.rb

@@ -33,13 +33,14 @@ class EarlReport
     PREFIX doap: <http://usefulinc.com/ns/doap#>
     PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
-    SELECT DISTINCT ?uri ?name ?doapDesc ?revision ?homepage ?language ?developer ?devName ?devType ?devHomepage
+    SELECT DISTINCT ?uri ?name ?doapDesc ?release ?revision ?homepage ?language ?developer ?devName ?devType ?devHomepage
     WHERE {
       ?uri a doap:Project; doap:name ?name; doap:developer ?developer .
       OPTIONAL { ?uri doap:homepage ?homepage . }
       OPTIONAL { ?uri doap:description ?doapDesc . }
       OPTIONAL { ?uri doap:programming-language ?language . }
-      OPTIONAL { ?uri doap:release [ doap:revision ?revision] .}
+      OPTIONAL { ?uri doap:release ?release . }
+      OPTIONAL { ?release doap:revision ?revision .}
       OPTIONAL { ?developer a ?devType .}
       OPTIONAL { ?developer foaf:name ?devName .}
       OPTIONAL { ?developer foaf:homepage ?devHomepage .}
@@ -220,7 +221,14 @@ class EarlReport
     test_resources = tests.values.map {|v| v[:uri]}.uniq.compact
     subjects = {}
 
-    assertion_graph = RDF::Graph.new
+    # Initialize test assertions with an entry for each test subject
+    test_assertion_lists = {}
+    test_assertion_lists = tests.keys.inject({}) do |memo, test|
+      memo.merge(test => [])
+    end
+
+    assertion_stats = {}
+
     # Read test assertion files into assertion graph
     files.flatten.each do |file|
       status "read #{file}"
@@ -237,10 +245,10 @@ class EarlReport
 
           # Load DOAP definitions
           unless solution[:name] # not loaded
-            status "read doap description for #{subject}"
+            status "  read doap description for #{subject}"
             begin
               doap_graph = RDF::Graph.load(subject)
-              status "  loaded #{doap_graph.count} triples"
+              status "    loaded #{doap_graph.count} triples"
               file_graph << doap_graph.to_a
             rescue
               warn "\nfailed to load DOAP from #{subject}: #{$!}"
@@ -260,10 +268,10 @@ class EarlReport
         if !solutions.first[:developer]
           warn "\nNo developer identified for #{solutions.first[:uri]}"
         elsif !solutions.first[:devName]
-          status "read description for developer #{solutions.first[:developer].inspect}"
+          status "  read description for developer #{solutions.first[:developer].inspect}"
           begin
             foaf_graph = RDF::Graph.load(solutions.first[:developer])
-            status "  loaded #{foaf_graph.count} triples"
+            status "    loaded #{foaf_graph.count} triples"
             file_graph << foaf_graph.to_a
             # Reload solutions
             solutions = SPARQL.execute(TEST_SUBJECT_QUERY, file_graph)
@@ -272,6 +280,7 @@ class EarlReport
           end
         end
 
+        release = nil
         solutions.each do |solution|
           # Kepp track of subjects
           subjects[solution[:uri]] = RDF::URI(file)
@@ -294,59 +303,55 @@ class EarlReport
           graph << RDF::Statement(solution[:developer], RDF::Vocab::FOAF.name, devName) if devName
           graph << RDF::Statement(solution[:developer], RDF::Vocab::FOAF.homepage, solution[:devHomepage]) if solution[:devHomepage]
 
-          rev = RDF::Node.new
-          graph << RDF::Statement(solution[:uri], RDF::Vocab::DOAP.release, rev)
-          graph << RDF::Statement(rev, RDF::Vocab::DOAP.revision, (solution[:revision] || "unknown"))
+          release ||= solution[:release] || RDF::Node.new
+          graph << RDF::Statement(solution[:uri], RDF::Vocab::DOAP.release, release)
+          graph << RDF::Statement(release, RDF::Vocab::DOAP.revision, (solution[:revision] || "unknown"))
         end
 
-        assertion_graph << file_graph
-      end
-    end
+        # Make sure that each assertion matches a test and add reference from test to assertion
+        found_solutions = false
+        subject = nil
 
-    # Make sure that each assertion matches a test and add reference from test to assertion
-    found_solutions = {}
+        status "  query assertions"
+        SPARQL.execute(ASSERTION_QUERY, file_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 ||= true
+          assertion_stats["Found"] = assertion_stats["Found"].to_i + 1
 
-    # Initialize test assertions with an entry for each test subject
-    test_assertion_lists = {}
-    test_assertion_lists = tests.keys.inject({}) do |memo, test|
-      memo.merge(test => Array.new(subjects.length))
-    end
+          # Add this solution at the appropriate index within that list
+          ndx = subjects.keys.find_index(subject)
+          ary = test_assertion_lists[solution[:test]]
 
-    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
+          ary[ndx] = a = RDF::Node.new
+          graph << RDF::Statement(a, RDF.type, EARL.Assertion)
+          graph << RDF::Statement(a, EARL.subject, subject)
+          graph << RDF::Statement(a, EARL.test, solution[:test])
+          graph << RDF::Statement(a, EARL.assertedBy, solution[:by])
+          graph << RDF::Statement(a, EARL.mode, solution[:mode]) if solution[:mode]
+          r = RDF::Node.new
+          graph << RDF::Statement(a, EARL.result, r)
+          graph << RDF::Statement(r, RDF.type, EARL.TestResult)
+          graph << RDF::Statement(r, EARL.outcome, solution[:outcome])
+        end
+
+        # See if subject did not report results, which may indicate a formatting error in the EARL source
+        $stderr.puts "No results found for #{subject} using #{ASSERTION_QUERY}" unless found_solutions
       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)
-      ary = test_assertion_lists[solution[:test]] ||= []
-
-      ary[ndx] = a = RDF::Node.new
-      graph << RDF::Statement(a, RDF.type, EARL.Assertion)
-      graph << RDF::Statement(a, EARL.subject, subject)
-      graph << RDF::Statement(a, EARL.test, solution[:test])
-      graph << RDF::Statement(a, EARL.assertedBy, solution[:by])
-      graph << RDF::Statement(a, EARL.mode, solution[:mode]) if solution[:mode]
-      r = RDF::Node.new
-      graph << RDF::Statement(a, EARL.result, r)
-      graph << RDF::Statement(r, RDF.type, EARL.TestResult)
-      graph << RDF::Statement(r, EARL.outcome, solution[:outcome])
     end
 
     # Add ordered assertions for each test
     test_assertion_lists.each do |test, ary|
+      ary[subjects.length - 1] ||= nil # extend for all subjects
       # Fill any missing entries with an untested outcome
       ary.each_with_index do |a, ndx|
         unless a
@@ -368,11 +373,6 @@ class EarlReport
 
     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}"
-    end
-
     # Add report wrapper to graph
     ttl = %(
       @prefix dc:   <http://purl.org/dc/terms/> .
@@ -482,9 +482,11 @@ class EarlReport
     @json_hash ||= begin
       # Customized JSON-LD output
       result = JSON::LD::API.fromRDF(graph) do |expanded|
-        framed = JSON::LD::API.frame(expanded, TEST_FRAME, expanded: true, embed: '@never')
+        framed = JSON::LD::API.frame(expanded, TEST_FRAME,
+          expanded: true,
+          embed: '@never',
+          pruneBlankNodeIdentifiers: false)
         # Reorder test subjects by @id
-        #require 'byebug'; byebug
         framed['testSubjects'] = framed['testSubjects'].sort_by {|t| t['@id']}
 
         # Reorder test assertions to make them consistent with subject order

data/lib/earl_report/views/earl_report.html.haml

@@ -334,10 +334,12 @@
                   - pass_fail = assertion['result']['outcome'].split(':').last.upcase.sub(/(PASS|FAIL)ED$/, '\1')
                   - passed_tests[ndx2][ndx] = (passed_tests[ndx2][ndx] || 0) + (pass_fail == 'PASS' ? 1 : 0)
                   %td{class: pass_fail, property: "earl:assertions", typeof: assertion['@type']}
-                    - if assertion['assertedBy']
+                    - if assertion['assertedBy'] && !assertion['assertedBy'].start_with?('_:')
                       %link{property: "earl:assertedBy", href: assertion['assertedBy']}
-                    %link{property: "earl:test", href: assertion['test']}
-                    %link{property: "earl:subject", href: assertion['subject']}
+                    - if assertion['test'] && !assertion['test'].start_with?('_:')
+                      %link{property: "earl:test", href: assertion['test']}
+                    - if assertion['subject'] && !assertion['subject'].start_with?('_:')
+                      %link{property: "earl:subject", href: assertion['subject']}
                     - if assertion['mode']
                       %link{property: 'earl:mode', href: assertion['mode']}
                     %span{property: "earl:result", typeof: assertion['result']['@type']}
@@ -443,10 +445,10 @@
                 %p{property: "dc:description rdfs:comment"}<
                   ~ CGI.escapeHTML test['description'].to_s
                 %pre{class: "example actionDoc", property: "mf:action", resource: test['testAction'], title: "#{test['title']} Input"}<
-                  ~ Kernel.open(test['testAction']) {|f| f.set_encoding(Encoding::UTF_8); CGI.escapeHTML(f.read).gsub(/\n/, '<br/>')} rescue "#{test['testAction']} not loaded"
+                  ~ URI.open(test['testAction']) {|f| f.set_encoding(Encoding::UTF_8); CGI.escapeHTML(f.read).gsub(/\n/, '<br/>')} rescue "#{test['testAction']} not loaded"
                 - if test['testResult']
                   %pre{class: "example resultDoc", property: "mf:result", resource: test['testResult'], title: "#{test['title']} Result"}<
-                    ~ Kernel.open(test['testResult']) {|f| f.set_encoding(Encoding::UTF_8); CGI.escapeHTML(f.read).gsub(/\n/, '<br/>')} rescue "#{test['testResult']} not loaded"
+                    ~ URI.open(test['testResult']) {|f| f.set_encoding(Encoding::UTF_8); CGI.escapeHTML(f.read).gsub(/\n/, '<br/>')} rescue "#{test['testResult']} not loaded"
     %section.appendix#report-generation-software{property: "earl:generatedBy", resource: tests['generatedBy']['@id'], typeof: tests['generatedBy']['@type'].join(' ')}
       %h2
         %span.secno="D."
@@ -464,7 +466,8 @@
         %span{property: "doap:release", resource: rel['@id'], typeof: 'doap:Version'}
           %span{property: "doap:revision"}<=rel['revision']
           %meta{property: "doap:name", content: rel['name']}
-          %meta{property: "doap:created", content: rel['created'], datatype: "xsd:date"}
+          - if rel['created']
+            %meta{property: "doap:created", content: rel['created'], datatype: "xsd:date"}
         an
         %a{property: "doap:license", href: doap['license']}<="Unlicensed"
         %span{property: "doap:programming-language"}<="Ruby"

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'rspec/its'
 require 'simplecov'
 require 'coveralls'
+require 'awesome_print'
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter

data/spec/test-files/results.html

@@ -73,8 +73,8 @@ Implementation Report
 <h2 id='w3c-document-28-october-2015'>
 <abbr title='World Wide Web Consortium'>W3C</abbr>
 Document
-<time class='dt-published' datetime='2020-02-21' property='dc:issued'>
-21 February 2020
+<time class='dt-published' datetime='2020-04-10' property='dc:issued'>
+10 April 2020
 </time>
 </h2>
 <dl>
@@ -231,7 +231,7 @@ Report Generation Software
 <span class='secno'>2.</span>
 Test Manifests
 </h2>
-<section id='Description-for-Example-Test-Cases' resource='http://example/manifest.ttl' typeof='Report mf:Manifest'>
+<section id='Description-for-Example-Test-Cases' resource='http://example/manifest.ttl' typeof='mf:Manifest Report'>
 <h2>
 <span class='secno'>2.1</span>
 <span property='dc:title mf:name'>Example Test Cases</span>
@@ -245,7 +245,7 @@ Test
 <a href='#subj_0'>RDF::Turtle</a>
 </th>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval TestCase'>
+<tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
 <td>
 <a href='#test_1fdd82ac4caf30510cabfdb0a5987ddd'>subm-test-00</a>
 </td>
@@ -261,12 +261,11 @@ PASS
 </span>
 </td>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='_:b5' typeof='TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval TestCase'>
+<tr inlist='inlist' rel='mf:entries' resource='_:b4' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
 <td>
-<a href='#test_afa00d7d18419c220355daf1fd144bee'>subm-test-01</a>
+<a href='#test_c3a45336bb3ff1ac310bee3349a6ace7'>subm-test-01</a>
 </td>
 <td class='UNTESTED' property='earl:assertions' typeof='Assertion'>
-<link href='_:b5' 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'>
@@ -301,7 +300,7 @@ This report was tested using the following test subjects:
 <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='TestSubject doap:Project Software'>
+<dd property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='doap:Project TestSubject Software'>
 <dl>
 <dt>Description</dt>
 <dd lang='en' property='doap:description'>RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.</dd>
@@ -377,11 +376,11 @@ Test
 <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_afa00d7d18419c220355daf1fd144bee' resource='_:b5'>
+<dt id='test_c3a45336bb3ff1ac310bee3349a6ace7' resource='_:b4'>
 Test
 <span property='dc:title mf:name'>subm-test-01</span>
 </dt>
-<dd resource='_:b5'>
+<dd resource='_:b4'>
 <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>
@@ -400,10 +399,9 @@ This report generated by
 <meta content='Earl Report summary generator' property='doap:shortdesc' />
 <meta content='EarlReport generates HTML+RDFa rollups of multiple EARL reports' property='doap:description' />
 version
-<span property='doap:release' resource='https://github.com/gkellogg/earl-report/tree/0.4.8' typeof='doap:Version'>
-<span property='doap:revision'>0.4.8</span>
-<meta content='earl-report-0.4.8' property='doap:name' />
-<meta datatype='xsd:date' property='doap:created' />
+<span property='doap:release' resource='https://github.com/gkellogg/earl-report/tree/0.4.9' typeof='doap:Version'>
+<span property='doap:revision'>0.4.9</span>
+<meta content='earl-report-0.4.9' property='doap:name' />
 </span>
 an
 <a href='http://unlicense.org' property='doap:license'>Unlicensed</a>

data/spec/test-files/results.jsonld

@@ -108,137 +108,137 @@
     "Software"
   ],
   "name": "Turtle Test Results",
+  "assertions": [
+    "/Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl"
+  ],
+  "generatedBy": {
+    "@id": "http://rubygems.org/gems/earl-report",
+    "@type": [
+      "doap:Project",
+      "Software"
+    ],
+    "release": {
+      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.9",
+      "@type": "doap:Version",
+      "name": "earl-report-0.4.9",
+      "doap:created": {
+        "@value": "2020-04-01",
+        "@type": "http://www.w3.org/2001/XMLSchema#date"
+      },
+      "revision": "0.4.9"
+    },
+    "name": "earl-report",
+    "homepage": "https://github.com/gkellogg/earl-report",
+    "developer": [
+      {
+        "@id": "http://greggkellogg.net/foaf#me",
+        "@type": [
+          "Assertor",
+          "foaf:Person"
+        ],
+        "foaf:homepage": "http://greggkellogg.net/",
+        "foaf:name": "Gregg Kellogg"
+      }
+    ],
+    "license": "http://unlicense.org",
+    "doapDesc": "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
+    "shortdesc": "Earl Report summary generator",
+    "language": "Ruby"
+  },
+  "testSubjects": [
+    {
+      "@id": "http://rubygems.org/gems/rdf-turtle",
+      "@type": [
+        "doap:Project",
+        "TestSubject",
+        "Software"
+      ],
+      "release": {
+        "@id": "_:b4",
+        "revision": "unknown"
+      },
+      "name": "RDF::Turtle",
+      "homepage": "http://ruby-rdf.github.com/rdf-turtle",
+      "developer": [
+        {
+          "@id": "http://greggkellogg.net/foaf#me",
+          "@type": [
+            "Assertor",
+            "foaf:Person"
+          ],
+          "foaf:homepage": "http://greggkellogg.net/",
+          "foaf:name": "Gregg Kellogg"
+        }
+      ],
+      "doapDesc": "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
+      "language": "Ruby"
+    }
+  ],
+  "bibRef": "[[TURTLE]]",
   "entries": [
     {
       "@id": "http://example/manifest.ttl",
       "@type": [
-        "Report",
-        "mf:Manifest"
+        "mf:Manifest",
+        "Report"
       ],
-      "title": "Example Test Cases",
       "rdfs:comment": "Description for Example Test Cases",
+      "title": "Example Test Cases",
       "entries": [
         {
           "@id": "http://example/manifest.ttl#testeval00",
           "@type": [
+            "TestCase",
             "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval",
-            "TestCase"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval"
           ],
-          "title": "subm-test-00",
           "rdfs:comment": "Blank subject",
-          "testAction": "http://example/test-00.ttl",
+          "title": "subm-test-00",
           "assertions": [
             {
+              "@id": "_:b2",
               "@type": "Assertion",
               "mode": "earl:automatic",
+              "test": "http://example/manifest.ttl#testeval00",
+              "subject": "http://rubygems.org/gems/rdf-turtle",
               "result": {
+                "@id": "_:b1",
                 "@type": "TestResult",
                 "outcome": "earl:passed"
               },
-              "test": "http://example/manifest.ttl#testeval00",
-              "assertedBy": "http://greggkellogg.net/foaf#me",
-              "subject": "http://rubygems.org/gems/rdf-turtle"
+              "assertedBy": "http://greggkellogg.net/foaf#me"
             }
           ],
+          "testAction": "http://example/test-00.ttl",
           "testResult": "http://example/test-00.out"
         },
         {
-          "@id": "_:b1",
+          "@id": "_:b0",
           "@type": [
+            "TestCase",
             "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval",
-            "TestCase"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval"
           ],
-          "title": "subm-test-01",
           "rdfs:comment": "@prefix and qnames",
-          "testAction": "http://example/test-01.ttl",
+          "title": "subm-test-01",
           "assertions": [
             {
+              "@id": "_:b3",
               "@type": "Assertion",
               "result": {
+                "@id": "_:b5",
                 "@type": "TestResult",
                 "outcome": "earl:untested"
               },
-              "test": "_:b1",
+              "test": "_:b0",
               "subject": "http://rubygems.org/gems/rdf-turtle",
               "assertedBy": null
             }
           ],
+          "testAction": "http://example/test-01.ttl",
           "testResult": "http://example/test-01.out"
         }
       ]
     }
-  ],
-  "generatedBy": {
-    "@id": "http://rubygems.org/gems/earl-report",
-    "@type": [
-      "doap:Project",
-      "Software"
-    ],
-    "doapDesc": "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
-    "shortdesc": "Earl Report summary generator",
-    "name": "earl-report",
-    "developer": [
-      {
-        "@id": "http://greggkellogg.net/foaf#me",
-        "@type": [
-          "Assertor",
-          "foaf:Person"
-        ],
-        "foaf:name": "Gregg Kellogg",
-        "foaf:homepage": "http://greggkellogg.net/"
-      }
-    ],
-    "homepage": "https://github.com/gkellogg/earl-report",
-    "release": {
-      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.8",
-      "@type": "doap:Version",
-      "doap:created": {
-        "@value": "2019-09-06",
-        "@type": "http://www.w3.org/2001/XMLSchema#date"
-      },
-      "name": "earl-report-0.4.8",
-      "revision": "0.4.8"
-    },
-    "language": "Ruby",
-    "license": "http://unlicense.org"
-  },
-  "testSubjects": [
-    {
-      "@id": "http://rubygems.org/gems/rdf-turtle",
-      "@type": [
-        "TestSubject",
-        "doap:Project",
-        "Software"
-      ],
-      "doapDesc": "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
-      "name": "RDF::Turtle",
-      "developer": [
-        {
-          "@id": "http://greggkellogg.net/foaf#me",
-          "@type": [
-            "Assertor",
-            "foaf:Person"
-          ],
-          "foaf:name": "Gregg Kellogg",
-          "foaf:homepage": "http://greggkellogg.net/"
-        }
-      ],
-      "homepage": "http://ruby-rdf.github.com/rdf-turtle",
-      "release": [
-        {
-          "revision": "unknown"
-        },
-        {
-          "revision": "unknown"
-        }
-      ],
-      "language": "Ruby"
-    }
-  ],
-  "bibRef": "[[TURTLE]]",
-  "assertions": [
-    "/Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl"
   ]
 }

data/spec/test-files/results.ttl

@@ -18,15 +18,15 @@
 
 # Manifests
 
-<http://example/manifest.ttl> a earl:Report,
-    mf:Manifest;
+<http://example/manifest.ttl> a mf:Manifest,
+    earl:Report;
   rdfs:comment "Description for Example Test Cases";
-  mf:entries (<http://example/manifest.ttl#testeval00> _:g406000);
+  mf:entries (<http://example/manifest.ttl#testeval00> _:g407680);
   mf:name "Example Test Cases" .
 
-<http://example/manifest.ttl#testeval00> a earl:TestCriterion,
-    <http://www.w3.org/ns/rdftest#TestTurtleEval>,
-    earl:TestCase;
+<http://example/manifest.ttl#testeval00> a earl:TestCase,
+    earl:TestCriterion,
+    <http://www.w3.org/ns/rdftest#TestTurtleEval>;
   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>
   ] .
 
-_:g406000 a earl:TestCriterion,
-    <http://www.w3.org/ns/rdftest#TestTurtleEval>,
-    earl:TestCase;
+_:g407680 a earl:TestCase,
+    earl:TestCriterion,
+    <http://www.w3.org/ns/rdftest#TestTurtleEval>;
   rdfs:comment "@prefix and qnames";
   mf:action <http://example/test-01.ttl>;
   mf:name "subm-test-01";
@@ -57,20 +57,20 @@ _:g406000 a earl:TestCriterion,
       earl:outcome earl:untested
     ];
     earl:subject <http://rubygems.org/gems/rdf-turtle>;
-    earl:test _:g406000
+    earl:test _:g407680
   ] .
 
 # Test Subjects
 
-<http://rubygems.org/gems/rdf-turtle> a earl:TestSubject,
-    doap:Project,
+<http://rubygems.org/gems/rdf-turtle> a doap:Project,
+    earl:TestSubject,
     earl:Software;
   doap:description "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en;
   doap:developer <http://greggkellogg.net/foaf#me>;
   doap:homepage <http://ruby-rdf.github.com/rdf-turtle>;
   doap:name "RDF::Turtle";
   doap:programming-language "Ruby";
-  doap:release [doap:revision "unknown"], [doap:revision "unknown"] .
+  doap:release [doap:revision "unknown"] .
 
 <http://greggkellogg.net/foaf#me> a earl:Assertor,
     foaf:Person;
@@ -87,10 +87,10 @@ _:g406000 a earl:TestCriterion,
   doap:license <http://unlicense.org>;
   doap:name "earl-report";
   doap:programming-language "Ruby";
-  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.8>;
+  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.9>;
   doap:shortdesc "Earl Report summary generator"@en .
 
-<https://github.com/gkellogg/earl-report/tree/0.4.8> a doap:Version;
-  doap:created "2019-09-06"^^xsd:date;
-  doap:name "earl-report-0.4.8";
-  doap:revision "0.4.8" .
+<https://github.com/gkellogg/earl-report/tree/0.4.9> a doap:Version;
+  doap:created "2020-04-01"^^xsd:date;
+  doap:name "earl-report-0.4.9";
+  doap:revision "0.4.9" .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata