earl-report 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d9b1de6d1ff74153dad8f2ff10691a43066da67b118c2c3cac375d030963e9
-  data.tar.gz: 2717c41b45c6f878157d070e34ca459530eda435b668e83141e6acb730f0be7b
+  metadata.gz: 7879d1953b9802807a57232a01207aa3b63f5ed80c025273ccdfe826e6f86c93
+  data.tar.gz: bf899c9f720aa8b8f67694e7398f693502fef7fb748b3fa5136acd05fe7495ca
 SHA512:
-  metadata.gz: f32d6ee582e6fb93c7a87f43a88c8146ec2ca952cb6000e8459213d65260cb454a253947adefe013d8cd0026aa847fde157a0eda0949077cb72e265f06ed61b3
-  data.tar.gz: 6ade127c2bb38bb1bec57106a71672d091a107799e6b2e1f37e65ecc66e4608a2573455a50470be918636aa230669b88fbde660e65c9172d660619982539dd73
+  metadata.gz: 57c7ec9fff3d0634c35fc96d646febda4c7ce71fdaa9f8c8f78702335fdedb7c0babe6ccddf515cd17065284dc0627d085a3d41ee05dfeea5dd96b73b25b61d5
+  data.tar.gz: fdee07b06ca6344764876c8649f0c906c974326f27427120afb0455ef47fd35d4387e9f64b9f84ecf552bad44581769eec9455e3c27612b66ba26c8ac510a609

data/README.md

@@ -78,11 +78,21 @@ can be used by specifying a customized manifest query, but may require a custom
 The report template is in [ReSpec][] form using [Haml]() to generate individual report elements.
 
 ## Changes from previous versions
