earl-report 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6cc5d6fb36d7bd99ed84e9f141f1e169ab492096bbf53ea978955efdf17fb39
-  data.tar.gz: 97838f4eab1bf562050e629dc27b34fc7c82c714589f0a6efabce2873a2872fc
+  metadata.gz: e76543b490f30df2542076f3beb58514e02346c964e716aed470ea1f1dd1dcac
+  data.tar.gz: e03701faad62e4ea150911a1bdca0a875839276ddc28604e1066a5a532ac0509
 SHA512:
-  metadata.gz: 86c5d742c3b08343123c7c8f4f4d898b15f1cccce163a21a31a89fbea9b50d22eb4f309c22ec8e402e5027d4b88f56490820340265a1ea419fb9c96863017ca1
-  data.tar.gz: c0ee051dd41ce7064e48ad352b074ec73054909b56516e4fcf44f07f885ffcaf38e4cf1a11bd1d60f2759e005c62450b8f9e4788539361852b22445a76223380
+  metadata.gz: 7a5f474b6b1fe4d1f1c259d93048b2a2299dd56ff88fd82d215f8f55cf6f51c20706ccac8189bf6d250d16a0a1c5f614d90c30f6f0212c2beaab65ddf13a03b2
+  data.tar.gz: fa242658e76b29269cf820834f83df03b6bef2d3b30e018d420ace79dd0b2b0afdde97708fb8183a3afbbce397f9339a7920795cbe697b2eeeef15035d9aaf3d

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/earl_report.rb

@@ -482,7 +482,18 @@ class EarlReport
     @json_hash ||= begin
       # Customized JSON-LD output
       result = JSON::LD::API.fromRDF(graph) do |expanded|
-        JSON::LD::API.frame(expanded, TEST_FRAME, expanded: true, embed: '@never')
+        framed = JSON::LD::API.frame(expanded, TEST_FRAME, expanded: true, embed: '@never')
+        # 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
+        framed['entries'].each do |manifest|
+          manifest['entries'].each do |test|
+            test['assertions'] = test['assertions'].sort_by {|a| a['subject']}
+          end
+        end
+        framed
       end
       unless result.is_a?(Hash)
         raise "Expected JSON result to have a single entry, it had #{result.length rescue 'unknown'} entries"

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='2019-09-06' property='dc:issued'>
-06 September 2019
+<time class='dt-published' datetime='2020-02-21' property='dc:issued'>
+21 February 2020
 </time>
 </h2>
 <dl>
@@ -105,7 +105,7 @@ rules apply.
 </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
@@ -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='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>
@@ -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='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
+<tr inlist='inlist' rel='mf:entries' resource='http://example/manifest.ttl#testeval00' typeof='TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval TestCase'>
 <td>
 <a href='#test_1fdd82ac4caf30510cabfdb0a5987ddd'>subm-test-00</a>
 </td>
@@ -261,12 +261,12 @@ PASS
 </span>
 </td>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='_:b2' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
+<tr inlist='inlist' rel='mf:entries' resource='_:b5' typeof='TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval TestCase'>
 <td>
-<a href='#test_9430e2f85f26fd582ac7fcccd7f50d46'>subm-test-01</a>
+<a href='#test_afa00d7d18419c220355daf1fd144bee'>subm-test-01</a>
 </td>
 <td class='UNTESTED' property='earl:assertions' typeof='Assertion'>
-<link href='_:b2' property='earl:test' />
+<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 +301,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 Software doap:Project'>
+<dd property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='TestSubject doap:Project 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 +377,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_9430e2f85f26fd582ac7fcccd7f50d46' resource='_:b2'>
+<dt id='test_afa00d7d18419c220355daf1fd144bee' resource='_:b5'>
 Test
 <span property='dc:title mf:name'>subm-test-01</span>
 </dt>
-<dd resource='_:b2'>
+<dd resource='_:b5'>
 <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>
@@ -389,7 +389,7 @@ Test
 </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,9 +400,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.7' typeof='doap:Version'>
-<span property='doap:revision'>0.4.7</span>
-<meta content='earl-report-0.4.7' property='doap:name' />
+<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>
 an

data/spec/test-files/results.jsonld

@@ -104,82 +104,81 @@
   },
   "@id": "",
   "@type": [
-    "Software",
-    "doap:Project"
+    "doap:Project",
+    "Software"
   ],
