earl-report 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50eb02a189f3d91a96f8db733c5eab4d79964b1c0bf69126df582449bfb123ac
-  data.tar.gz: 1596513fb59d3c36260bfde85451703daab944ab9eb6d48a3bef90ed24e1a0d3
+  metadata.gz: d6cc5d6fb36d7bd99ed84e9f141f1e169ab492096bbf53ea978955efdf17fb39
+  data.tar.gz: 97838f4eab1bf562050e629dc27b34fc7c82c714589f0a6efabce2873a2872fc
 SHA512:
-  metadata.gz: 368a82a26e9750cec60efa8a34c2e0073035b3129cd4aa07a7ed4b1f175c7001877d7dc04c4d4d19c2077f372917ccd0e0f4ae77ebb3936b9b276b017e04984c
-  data.tar.gz: 957d722026e0d0d4e9be7772495b95901b61a23ac50bbf644b58f872346c8d09558138959e00f82b22ad9144603ceed0d74ce2c2a27c9793ca0444c723081e0f
+  metadata.gz: 86c5d742c3b08343123c7c8f4f4d898b15f1cccce163a21a31a89fbea9b50d22eb4f309c22ec8e402e5027d4b88f56490820340265a1ea419fb9c96863017ca1
+  data.tar.gz: c0ee051dd41ce7064e48ad352b074ec73054909b56516e4fcf44f07f885ffcaf38e4cf1a11bd1d60f2759e005c62450b8f9e4788539361852b22445a76223380

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/lib/earl_report.rb

@@ -33,12 +33,13 @@ class EarlReport
     PREFIX doap: <http://usefulinc.com/ns/doap#>
     PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
-    SELECT DISTINCT ?uri ?name ?doapDesc ?homepage ?language ?developer ?devName ?devType ?devHomepage
+    SELECT DISTINCT ?uri ?name ?doapDesc ?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 { ?developer a ?devType .}
       OPTIONAL { ?developer foaf:name ?devName .}
       OPTIONAL { ?developer foaf:homepage ?devHomepage .}