-Version 0.3 and prior re-constructed the test manifest used to create the body of the report, which caused information not described within the query to be lost. Starting with 0.4, all manifests and assertions are read into a single graph, and each test references a list of assertions against it using a list referenced by `earl:assertions`. Additionally, all included manifests are included in a top-level entity referenced via `mf:entries`. For example:
+### Version 0.7
+Version 0.7 creates incompatibilities with previous result formats. Previously, terms were "added" to the EARL vocabulary to help with coordination. This version pulls that back, but does depend on an added `earl:Report` class which acts as an appropriate container for for collections of  `earl:Assertion`.
+
+Within an `earl:TestCase`, the former `earl:assertions` property is replaced with a reverse property on `earl:test` so that, in the JSON-LD representation, an `earl:TestCase` will contain a property representing the related assertions.
+
+Also, `earl:assertions` had been miss-appropriated to reference the sources of the individual test results provided for each test subject. A new property as appropriated from the Test Manifest vocabulary: `mf:report`. The alias `assertions` continues to be used within the JSON-LD representation, although it now maps to `mf:report` at the top level, and as mentioned, is a reverse property of `earl:test` within an `earl:TestCase`.
+
+These changes may require updates to customized Haml templates.
+
+### Version 0.3
+Version 0.3 and prior re-constructed the test manifest used to create the body of the report, which caused information not described within the query to be lost. Starting with 0.4, all manifests and assertions are read into a single graph, and each test references a list of assertions against it using a list referenced by `mf:assertions`. Additionally, all included manifests are included in a top-level entity referenced via `mf:entries`. For example:
 
     <> a earl:Software, doap:Project;
        mf:entries (<http://example/manifest.ttl>);
-       earl:assertions (<spec/test-files/report-complete.ttl>)  .
+       mf:assertions (<spec/test-files/report-complete.ttl>)  .
 
     <http://example/manifest.ttl> a mf:Manifest, earl:Report;
        mf:name "Example Test Cases";
@@ -94,7 +104,7 @@ Version 0.3 and prior re-constructed the test manifest used to create the body o
        rdfs:comment "Blank subject";
        mf:action <http://example/test-00.ttl>;
        mf:result <http://example/test-00.out>;
-       earl:assertions ([
+       mf:assertions ([
            a earl:Assertion;
            earl:assertedBy <https://greggkellogg.net/foaf#me>;
            earl:mode earl:automatic;

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/lib/earl_report.rb

@@ -93,12 +93,20 @@ class EarlReport
       "foaf" =>         "http://xmlns.com/foaf/0.1/",
       "rdfs" =>         "http://www.w3.org/2000/01/rdf-schema#",
       "assertedBy" =>   {"@type" => "@id"},
-      "assertions" =>   {"@type" => "@id", "@container" => "@set"},
+      "assertions" =>   {"@id" => "mf:report", "@type" => "@id", "@container" => "@set"},
       "bibRef" =>       {"@id" => "dc:bibliographicCitation"},
       "created" =>      {"@id" => "doap:created", "@type" => "xsd:date"},
       "description" =>  {"@id" => "rdfs:comment", "@language" => "en"},
       "developer" =>    {"@id" => "doap:developer", "@type" => "@id", "@container" => "@set"},
       "doapDesc" =>     {"@id" => "doap:description", "@language" => "en"},
+      "entries" =>      {
+        "@id" => "mf:entries", "@type" => "@id", "@container" => "@list",
+        "@context" => {
+          "assertions" =>   {
+            "@reverse" => "earl:test", "@type" => "@id", "@container" => "@set"
+          },
+        }
+      },
       "generatedBy" =>  {"@type" => "@id"},
       "homepage" =>     {"@id" => "doap:homepage", "@type" => "@id"},
       "language" =>     {"@id" => "doap:programming-language"},
@@ -114,7 +122,6 @@ class EarlReport
       "testAction" =>   {"@id" => "mf:action", "@type" => "@id"},
       "testResult" =>   {"@id" => "mf:result", "@type" => "@id"},
       "title" =>        {"@id" => "mf:name"},
-      "entries" =>      {"@id" => "mf:entries", "@type" => "@id", "@container" => "@list"},
       "testSubjects" => {"@type" => "@id", "@container" => "@set"},
       "xsd" =>          {"@id" => "http://www.w3.org/2001/XMLSchema#"}
     },
@@ -184,7 +191,6 @@ class EarlReport
   ).gsub(/^  /, '')
 
   # Convenience vocabularies
-  class EARL < RDF::Vocabulary("http://www.w3.org/ns/earl#"); end
   class MF < RDF::Vocabulary("http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"); end
 
   ##
@@ -331,8 +337,8 @@ class EarlReport
           doapDesc.language ||= :en if doapDesc
           devName = solution[:devName].to_s if solution[:devName]
           graph << RDF::Statement(solution[:uri], RDF.type, RDF::Vocab::DOAP.Project)
-          graph << RDF::Statement(solution[:uri], RDF.type, EARL.TestSubject)
-          graph << RDF::Statement(solution[:uri], RDF.type, EARL.Software)
+          graph << RDF::Statement(solution[:uri], RDF.type, RDF::Vocab::EARL.TestSubject)
+          graph << RDF::Statement(solution[:uri], RDF.type, RDF::Vocab::EARL.Software)
           graph << RDF::Statement(solution[:uri], RDF::Vocab::DOAP.name, doapName)
           graph << RDF::Statement(solution[:uri], RDF::Vocab::DOAP.developer, solution[:developer])
           graph << RDF::Statement(solution[:uri], RDF::Vocab::DOAP.homepage, solution[:homepage]) if solution[:homepage]
@@ -377,15 +383,15 @@ class EarlReport
           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]
+          graph << RDF::Statement(a, RDF.type, RDF::Vocab::EARL.Assertion)
+          graph << RDF::Statement(a, RDF::Vocab::EARL.subject, subject)
+          graph << RDF::Statement(a, RDF::Vocab::EARL.test, solution[:test])
+          graph << RDF::Statement(a, RDF::Vocab::EARL.assertedBy, solution[:by])
+          graph << RDF::Statement(a, RDF::Vocab::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])
+          graph << RDF::Statement(a, RDF::Vocab::EARL.result, r)
+          graph << RDF::Statement(r, RDF.type, RDF::Vocab::EARL.TestResult)
+          graph << RDF::Statement(r, RDF::Vocab::EARL.outcome, solution[:outcome])
         end
 
         # See if subject did not report results, which may indicate a formatting error in the EARL source
@@ -401,17 +407,14 @@ class EarlReport
         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])