+  "name": "Turtle Test Results",
   "entries": [
     {
       "@id": "http://example/manifest.ttl",
       "@type": [
-        "mf:Manifest",
-        "Report"
+        "Report",
+        "mf:Manifest"
       ],
+      "title": "Example Test Cases",
+      "rdfs:comment": "Description for Example Test Cases",
       "entries": [
         {
           "@id": "http://example/manifest.ttl#testeval00",
           "@type": [
-            "TestCase",
             "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
+            "TestCase"
           ],
-          "testAction": "http://example/test-00.ttl",
           "title": "subm-test-00",
+          "rdfs:comment": "Blank subject",
+          "testAction": "http://example/test-00.ttl",
           "assertions": [
             {
               "@type": "Assertion",
-              "assertedBy": "http://greggkellogg.net/foaf#me",
-              "subject": "http://rubygems.org/gems/rdf-turtle",
+              "mode": "earl:automatic",
               "result": {
                 "@type": "TestResult",
                 "outcome": "earl:passed"
               },
               "test": "http://example/manifest.ttl#testeval00",
-              "mode": "earl:automatic"
+              "assertedBy": "http://greggkellogg.net/foaf#me",
+              "subject": "http://rubygems.org/gems/rdf-turtle"
             }
           ],
-          "testResult": "http://example/test-00.out",
-          "rdfs:comment": "Blank subject"
+          "testResult": "http://example/test-00.out"
         },
         {
-          "@id": "_:b2",
+          "@id": "_:b1",
           "@type": [
-            "TestCase",
             "TestCriterion",
-            "http://www.w3.org/ns/rdftest#TestTurtleEval"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval",
+            "TestCase"
           ],
-          "testAction": "http://example/test-01.ttl",
           "title": "subm-test-01",
+          "rdfs:comment": "@prefix and qnames",
+          "testAction": "http://example/test-01.ttl",
           "assertions": [
             {
               "@type": "Assertion",
-              "subject": "http://rubygems.org/gems/rdf-turtle",
               "result": {
                 "@type": "TestResult",
                 "outcome": "earl:untested"
               },
-              "test": "_:b2",
+              "test": "_:b1",
+              "subject": "http://rubygems.org/gems/rdf-turtle",
               "assertedBy": null
             }
           ],
-          "testResult": "http://example/test-01.out",
-          "rdfs:comment": "@prefix and qnames"
+          "testResult": "http://example/test-01.out"
         }
-      ],
-      "title": "Example Test Cases",
-      "rdfs:comment": "Description for Example Test Cases"
+      ]
     }
   ],
   "generatedBy": {
     "@id": "http://rubygems.org/gems/earl-report",
     "@type": [
-      "Software",
-      "doap:Project"
+      "doap:Project",
+      "Software"
     ],
-    "shortdesc": "Earl Report summary generator",
-    "homepage": "https://github.com/gkellogg/earl-report",
-    "language": "Ruby",
-    "license": "http://unlicense.org",
     "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",
@@ -187,46 +186,34 @@
           "Assertor",
           "foaf:Person"
         ],
-        "foaf:homepage": "http://greggkellogg.net/",
-        "foaf:name": "Gregg Kellogg"
+        "foaf:name": "Gregg Kellogg",
+        "foaf:homepage": "http://greggkellogg.net/"
       }
     ],
-    "name": "earl-report",
+    "homepage": "https://github.com/gkellogg/earl-report",
     "release": {
-      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.7",
+      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.8",
       "@type": "doap:Version",
       "doap:created": {
-        "@value": "2019-07-09",
+        "@value": "2019-09-06",
         "@type": "http://www.w3.org/2001/XMLSchema#date"
       },
-      "name": "earl-report-0.4.7",
-      "revision": "0.4.7"
-    }
+      "name": "earl-report-0.4.8",
+      "revision": "0.4.8"
+    },
+    "language": "Ruby",
+    "license": "http://unlicense.org"
   },
-  "assertions": [
-    "/Users/gregg/Projects/earl-report/spec/test-files/report-complete.ttl"
-  ],
-  "bibRef": "[[TURTLE]]",
-  "name": "Turtle Test Results",
   "testSubjects": [
     {
       "@id": "http://rubygems.org/gems/rdf-turtle",
       "@type": [
         "TestSubject",
-        "Software",
-        "doap:Project"
+        "doap:Project",
+        "Software"
       ],
-      "release": [
-        {
-          "revision": "unknown"
-        },
-        {
-          "revision": "unknown"
-        }
-      ],
-      "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",
       "developer": [
         {
           "@id": "http://greggkellogg.net/foaf#me",
@@ -234,11 +221,24 @@
             "Assertor",
             "foaf:Person"
           ],
-          "foaf:homepage": "http://greggkellogg.net/",
-          "foaf:name": "Gregg Kellogg"
+          "foaf:name": "Gregg Kellogg",
+          "foaf:homepage": "http://greggkellogg.net/"
         }
       ],
-      "name": "RDF::Turtle"
+      "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

@@ -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> _:g70346484879600);
+  mf:entries (<http://example/manifest.ttl#testeval00> _:g406000);
   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 earl:TestCriterion,
+    <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+    earl:TestCase;
   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>
   ] .
 
-_:g70346484879600 a earl:TestCase,
-    earl:TestCriterion,
-    <http://www.w3.org/ns/rdftest#TestTurtleEval>;
+_:g406000 a earl:TestCriterion,
+    <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+    earl:TestCase;
   rdfs:comment "@prefix and qnames";
   mf:action <http://example/test-01.ttl>;
   mf:name "subm-test-01";
@@ -57,14 +57,14 @@ _:g70346484879600 a earl:TestCase,
       earl:outcome earl:untested
     ];
     earl:subject <http://rubygems.org/gems/rdf-turtle>;
-    earl:test _:g70346484879600
+    earl:test _:g406000
   ] .
 
 # Test Subjects
 
 <http://rubygems.org/gems/rdf-turtle> a earl:TestSubject,
-    earl:Software,
-    doap:Project;
+    doap:Project,
+    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>;
@@ -79,18 +79,18 @@ _:g70346484879600 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>;
   doap:license <http://unlicense.org>;
   doap:name "earl-report";
   doap:programming-language "Ruby";
-  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.7>;
+  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.8>;
   doap:shortdesc "Earl Report summary generator"@en .
 
-<https://github.com/gkellogg/earl-report/tree/0.4.7> a doap:Version;
-  doap:created "2019-07-09"^^xsd:date;
-  doap:name "earl-report-0.4.7";
-  doap:revision "0.4.7" .
+<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" .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 description: EarlReport generates HTML+RDFa rollups of multiple EARL reports.
 email: gregg@greggkellogg.net
 executables:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Earl Report summary generator