@@ -78,8 +79,9 @@ class EarlReport
 
   TEST_FRAME = {
     "@context" => {
-      "@vocab" =>   "http://www.w3.org/ns/earl#",
-      "foaf:homepage" => {"@type" => "@id"},
+      "@version" =>     1.1,
+      "@vocab" =>       "http://www.w3.org/ns/earl#",
+      "foaf:homepage"=> {"@type" => "@id"},
       "dc" =>           "http://purl.org/dc/terms/",
       "doap" =>         "http://usefulinc.com/ns/doap#",
       "earl" =>         "http://www.w3.org/ns/earl#",
@@ -123,8 +125,10 @@ class EarlReport
     },
     "testSubjects" => {
       "@embed" => "@always",
+      "@requireAll" => false,
       "@type" => "earl:TestSubject",
       "developer" => {"@embed" => "@always"},
+      "release" => {"@embed" => "@always"},
       "homepage" => {"@embed" => "@never"}
     },
     "entries" => [{
@@ -289,6 +293,10 @@ class EarlReport
           graph << RDF::Statement(solution[:developer], RDF.type, solution[:devType]) if solution[:devType]
           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"))
         end
 
         assertion_graph << file_graph
@@ -473,13 +481,13 @@ class EarlReport
   def json_hash
     @json_hash ||= begin
       # Customized JSON-LD output
-      r = JSON::LD::API.fromRDF(graph) do |expanded|
+      result = JSON::LD::API.fromRDF(graph) do |expanded|
         JSON::LD::API.frame(expanded, TEST_FRAME, expanded: true, embed: '@never')
       end
-      unless r.is_a?(Hash) && r.has_key?('@graph') && Array(r["@graph"]).length == 1
-        raise "Expected JSON result to have a single entry, it had #{Array(r["@graph"]).length rescue 'unknown'} entries"
+      unless result.is_a?(Hash)
+        raise "Expected JSON result to have a single entry, it had #{result.length rescue 'unknown'} entries"
       end
-      {"@context" => r["@context"]}.merge(r["@graph"].first)
+      result
     end
   end
 

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

@@ -369,6 +369,13 @@
                 %dt= "Description"
                 %dd{property: "doap:description", lang: 'en'}<
                   ~ CGI.escapeHTML subject['doapDesc']
+              - if subject['release']
+                - subject['release'] = subject['release'].first if subject['release'].is_a?(Array)
+                - subject['release']['revision'] = subject['release']['revision']['@value'] if subject['release']['revision'].is_a?(Hash)
+                %dt= "Release"
+                %dd{property: "doap:release"}<
+                  %span{property: "doap:revision"}<
+                    ~ CGI.escapeHTML subject['release']['revision'].to_s
               - if subject['language']
                 - subject['language'] = subject['language']['@value'] if subject['language'].is_a?(Hash)
                 %dt= "Programming Language"

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-07-09' property='dc:issued'>
-09 July 2019
+<time class='dt-published' datetime='2019-09-06' property='dc:issued'>
+06 September 2019
 </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='http://www.w3.org/ns/rdftest#TestTurtleEval TestCriterion 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,12 @@ PASS
 </span>
 </td>
 </tr>
-<tr inlist='inlist' rel='mf:entries' resource='_:b1' typeof='http://www.w3.org/ns/rdftest#TestTurtleEval TestCriterion TestCase'>
+<tr inlist='inlist' rel='mf:entries' resource='_:b2' typeof='TestCase TestCriterion http://www.w3.org/ns/rdftest#TestTurtleEval'>
 <td>
-<a href='#test_b4d4f9531721bf1a6e4562f27353abd3'>subm-test-01</a>
+<a href='#test_9430e2f85f26fd582ac7fcccd7f50d46'>subm-test-01</a>
 </td>
 <td class='UNTESTED' property='earl:assertions' typeof='Assertion'>
-<link href='_:b1' 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'>
@@ -301,10 +301,12 @@ 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='Software TestSubject doap:Project'>
+<dd property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='TestSubject Software doap:Project'>
 <dl>
 <dt>Description</dt>
 <dd lang='en' property='doap:description'>RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.</dd>
+<dt>Release</dt>
+<dd property='doap:release'><span property='doap:revision'>unknown</span></dd>
 <dt>Programming Language</dt>
 <dd property='doap:programming-language'>Ruby</dd>
 <dt>Home Page</dt>
@@ -375,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_b4d4f9531721bf1a6e4562f27353abd3' resource='_:b1'>
+<dt id='test_9430e2f85f26fd582ac7fcccd7f50d46' resource='_:b2'>
 Test
 <span property='dc:title mf:name'>subm-test-01</span>
 </dt>
-<dd resource='_:b1'>
+<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>
@@ -398,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.6' typeof='doap:Version'>
-<span property='doap:revision'>0.4.6</span>
-<meta content='earl-report-0.4.6' property='doap:name' />
+<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' />
 <meta datatype='xsd:date' property='doap:created' />
 </span>
 an

data/spec/test-files/results.jsonld

@@ -1,5 +1,6 @@
 {
   "@context": {
+    "@version": 1.1,
     "@vocab": "http://www.w3.org/ns/earl#",
     "foaf:homepage": {
       "@type": "@id"
@@ -106,120 +107,126 @@
     "Software",
     "doap:Project"
   ],
-  "name": "Turtle Test Results",
-  "bibRef": "[[TURTLE]]",
-  "generatedBy": {
-    "@id": "http://rubygems.org/gems/earl-report",
-    "@type": [
-      "Software",
-      "doap:Project"
-    ],
-    "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/"
-      }
-    ],
-    "doapDesc": "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
-    "language": "Ruby",
-    "release": {
-      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.6",
-      "@type": "doap:Version",
-      "name": "earl-report-0.4.6",
-      "doap:created": {
-        "@value": "2017-07-02",
-        "@type": "http://www.w3.org/2001/XMLSchema#date"
-      },
-      "revision": "0.4.6"
-    },
-    "homepage": "https://github.com/gkellogg/earl-report",
-    "license": "http://unlicense.org"
-  },
   "entries": [
     {
       "@id": "http://example/manifest.ttl",
       "@type": [
-        "Report",
-        "mf:Manifest"
+        "mf:Manifest",
+        "Report"
       ],
-      "rdfs:comment": "Description for Example Test Cases",
       "entries": [
         {
           "@id": "http://example/manifest.ttl#testeval00",
           "@type": [
-            "http://www.w3.org/ns/rdftest#TestTurtleEval",
+            "TestCase",
             "TestCriterion",
-            "TestCase"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval"
           ],
-          "testResult": "http://example/test-00.out",
-          "rdfs:comment": "Blank subject",
+          "testAction": "http://example/test-00.ttl",
+          "title": "subm-test-00",
           "assertions": [
             {
-              "@id": "_:b3",
               "@type": "Assertion",
-              "test": "http://example/manifest.ttl#testeval00",
-              "mode": "earl:automatic",
-              "subject": "http://rubygems.org/gems/rdf-turtle",
               "assertedBy": "http://greggkellogg.net/foaf#me",
+              "subject": "http://rubygems.org/gems/rdf-turtle",
               "result": {
-                "@id": "_:b4",
                 "@type": "TestResult",
                 "outcome": "earl:passed"
-              }
+              },
+              "test": "http://example/manifest.ttl#testeval00",
+              "mode": "earl:automatic"
             }
           ],
-          "title": "subm-test-00",
-          "testAction": "http://example/test-00.ttl"
+          "testResult": "http://example/test-00.out",
+          "rdfs:comment": "Blank subject"
         },
         {
-          "@id": "_:b0",
+          "@id": "_:b2",
           "@type": [
-            "http://www.w3.org/ns/rdftest#TestTurtleEval",
+            "TestCase",
             "TestCriterion",
-            "TestCase"
+            "http://www.w3.org/ns/rdftest#TestTurtleEval"
           ],
-          "testResult": "http://example/test-01.out",
-          "rdfs:comment": "@prefix and qnames",
+          "testAction": "http://example/test-01.ttl",
+          "title": "subm-test-01",
           "assertions": [
             {
-              "@id": "_:b1",
               "@type": "Assertion",
-              "test": "_:b0",
               "subject": "http://rubygems.org/gems/rdf-turtle",
               "result": {
-                "@id": "_:b2",
                 "@type": "TestResult",
                 "outcome": "earl:untested"
               },
+              "test": "_:b2",
               "assertedBy": null
             }
           ],
-          "title": "subm-test-01",
-          "testAction": "http://example/test-01.ttl"
+          "testResult": "http://example/test-01.out",
+          "rdfs:comment": "@prefix and qnames"
         }
       ],
-      "title": "Example Test Cases"
+      "title": "Example Test Cases",
+      "rdfs:comment": "Description for Example Test Cases"
     }
   ],
+  "generatedBy": {
+    "@id": "http://rubygems.org/gems/earl-report",
+    "@type": [
+      "Software",
+      "doap:Project"
+    ],
+    "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",
+    "developer": [
+      {
+        "@id": "http://greggkellogg.net/foaf#me",
+        "@type": [
+          "Assertor",
+          "foaf:Person"
+        ],
+        "foaf:homepage": "http://greggkellogg.net/",
+        "foaf:name": "Gregg Kellogg"
+      }
+    ],
+    "name": "earl-report",
+    "release": {
+      "@id": "https://github.com/gkellogg/earl-report/tree/0.4.7",
+      "@type": "doap:Version",
+      "doap:created": {
+        "@value": "2019-07-09",
+        "@type": "http://www.w3.org/2001/XMLSchema#date"
+      },
+      "name": "earl-report-0.4.7",
+      "revision": "0.4.7"
+    }
+  },
   "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": [
-        "Software",
         "TestSubject",
+        "Software",
         "doap:Project"
       ],
-      "name": "RDF::Turtle",
+      "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.",
       "developer": [
         {
           "@id": "http://greggkellogg.net/foaf#me",
@@ -227,13 +234,11 @@
             "Assertor",
             "foaf:Person"
           ],
-          "foaf:name": "Gregg Kellogg",
-          "foaf:homepage": "http://greggkellogg.net/"
+          "foaf:homepage": "http://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"
     }
   ]
 }

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> _:g70364851762280);
+  mf:entries (<http://example/manifest.ttl#testeval00> _:g70346484879600);
   mf:name "Example Test Cases" .
 
-<http://example/manifest.ttl#testeval00> a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+<http://example/manifest.ttl#testeval00> a earl:TestCase,
     earl:TestCriterion,
-    earl:TestCase;
+    <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>
   ] .
 