-          graph << RDF::Statement(a, EARL.test, test)
+          graph << RDF::Statement(a, RDF.type, RDF::Vocab::EARL.Assertion)
+          graph << RDF::Statement(a, RDF::Vocab::EARL.subject, subjects.keys[ndx])
+          graph << RDF::Statement(a, RDF::Vocab::EARL.test, test)
           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, EARL.untested)
+          graph << RDF::Statement(a, RDF::Vocab::EARL.result, r)
+          graph << RDF::Statement(r, RDF.type, RDF::Vocab::EARL.TestResult)
+          graph << RDF::Statement(r, RDF::Vocab::EARL.outcome, RDF::Vocab::EARL.untested)
         end
-
-        # This counts on order being preserved in default repository so we can avoid using an rdf:List
-        graph << RDF::Statement(test, EARL.assertions, a)
       end
     end
 
@@ -423,7 +426,7 @@ class EarlReport
     doap:name #{quoted(name)};
     dc:bibliographicCitation "#{bibRef}";
     earl:generatedBy <https://rubygems.org/gems/earl-report>;
-    earl:assertions #{subjects.values.map {|f| f.to_ntriples}.join(",\n          ")};
+    mf:report #{subjects.values.map {|f| f.to_ntriples}.join(",\n          ")};
     earl:testSubjects #{subjects.keys.map {|f| f.to_ntriples}.join(",\n          ")};
     mf:entries (#{man_uris.map {|f| f.to_ntriples}.join("\n          ")}) .
     ).gsub(/^    /, '') +
@@ -432,18 +435,18 @@ class EarlReport
 
     # Each manifest is an earl:Report
     man_uris.each do |u|
-      graph << RDF::Statement.new(u, RDF.type, EARL.Report)
+      graph << RDF::Statement.new(u, RDF.type, RDF::Vocab::EARL.Report)
     end
 
     # Each subject is an earl:TestSubject
     subjects.keys.each do |u|
-      graph << RDF::Statement.new(u, RDF.type, EARL.TestSubject)
+      graph << RDF::Statement.new(u, RDF.type, RDF::Vocab::EARL.TestSubject)
     end
 
     # Each assertion test is a earl:TestCriterion and earl:TestCase
     test_resources.each do |u|
-      graph << RDF::Statement.new(u, RDF.type, EARL.TestCriterion)
-      graph << RDF::Statement.new(u, RDF.type, EARL.TestCase)
+      graph << RDF::Statement.new(u, RDF.type, RDF::Vocab::EARL.TestCriterion)
+      graph << RDF::Statement.new(u, RDF.type, RDF::Vocab::EARL.TestCase)
     end
 
     raise "Warnings issued in strict mode" if strict && @warnings > 0
@@ -575,7 +578,11 @@ class EarlReport
       when '@type'
         "a " + ttl_value(dv)
       when 'assertions'
-        "earl:assertions #{dv.map {|a| ttl_assertion(a)}.join(", ")}"
+        if dv.all? {|a| a.is_a?(String)}
+          "mf:report #{ttl_value(dv, whitespace: "\n    ")}"
+        else
+          "earl:assertions #{dv.map {|a| ttl_assertion(a)}.join(", ")}"
+        end
       when 'entries'
         "mf:entries #{ttl_value({'@list' => dv}, whitespace: "\n    ")}"
       when 'release'

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

@@ -333,7 +333,7 @@
                   - assertion = test['assertions'].detect {|a| a['subject'] == subject['@id']}
                   - 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']}
+                  %td{class: pass_fail, typeof: assertion['@type']}
                     - if assertion['assertedBy'] && !assertion['assertedBy'].start_with?('_:')
                       %link{property: "earl:assertedBy", href: assertion['assertedBy']}
                     - if assertion['test'] && !assertion['test'].start_with?('_:')
@@ -418,7 +418,7 @@
                         %td{class: (pct == 100.0 ? 'passed-all' : (pct >= 85.0 ? 'passed-most' : 'passed-some'))}
                           = "#{passed}/#{total} (#{'%.1f' % pct}%)"
     - unless tests['assertions'].empty?
-      %section.appendix#individual-test-results{rel: "xhv:related earl:assertions"}
+      %section.appendix#individual-test-results{rel: "xhv:related mf:report"}
         %h2
           %span.secno="B."
           Individual Test Results

data/spec/earl_report_spec.rb

@@ -400,6 +400,10 @@ describe EarlReport do
       end
     }
 
+    it "is valid HTML" do
+      expect(output).to be_valid_html
+    end
+
     context "parsing to RDF" do
       let(:graph) do
         @graph ||= begin
@@ -472,7 +476,7 @@ describe EarlReport do
         doap:name "Turtle Test Results";
         dc:bibliographicCitation "[[TURTLE]]";
         earl:generatedBy ?generatedBy;
-        earl:assertions ?assertionFile;
+        mf:report ?assertionFile;
         earl:testSubjects <https://rubygems.org/gems/rdf-turtle>;
         mf:entries (<http://example/manifest.ttl>) .
 
@@ -517,8 +521,11 @@ describe EarlReport do
       <http://example/manifest.ttl#testeval00> a earl:TestCriterion, earl:TestCase;
         mf:name "subm-test-00";
         mf:action <http://example/test-00.ttl>;
-        mf:result <http://example/test-00.out>;
-        earl:assertions [ a earl:Assertion; earl:subject <https://rubygems.org/gems/rdf-turtle> ] .
+        mf:result <http://example/test-00.out>.
+      [ a earl:Assertion;
+        earl:subject <https://rubygems.org/gems/rdf-turtle>;
+        earl:test <http://example/manifest.ttl#testeval00>
+      ] .
     }
   )
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "bundler/setup"
 require 'rspec'
 require 'rspec/its'
 require 'amazing_print'
+require 'nokogumbo'
 
 begin
   require 'simplecov'
@@ -34,3 +35,15 @@ JSON_STATE = JSON::State.new(
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
 end
+
+RSpec::Matchers.define :be_valid_html do
+  match do |actual|
+    root = Nokogiri::HTML5(actual, max_parse_errors: 1000)
+    @errors = Array(root && root.errors.map(&:to_s))
+    @errors.empty?
+  end
+  
+  failure_message do |actual|
+    "expected no errors, was #{@errors.join("\n")}"
+  end
+end

data/spec/test-files/results.html

@@ -245,11 +245,11 @@ Test
 <a href='#subj_0'>RDF::Turtle</a>
 </th>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='TestCriterion TestCase 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>
-<td class='PASS' property='earl:assertions' typeof='Assertion'>
+<td class='PASS' typeof='Assertion'>
 <link href='https://greggkellogg.net/foaf#me' property='earl:assertedBy' />
 <link href='http://example/manifest.ttl#testeval00' property='earl:test' />
 <link href='https://rubygems.org/gems/rdf-turtle' property='earl:subject' />
@@ -261,11 +261,11 @@ PASS
 </span>
 </td>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='_:b3' typeof='TestCriterion TestCase http://www.w3.org/ns/rdftest#TestTurtleEval'>
+<tr inlist='inlist' rel='mf:entries' resource='_:b1' typeof='http://www.w3.org/ns/rdftest#TestTurtleEval TestCase TestCriterion'>
 <td>
-<a href='#test_14698d4bb89cdb1ecd9215e2a55d29c6'>subm-test-01</a>
+<a href='#test_b4d4f9531721bf1a6e4562f27353abd3'>subm-test-01</a>
 </td>
-<td class='UNTESTED' property='earl:assertions' typeof='Assertion'>
+<td class='UNTESTED' typeof='Assertion'>
 <link href='https://rubygems.org/gems/rdf-turtle' property='earl:subject' />
 <span property='earl:result' typeof='TestResult'>
 <span property='earl:outcome' resource='earl:untested'>
@@ -346,7 +346,7 @@ Example Test Cases
 </dd>
 </dl>
 </section>
-<section class='appendix' id='individual-test-results' rel='xhv:related earl:assertions'>
+<section class='appendix' id='individual-test-results' rel='xhv:related mf:report'>
 <h2>
 <span class='secno'>B.</span>
 Individual Test Results
@@ -376,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_14698d4bb89cdb1ecd9215e2a55d29c6' resource='_:b3'>
+<dt id='test_b4d4f9531721bf1a6e4562f27353abd3' resource='_:b1'>
 Test
 <span property='dc:title mf:name'>subm-test-01</span>
 </dt>
-<dd resource='_:b3'>
+<dd resource='_:b1'>
 <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>
@@ -399,9 +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.6.1' typeof='doap:Version'>
-<span property='doap:revision'>0.6.1</span>
-<meta content='earl-report-0.6.1' property='doap:name' />
+<span property='doap:release' resource='https://github.com/gkellogg/earl-report/tree/0.6.2' typeof='doap:Version'>
+<span property='doap:revision'>0.6.2</span>
+<meta content='earl-report-0.6.2' property='doap:name' />
 </span>
 an
 <a href='http://unlicense.org' property='doap:license'>Unlicensed</a>

data/spec/test-files/results.jsonld

@@ -15,6 +15,7 @@
       "@type": "@id"
     },
     "assertions": {
+      "@id": "mf:report",
       "@type": "@id",
       "@container": "@set"
     },