-_:g70364851762280 a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
+_:g70346484879600 a earl:TestCase,
     earl:TestCriterion,
-    earl:TestCase;
+    <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,19 +57,20 @@ _:g70364851762280 a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
       earl:outcome earl:untested
     ];
     earl:subject <http://rubygems.org/gems/rdf-turtle>;
-    earl:test _:g70364851762280
+    earl:test _:g70346484879600
   ] .
 
 # Test Subjects
 
-<http://rubygems.org/gems/rdf-turtle> a earl:Software,
-    earl:TestSubject,
+<http://rubygems.org/gems/rdf-turtle> a earl:TestSubject,
+    earl:Software,
     doap:Project;
   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:programming-language "Ruby";
+  doap:release [doap:revision "unknown"], [doap:revision "unknown"] .
 
 <http://greggkellogg.net/foaf#me> a earl:Assertor,
     foaf:Person;
@@ -86,10 +87,10 @@ _:g70364851762280 a <http://www.w3.org/ns/rdftest#TestTurtleEval>,
   doap:license <http://unlicense.org>;
   doap:name "earl-report";
   doap:programming-language "Ruby";
-  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.6>;
+  doap:release <https://github.com/gkellogg/earl-report/tree/0.4.7>;
   doap:shortdesc "Earl Report summary generator"@en .
 
-<https://github.com/gkellogg/earl-report/tree/0.4.6> a doap:Version;
-  doap:created "2017-07-02"^^xsd:date;
-  doap:name "earl-report-0.4.6";
-  doap:revision "0.4.6" .
+<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" .

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Earl Report summary generator