@@ -38,6 +39,18 @@
       "@id": "doap:description",
       "@language": "en"
     },
+    "entries": {
+      "@id": "mf:entries",
+      "@type": "@id",
+      "@container": "@list",
+      "@context": {
+        "assertions": {
+          "@reverse": "earl:test",
+          "@type": "@id",
+          "@container": "@set"
+        }
+      }
+    },
     "generatedBy": {
       "@type": "@id"
     },
@@ -89,11 +102,6 @@
     "title": {
       "@id": "mf:name"
     },
-    "entries": {
-      "@id": "mf:entries",
-      "@type": "@id",
-      "@container": "@list"
-    },
     "testSubjects": {
       "@type": "@id",
       "@container": "@set"
@@ -107,6 +115,69 @@
     "Software",
     "doap:Project"
   ],
+  "generatedBy": {
+    "@id": "https://rubygems.org/gems/earl-report",
+    "@type": [
+      "Software",
+      "doap:Project"
+    ],
+    "release": {
+      "@id": "https://github.com/gkellogg/earl-report/tree/0.6.2",
+      "@type": "doap:Version",
+      "doap:created": {
+        "@type": "http://www.w3.org/2001/XMLSchema#date",
+        "@value": "2021-03-25"
+      },
+      "revision": "0.6.2",
+      "name": "earl-report-0.6.2"
+    },
+    "language": "Ruby",
+    "license": "http://unlicense.org",
+    "name": "earl-report",
+    "doapDesc": "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
+    "homepage": "https://github.com/gkellogg/earl-report",
+    "developer": [
+      {
+        "@id": "https://greggkellogg.net/foaf#me",
+        "@type": [
+          "foaf:Person",
+          "Assertor"
+        ],
+        "foaf:homepage": "https://greggkellogg.net/",
+        "foaf:name": "Gregg Kellogg"
+      }
+    ],
+    "shortdesc": "Earl Report summary generator"
+  },
+  "testSubjects": [
+    {
+      "@id": "https://rubygems.org/gems/rdf-turtle",
+      "@type": [
+        "TestSubject",
+        "Software",
+        "doap:Project"
+      ],
+      "release": {
+        "@id": "_:b0",
+        "revision": "unknown"
+      },
+      "language": "Ruby",
+      "name": "RDF::Turtle",
+      "doapDesc": "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
+      "homepage": "http://ruby-rdf.github.com/rdf-turtle",
+      "developer": [
+        {
+          "@id": "https://greggkellogg.net/foaf#me",
+          "@type": [
+            "foaf:Person",
+            "Assertor"
+          ],
+          "foaf:homepage": "https://greggkellogg.net/",
+          "foaf:name": "Gregg Kellogg"
+        }
+      ]
+    }
+  ],
   "assertions": [
     "/Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl"
   ],
@@ -125,120 +196,57 @@
         {
           "@id": "http://example/manifest.ttl#testeval00",
           "@type": [
-            "TestCriterion",
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
             "TestCase",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "TestCriterion"
           ],
           "rdfs:comment": "Blank subject",
+          "testResult": "http://example/test-00.out",
           "title": "subm-test-00",
+          "testAction": "http://example/test-00.ttl",
           "assertions": [
             {
-              "@id": "_:b1",
+              "@id": "_:b2",
               "@type": "Assertion",
-              "assertedBy": "https://greggkellogg.net/foaf#me",
-              "subject": "https://rubygems.org/gems/rdf-turtle",
+              "test": "http://example/manifest.ttl#testeval00",
               "result": {
-                "@id": "_:b4",
+                "@id": "_:b3",
                 "@type": "TestResult",
                 "outcome": "earl:passed"
               },
               "mode": "earl:automatic",
-              "test": "http://example/manifest.ttl#testeval00"
+              "subject": "https://rubygems.org/gems/rdf-turtle",
+              "assertedBy": "https://greggkellogg.net/foaf#me"
             }
-          ],
-          "testResult": "http://example/test-00.out",
-          "testAction": "http://example/test-00.ttl"
+          ]
         },
         {
-          "@id": "_:b2",
+          "@id": "_:b1",
           "@type": [
-            "TestCriterion",
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
             "TestCase",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "TestCriterion"
           ],
           "rdfs:comment": "@prefix and qnames",
+          "testResult": "http://example/test-01.out",
           "title": "subm-test-01",
+          "testAction": "http://example/test-01.ttl",
           "assertions": [
             {
-              "@id": "_:b3",
+              "@id": "_:b4",
               "@type": "Assertion",
-              "subject": "https://rubygems.org/gems/rdf-turtle",
+              "test": "_:b1",
               "result": {
                 "@id": "_:b5",
                 "@type": "TestResult",
                 "outcome": "earl:untested"
               },
-              "test": "_:b2",
+              "subject": "https://rubygems.org/gems/rdf-turtle",
               "assertedBy": null
             }
-          ],
-          "testResult": "http://example/test-01.out",
-          "testAction": "http://example/test-01.ttl"
+          ]
         }
       ]
     }
-  ],
-  "generatedBy": {
-    "@id": "https://rubygems.org/gems/earl-report",
-    "@type": [
-      "Software",
-      "doap:Project"
-    ],
-    "license": "http://unlicense.org",
-    "developer": [
-      {
-        "@id": "https://greggkellogg.net/foaf#me",
-        "@type": [
-          "foaf:Person",
-          "Assertor"
-        ],
-        "foaf:homepage": "https://greggkellogg.net/",
-        "foaf:name": "Gregg Kellogg"
-      }
-    ],
-    "homepage": "https://github.com/gkellogg/earl-report",
-    "shortdesc": "Earl Report summary generator",
-    "doapDesc": "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
-    "name": "earl-report",
-    "release": {
-      "@id": "https://github.com/gkellogg/earl-report/tree/0.6.1",
-      "@type": "doap:Version",
-      "doap:created": {
-        "@type": "http://www.w3.org/2001/XMLSchema#date",
-        "@value": "2021-03-19"
-      },
-      "revision": "0.6.1",
-      "name": "earl-report-0.6.1"
-    },
-    "language": "Ruby"
-  },
-  "testSubjects": [
-    {
-      "@id": "https://rubygems.org/gems/rdf-turtle",
-      "@type": [
-        "TestSubject",
-        "Software",
-        "doap:Project"
-      ],
-      "developer": [
-        {
-          "@id": "https://greggkellogg.net/foaf#me",
-          "@type": [
-            "foaf:Person",
-            "Assertor"
-          ],
-          "foaf:homepage": "https://greggkellogg.net/",
-          "foaf:name": "Gregg Kellogg"
-        }
-      ],
-      "homepage": "http://ruby-rdf.github.com/rdf-turtle",
-      "language": "Ruby",
-      "doapDesc": "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
-      "name": "RDF::Turtle",
-      "release": {
-        "@id": "_:b0",
-        "revision": "unknown"
-      }
-    }
   ]
 }

data/spec/test-files/results.ttl

@@ -8,12 +8,12 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 <> a earl:Software, doap:Project ;
-  earl:assertions </Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl> ;
+  earl:generatedBy <https://rubygems.org/gems/earl-report> ;
+  earl:testSubjects <https://rubygems.org/gems/rdf-turtle> ;
+  mf:report </Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl> ;
   dc:bibliographicCitation "[[TURTLE]]" ;
   doap:name "Turtle Test Results" ;
-  mf:entries (<http://example/manifest.ttl>) ;
-  earl:generatedBy <https://rubygems.org/gems/earl-report> ;
-  earl:testSubjects <https://rubygems.org/gems/rdf-turtle> .
+  mf:entries (<http://example/manifest.ttl>) .
 
 # Manifests
 <http://example/manifest.ttl> a earl:Report, mf:Manifest ;
@@ -22,9 +22,11 @@
   mf:entries (<http://example/manifest.ttl#testeval00>
     _:b1) .
 
-<http://example/manifest.ttl#testeval00> a earl:TestCriterion, earl:TestCase, <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:result <http://example/test-00.out> ;
   mf:name "subm-test-00" ;
+  mf:action <http://example/test-00.ttl> ;
   earl:assertions [
     a earl:Assertion ;
     earl:test <http://example/manifest.ttl#testeval00> ;
@@ -34,13 +36,13 @@
       earl:outcome earl:passed
     ] ;
     earl:assertedBy <https://greggkellogg.net/foaf#me> ;
-  ] ;
-  mf:result <http://example/test-00.out> ;
-  mf:action <http://example/test-00.ttl> .
+  ] .
 
-_:b1 a earl:TestCriterion, earl:TestCase, <http://www.w3.org/ns/rdftest#TestTurtleEval> ;
+_:b1 a <http://www.w3.org/ns/rdftest#TestTurtleEval>, earl:TestCase, earl:TestCriterion ;
   rdfs:comment "@prefix and qnames" ;
+  mf:result <http://example/test-01.out> ;
   mf:name "subm-test-01" ;
+  mf:action <http://example/test-01.ttl> ;
   earl:assertions [
     a earl:Assertion ;
     earl:test _:b1 ;
@@ -49,17 +51,15 @@ _:b1 a earl:TestCriterion, earl:TestCase, <http://www.w3.org/ns/rdftest#TestTurt
       a earl:TestResult ;
       earl:outcome earl:untested
     ] ;
-  ] ;
-  mf:result <http://example/test-01.out> ;
-  mf:action <http://example/test-01.ttl> .
+  ] .
 
 <https://rubygems.org/gems/rdf-turtle> a earl:TestSubject, earl:Software, doap:Project ;
-  doap:developer <https://greggkellogg.net/foaf#me> ;
-  doap:homepage <http://ruby-rdf.github.com/rdf-turtle> ;
+  doap:release [doap:revision "unknown"] ;
   doap:programming-language "Ruby" ;
-  doap:description "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
   doap:name "RDF::Turtle" ;
-  doap:release [doap:revision "unknown"] .
+  doap:description "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."@en ;
+  doap:homepage <http://ruby-rdf.github.com/rdf-turtle> ;
+  doap:developer <https://greggkellogg.net/foaf#me> .
 
 <https://greggkellogg.net/foaf#me> a foaf:Person, earl:Assertor ;
   foaf:homepage <https://greggkellogg.net/> ;
@@ -74,10 +74,10 @@ _:b1 a earl:TestCriterion, earl:TestCase, <http://www.w3.org/ns/rdftest#TestTurt
    doap:homepage <https://github.com/gkellogg/earl-report>;
    doap:programming-language "Ruby";
    doap:license <http://unlicense.org>;
-   doap:release <https://github.com/gkellogg/earl-report/tree/0.6.1>;
+   doap:release <https://github.com/gkellogg/earl-report/tree/0.6.2>;
    doap:developer <https://greggkellogg.net/foaf#me> .
 
-<https://github.com/gkellogg/earl-report/tree/0.6.1> a doap:Version;
-  doap:name "earl-report-0.6.1";
-  doap:created "2021-03-19"^^xsd:date;
-  doap:revision "0.6.1" .
+<https://github.com/gkellogg/earl-report/tree/0.6.2> a doap:Version;
+  doap:name "earl-report-0.6.2";
+  doap:created "2021-03-25"^^xsd:date;
+  doap:revision "0.6.2" .

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.13
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +115,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogumbo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement