earl-report 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/earl-report

@@ -25,12 +25,13 @@ OPT_ARGS = [
 ]
 def usage
   STDERR.puts %{
+    earl-report version #{EarlReport::VERSION}
     Generate EARL report for mutliple test results against a test manifest.
     
     Options are initialized by reading optional run-control file '.earl' in the local directory,
     if it exists.
     
-    Usage: #{$0} [options] test-manifest test-result ...
+    Usage: #{$0} [options] test-result ...
   }.gsub(/^    /, '')
   width = OPT_ARGS.map do |o|
     l = o.first.length
@@ -90,6 +91,8 @@ if options.has_key?(:template) && options[:template].empty?
   File.open(File.expand_path("../../lib/earl_report/views/earl_report.html.haml", __FILE__)) do |f|
     options[:io].write(f.read)
   end
+elsif ARGV.empty?
+  usage
 else
   earl = EarlReport.new(*ARGV, options)
   earl.generate(options)

data/lib/earl_report.rb

@@ -7,6 +7,8 @@ require 'haml'
 # EARL reporting class.
 # Instantiate a new class using one or more input graphs
 class EarlReport
+  autoload :VERSION, 'earl_report/version'
+
   attr_reader :graph
 
   MANIFEST_QUERY = %(
@@ -81,22 +83,28 @@ class EarlReport
     assertedBy:   {"@type" => "@id"},
     assertions:   {"@type" => "@id", "@container" => "@list"},
     bibRef:       {"@id" => "dc:bibliographicCitation"},
-    description:  {"@id" => "dc:description"},
+    created:      {"@id" => "doap:created", "@type" => "xsd:date"},
+    description:  {"@id" => "dc:description", "@language" => "en"},
     developer:    {"@id" => "doap:developer", "@type" => "@id", "@container" => "@set"},
-    doapDesc:     {"@id" => "doap:description"},
+    doapDesc:     {"@id" => "doap:description", "@language" => "en"},
+    generatedBy:  {"@type" => "@id"},
     homepage:     {"@id" => "doap:homepage", "@type" => "@id"},
-    label:        {"@id" => "rdfs:label"},
+    label:        {"@id" => "rdfs:label", "@language" => "en"},
     language:     {"@id" => "doap:programming-language"},
+    license:      {"@id" => "doap:license", "@type" => "@id"},
     mode:         {"@type" => "@id"},
     name:         {"@id" => "doap:name"},
     outcome:      {"@type" => "@id"},
+    release:      {"@id" => "doap:release", "@type" => "@id"},
+    shortdesc:    {"@id" => "doap:shortdesc", "@language" => "en"},
     subject:      {"@type" => "@id"},
     test:         {"@type" => "@id"},
     testAction:   {"@id" => "mf:action", "@type" => "@id"},
     testResult:   {"@id" => "mf:result", "@type" => "@id"},
     tests:        {"@type" => "@id", "@container" => "@list"},
     testSubjects: {"@type" => "@id", "@container" => "@list"},
-    title:        {"@id" => "dc:title"}
+    title:        {"@id" => "dc:title"},
+    xsd:          {"@id" => "http://www.w3.org/2001/XMLSchema#"}
   }.freeze
 
   # Convenience vocabularies
@@ -120,6 +128,7 @@ class EarlReport
     @options = files.last.is_a?(Hash) ? files.pop.dup : {}
     @options[:query] ||= MANIFEST_QUERY
     raise "Test Manifest must be specified with :manifest option" unless @options[:manifest] || @options[:json]
+    raise "Require at least one input file" if files.empty?
     @files = files
     @prefixes = {}
     if @options[:json]
@@ -234,11 +243,34 @@ class EarlReport
       # Customized JSON-LD output
       {
         "@context" => TEST_CONTEXT,
-        "@id"          => "",
-        "@type"        => %w(earl:Software doap:Project),
+        "@id"           => "",
+        "@type"         => "earl:Report",
+        'title'         => @options[:name],
+        'bibRef'        => @options[:bibRef],
+        'generatedBy'   => {
+          "@id"         => "http://rubygems.org/gems/earl-report",
+          "@type"       => "doap:Project",
+          "name"        => "earl-report",
+          "shortdesc"   => "Earl Report summary generator",
+          "doapDesc"    => "EarlReport generates HTML+RDFa rollups of multiple EARL reports",
+          "homepage"    => "https://github.com/gkellogg/earl-report",
+          "language"    => "Ruby",
+          "license"     => "http://unlicense.org",
+          "release"     => {
+            "@id"       => "https://github.com/gkellogg/earl-report/tree/#{VERSION}",
+            "@type"     => "doap:Version",
+            "name"      => "earl-report-#{VERSION}",
+            "created"   => File.mtime(File.expand_path('../../VERSION', __FILE__)).strftime('%Y-%m-%d'),
+            "revision"  => VERSION.to_s
+          },
+          "developer"   => {
+            "@type"     => "foaf:Person",
+            "@id"       => "http://greggkellogg.net/foaf#me",
+            "foaf:name" => "Gregg Kellogg",
+            "foaf:homepage" => "http://greggkellogg.net/"
+          }
+        },
         "assertions"   => @files,
-        'name'         => @options[:name],
-        'bibRef'       => @options[:bibRef],
         'testSubjects' => json_test_subject_info,
         'tests'        => json_result_info
       }
@@ -375,21 +407,33 @@ class EarlReport
     io.puts
 
     # Write earl:Software for the report
-    io.puts %{<#{json_hash['@id']}> a earl:Software, doap:Project;}
-    io.puts %{  doap:homepage <#{json_hash['homepage']}>;}
-    io.puts %{  doap:name "#{json_hash['name']}";}
-    io.puts %{  dc:bibliographicCitation "#{json_hash['bibRef']}";}
-    io.puts %{  earl:assertions\n}
-    io.puts %{    } + json_hash['assertions'].map {|a| as_resource(a)}.join(",\n    ") + ';'
-    io.puts %{  earl:testSubjects (\n}
-    io.puts %{    } + json_hash['testSubjects'].map {|a| as_resource(a['@id'])}.join("\n    ") + ');'
-    io.puts %{  earl:tests (\n}
-    io.puts %{    } + json_hash['tests'].map {|a| as_resource(a['@id'])}.join("\n    ") + ') .'
-
-    # Test Cases
-    # also collect each assertion definition
-    test_cases = {}
-    assertions = []
+    io.puts %{
+      #{as_resource(json_hash['@id'])} a #{[json_hash['@type']].flatten.join(', ')};
+        dc:title "#{json_hash['title']}";
+        dc:bibliographicCitation "#{json_hash['bibRef']}";
+        earl:generatedBy #{as_resource json_hash['generatedBy']['@id']};
+        earl:assertions
+          #{json_hash['assertions'].map {|a| as_resource(a)}.join(",\n          ")};
+        earl:testSubjects (
+          #{json_hash['testSubjects'].map {|a| as_resource(a['@id'])}.join("\n          ")});
+        earl:tests (
+          #{json_hash['tests'].map {|a| as_resource(a['@id'])}.join("\n          ")}) .
+
+    }.gsub(/^      /, '')
+
+    # Write generating software information
+    io.puts %{
+      <http://rubygems.org/gems/earl-report> a earl:Software, doap:Project;
+        doap:name "earl-report";
+        doap:shortdesc "Earl Report summary generator"@en;
+        doap:description "EarlReport generates HTML+RDFa rollups of multiple EARL reports"@en;
+        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/#{VERSION}>;
+        doap:developer <http://greggkellogg.net/foaf#me> .
+
+    }.gsub(/^      /, '')
 
     # Write out each earl:TestSubject
     io.puts %(#\n# Subject Definitions\n#)
@@ -411,7 +455,7 @@ class EarlReport
   def test_subject_turtle(desc)
     res = %(<#{desc['@id']}> a #{desc['@type'].join(', ')};\n)
     res += %(  doap:name "#{desc['name']}";\n)
-    res += %(  doap:description """#{desc['doapDesc']}""";\n)     if desc['doapDesc']
+    res += %(  doap:description """#{desc['doapDesc']}"""@en;\n)     if desc['doapDesc']
     res += %(  doap:programming-language "#{desc['language']}";\n) if desc['language']
     res += %( .\n\n)
 
@@ -438,7 +482,7 @@ class EarlReport
   def tc_turtle(desc)
     res = %{#{as_resource desc['@id']} a #{[desc['@type']].flatten.join(', ')};\n}
     res += %{  dc:title "#{desc['title']}";\n}
-    res += %{  dc:description """#{desc['description']}""";\n} if desc.has_key?('description')
+    res += %{  dc:description """#{desc['description']}"""@en;\n} if desc.has_key?('description')
     res += %{  mf:result #{as_resource desc['testResult']};\n} if desc.has_key?('testResult')
     res += %{  mf:action #{as_resource desc['testAction']};\n}
     res += %{  earl:assertions (\n}

data/lib/earl_report/version.rb

@@ -0,0 +1,18 @@
+module EarlReport::VERSION
+  VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "VERSION")
+  MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
+
+  STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
+
+  ##
+  # @return [String]
+  def self.to_s()   STRING end
+
+  ##
+  # @return [String]
+  def self.to_str() STRING end
+
+  ##
+  # @return [Array(Integer, Integer, Integer)]
+  def self.to_a() STRING.split(".") end
+end

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

@@ -0,0 +1,279 @@
+-# This template is used for generating a rollup EARL report. It expects to be
+-# called with a single _tests_ local with the following structure
+-#
+-#  {
+-#    "@context": {...},
+-#    "@id": "",
+-#    "@type": "earl:Software",
+-#    "title": "...",
+-#    "bibRef": "[[...]]",
+-#    "assertions": ["./rdf.rb-earl.ttl"],
+-#    "testSubjects": [
+-#      {
+-#        "@id": "http://rubygems.org/gems/rdf-turtle",
+-#        "@type": "earl:TestSubject",
+-#        "name": "RDF::Turtle"
+-#      },
+-#      ...
+-#    ],
+-#    "tests": [{
+-#      "@id": "http://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/tests-ttl/manifest.ttl#turtle-syntax-file-01",
+-#      "@type": ["earl:TestCriterion", "earl:TestCase"],
+-#      "title": "subm-test-00",
+-#      "description": "Blank subject",
+-#      "testAction": "http://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/tests-ttl/turtle-syntax-file-01.ttl",
+-#      "testResult": "http://dvcs.w3.org/hg/rdf/raw-file/default/rdf-turtle/tests-ttl/turtle-syntax-file-01.out"
+-#      "mode": "earl:automatic",
+-#      "assertions": [
+-#        {
+-#          "@type": "earl:Assertion",
+-#          "assertedBy": "http://greggkellogg.net/foaf#me",
+-#          "test": "http://svn.apache.org/repos/asf/jena/Experimental/riot-reader/testing/RIOT/Lang/TurtleSubm/manifest.ttl#testeval00",
+-#          "subject": "http://rubygems.org/gems/rdf-turtle",
+-#          "result": {
+-#            "@type": "earl:TestResult",
+-#            "outcome": "earl:passed"
+-#          }
+-#        }
+-#      ]
+-#    }]
+-#  }
+
+!!! 5
+%html{:prefix => "earl: http://www.w3.org/ns/earl# doap: http://usefulinc.com/ns/doap# mf: http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#"}
+  - subjects = tests['testSubjects']
+  - test_cases = tests['tests']
+  %head
+    %meta{"http-equiv" => "Content-Type", :content => "text/html;charset=utf-8"}
+    %title
+      = tests['name']
+    %script.remove{:type => "text/javascript", :src => "http://www.w3.org/Tools/respec/respec-w3c-common"}
+    :javascript
+      var respecConfig = {
+          // extend the bibliography entries
+          localBiblio: {
+              TURTLE: "Eric Prud'hommeaux, Gavin Carothers. <cite><a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">Turtle: Terse RDF Triple Language.</a></cite> 09 August 2011. W3C Working Draft. URL: <a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">http://www.w3.org/TR/2011/WD-turtle-20110809/</a>",
+          },
+
+          // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
+          specStatus:           "unofficial",
+          copyrightStart:       "2010",
+          doRDFa:               "1.1",
+
+          // the specification's short name, as in http://www.w3.org/TR/short-name/
+          shortName:            "turtle-earl",
+          subtitle:             "Turtle Implementation Conformance Report",
+          // if you wish the publication date to be other than today, set this
+          publishDate:  "#{Time.now.strftime("%Y/%m/%d")}",
+
+          // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
+          // and its maturity status
+          //previousPublishDate:  "2011-10-23",
+          //previousMaturity:     "ED",
+          //previousDiffURI:      "http://json-ld.org/spec/ED/json-ld-syntax/20111023/index.html",
+          //diffTool:             "http://www.aptest.com/standards/htmldiff/htmldiff.pl",
+
+          // if there a publicly available Editor's Draft, this is the link
+          //edDraftURI:           "",
+
+          // if this is a LCWD, uncomment and set the end of its review period
+          // lcEnd: "2009-08-05",
+
+          // if you want to have extra CSS, append them to this list
+          // it is recommended that the respec.css stylesheet be kept
+          extraCSS:             [
+              "http://dev.w3.org/2009/dap/ReSpec.js/css/respec.css"
+          ],
+
+          // editors, add as many as you like
+          // only "name" is required
+          editors:  [
+              { name: "Gregg Kellogg", url: "http://greggkellogg.net/",
+                company: "Kellogg Associates" },
+              { name: "Andy Seaborne",
+                company: "The Apache Software Foundation"}
+          ],
+
+          // authors, add as many as you like.
+          // This is optional, uncomment if you have authors as well as editors.
+          // only "name" is required. Same format as editors.
+          //authors:  [
+          //RDF Working Group],
+
+          // name of the WG
+          wg:           "RDF Working Group",
+
+          // URI of the public WG page
+          wgURI:        "http://www.w3.org/2011/rdf-wg/",
+
+          // name (with the @w3c.org) of the public mailing to which comments are due
+          wgPublicList: "public-rdf-comments",
+
+          // URI of the patent status for this WG, for Rec-track documents
+          // !!!! IMPORTANT !!!!
+          // This is important for Rec-track documents, do not copy a patent URI from a random
+          // document unless you know what you're doing. If in doubt ask your friendly neighbourhood
+          // Team Contact.
+          wgPatentURI:  "http://www.w3.org/2004/01/pp-impl/46168/status",
+          alternateFormats: [
+            {uri: "earl.ttl", label: "Turtle"},
+            {uri: "earl.jsonld", label: "JSON-LD"}
+          ],
+      };
+    :css
+      span[property='dc:description'] { display: none; }
+      td.PASS { color: green; }
+      td.FAIL { color: red; }
+      table.report {
+        border-width: 1px;
+        border-spacing: 2px;
+        border-style: outset;
+        border-color: gray;
+        border-collapse: separate;
+        background-color: white;
+      }
+      table.report th {
+        border-width: 1px;
+        padding: 1px;
+        border-style: inset;
+        border-color: gray;
+        background-color: white;
+        -moz-border-radius: ;
+      }
+      table.report td {
+        border-width: 1px;
+        padding: 1px;
+        border-style: inset;
+        border-color: gray;
+        background-color: white;
+        -moz-border-radius: ;
+      }
+  %body
+    %section#abstract{:about => tests['@id'], :typeof => [tests['@type']].flatten.join(' ')}
+      %p
+        This document report processor conformance for and related specifications for
+        %span{:property => "dc:title"}<=tests['title']
+        %span{:property => "dc:bibliographicCitation"}<
+          = tests['bibRef']
+        according to the requirements of the Evaluation and Report Language (EARL) 1.0 Schema [[EARL10-SCHEMA]].
+    %section#sodt
+    %section
+      - test_refs = {}
+      - subject_refs = {}
+      %h2
+        Results
+      %table.report
+        %tr
+          %th
+            Test
+          - subjects.each_with_index do |subject, i|
+            - subject_refs[subject['@id']] = "subj_#{i}"
+            %th
+              %a{:href => '#' + subject_refs[subject['@id']]}<=subject['name']
+        - test_cases.each do |test|
+          - test_refs[test['@id']] = 'test_' + (test['@id'][0,2] == '_:' ? test['@id'][2..-1] : test['@id'].split('#').last)
+          %tr{:resource => test['@id']}
+            %td
+              %a{:href => '#' + test_refs[test['@id']]}<= test['title']
+            - test['assertions'].each do |assertion|
+              - pass_fail = assertion['result']['outcome'].split(':').last.upcase.sub(/ED$/, '')
+              %td{:class => pass_fail, :property => "earl:assertions", :typeof => assertion['@type'], :inlist => true}
+                - if assertion['assertedBy']
+                  %link{:property => "earl:assertedBy", :href => assertion['assertedBy']}
+                %link{:property => "earl:test", :href => assertion['test']}
+                %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']}
+                  %span{:property => 'earl:outcome', :resource => assertion['result']['outcome']}
+                    = pass_fail
+    %section.appendix
+      %h2
+        Test Subjects
+      %p
+        This report was tested using the following test subjects:
+      %dl
+        - subjects.each do |subject|
+          %dt{:id => subject_refs[subject['@id']]}<
+            %a{:href => subject['@id']}
+              %span{:about => subject['@id'], :property => "doap:name"}<= subject['name']
+          %dd{:property => "earl:testSubjects", :resource => subject['@id'], :typeof => [subject['@type']].flatten.join(" "), :inlist => true}
+            %dl
+              - if subject['doapDesc']
+                %dt= "Description"
+                %dd{:property => "doap:description", :lang => 'en'}<= subject['doapDesc']
+              - if subject['language']
+                %dt= "Programming Language"
+                %dd{:property => "doap:programming-language"}<= subject['language']
+              - if subject['developer']
+                %dt= "Developer"
+                %dd{:rel => "doap:developer"}
+                  - subject['developer'].each do |dev|
+                    %div{:resource => dev['@id'], :typeof => dev['@type']}
+                      - if dev.has_key?('@id')
+                        %a{:href => dev['@id']}
+                          %span{:property => "foaf:name"}<= dev['foaf:name']
+                      - else
+                        %span{:property => "foaf:name"}<= dev['foaf:name']
+                      - if dev['foaf:homepage']
+                        %dt
+                          Home Page
+                        %dd
+                          %a{:property => "foaf:homepage", :href=> dev['foaf:homepage']}
+                            = dev['foaf:homepage']
+    - unless tests['assertions'].empty?
+      %section.appendix{:rel => "earl:assertions"}
+        %h2
+          Individual Test Results
+        %p
+          Individual test results used to construct this report are available here:
+        %ul
+          - tests['assertions'].each do |file|
+            %li
+              %a.source{:href => file}<= file
+    %section.appendix
+      %h2
+        Test Definitions
+      %dl
+        - tests['tests'].each do |test|
+          %dt{:id => test_refs[test['@id']], :resource => test['@id']}
+            Test
+            %span{:property => "dc:title"}<= test['title']
+          %dd{:property => "earl:tests", :resource => test['@id'], :typeof => [test['@type']].flatten.join(' '), :inlist => true}
+            %p{:property => "dc:description", :lang => 'en'}<= test['description']
+            %dl
+              %dt
+                %pre{:class => "example actionDoc", :property => "mf:action", :resource => test['testAction'], :title => "#{test['title']} Input"}<
+                  ~ Kernel.open(test['testAction']) {|f| 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| CGI.escapeHTML(f.read).gsub(/\n/, '<br/>')} rescue "#{test['testResult']} not loaded"
+    %section#appendix{:property => "earl:generatedBy", :resource => tests['generatedBy']['@id'], :typeof => tests['generatedBy']['@type']}
+      %h2
+        Report Generation Software
+      - doap = tests['generatedBy']
+      - rel = doap['release']
+      %p
+        This report generated by
+        %span{:property => "doap:name"}<
+          %a{:href => tests['generatedBy']['@id']}<
+            = doap['name']
+        %meta{:property => "doap:shortdesc", :content => doap['shortdesc'], :lang => 'en'}
+        %meta{:property => "doap:description", :content => doap['doapDesc'], :lang => 'en'}
+        version
+        %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"}
+        an
+        %a{:property => "doap:license", :href => doap['license']}<="Unlicensed"
+        %span{:property => "doap:programming-language"}<="Ruby"
+        package available at
+        %a{:property => "doap:homepage", :href => doap['homepage']}<=doap['homepage']
+        = "."
+      %p{:property => "doap:developer", :resource => "http://greggkellogg.net/foaf#me", :typeof => "foaf:Person"}
+        This software is provided by
+        %a{:property => "foaf:homepage", :href => "http://greggkellogg.net/"}<
+          %span{:aboue => "http://greggkellogg.net/foaf#me", :property => "foaf:name"}<
+            Gregg Kellogg
+        in hopes that it might make the lives of conformance testers easier.

data/spec/earl_report_spec.rb

@@ -41,7 +41,11 @@ describe EarlReport do
         RDF::Graph.should_receive(:load)
           .with(File.expand_path("../test-files/manifest.ttl", __FILE__), {:base_uri => "http://example.com/base/"})
           .and_return(manifest)
+        RDF::Graph.should_receive(:load)
+          .with(File.expand_path("../test-files/report-complete.ttl", __FILE__))
+          .and_return(reportComplete)
         EarlReport.new(
+          File.expand_path("../test-files/report-complete.ttl", __FILE__),
           :verbose => false,
           :base => "http://example.com/base/",
           :manifest => File.expand_path("../test-files/manifest.ttl", __FILE__))
@@ -164,14 +168,14 @@ describe EarlReport do
     specify {json.should be_a(Hash)}
     {
       "@id"    => "",
-      "@type"  => %w(earl:Software doap:Project),
+      "@type"  => "earl:Report",
       'bibRef' => "[[TURTLE]]",
-      'name'   => "Turtle Test Results"
+      'title'   => "Turtle Test Results"
     }.each do |prop, value|
       specify(prop) {json[prop].should == value}
     end
 
-    %w(assertions testSubjects tests).each do |key|
+    %w(assertions generatedBy testSubjects tests).each do |key|
       specify {json.keys.should include(key)}
     end
 
@@ -314,7 +318,7 @@ describe EarlReport do
         ttl.should match(/ doap:name "#{desc['name']}"\s*[;\.]$/)
       end
       it "has description" do
-        ttl.should match(/ doap:description """#{desc['doapDesc']}"""\s*[;\.]$/)
+        ttl.should match(/ doap:description """#{desc['doapDesc']}"""@en\s*[;\.]$/)
       end
       it "has doap:programming-language" do
         ttl.should match(/ doap:programming-language "#{desc['language']}"\s*[;\.]$/)
@@ -371,7 +375,7 @@ describe EarlReport do
         ttl.should match(/ dc:title "#{tc['title']}"\s*[;\.]$/)
       end
       it "has dc:description" do
-        ttl.should match(/ dc:description """#{tc['description']}"""\s*[;\.]$/)
+        ttl.should match(/ dc:description """#{tc['description']}"""@en\s*[;\.]$/)
       end
       it "has mf:action" do
         ttl.should match(/ mf:action <#{tc['testAction']}>\s*[;\.]$/)
@@ -444,8 +448,8 @@ describe EarlReport do
     end
 
     context "earl:Software" do
-      specify {output.should match(/<> a earl:Software, doap:Project\s*[;\.]$/)}
-      specify {output.should match(/  doap:name "#{json_hash['name']}"\s*[;\.]$/)}
+      specify {output.should match(/<> a earl:Report\s*[;\.]$/)}
+      specify {output.should match(/  dc:title "#{json_hash['title']}"\s*[;\.]$/)}
     end
 
     context "Subject Definitions" do
@@ -531,9 +535,10 @@ describe EarlReport do
     PREFIX earl: <http://www.w3.org/ns/earl#>
           
     ASK WHERE {
-      ?uri a earl:Software, doap:Project;
-        doap:name "Turtle Test Results";
+      ?uri a earl:Report;
+        dc:title "Turtle Test Results";
         dc:bibliographicCitation "[[TURTLE]]";
+        earl:generatedBy ?generatedBy;
         earl:assertions ?assertionFile;
         earl:testSubjects (<http://rubygems.org/gems/rdf-turtle>);
         earl:tests (
@@ -550,7 +555,7 @@ describe EarlReport do
     ASK WHERE {
       <http://rubygems.org/gems/rdf-turtle> a earl:TestSubject, doap:Project;
         doap:name "RDF::Turtle";
-        doap:description """RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.""";
+        doap:description """RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."""@en;
         doap:programming-language "Ruby";
         doap:developer <http://greggkellogg.net/foaf#me> .
     }
@@ -574,7 +579,7 @@ describe EarlReport do
     ASK WHERE {
       <http://example/manifest.ttl#testeval00> a earl:TestCriterion, earl:TestCase;
         dc:title "subm-test-00";
-        dc:description """Blank subject""";
+        dc:description """Blank subject"""@en;
         mf:action <http://example/test-00.ttl>;
         mf:result <http://example/test-00.out>;
         earl:assertions (

data/spec/test-files/results.html

@@ -3,17 +3,17 @@
   <head>
     <meta content='text/html;charset=utf-8' http-equiv='Content-Type' />
     <title>
-      Turtle
+      
     </title>
     <script class='remove' src='http://www.w3.org/Tools/respec/respec-w3c-common' type='text/javascript'></script>
     <script type='text/javascript'>
   //<![CDATA[
     var respecConfig = {
         // extend the bibliography entries
-        "localBiblio": {
-            "TURTLE": "Eric Prud'hommeaux, Gavin Carothers. <cite><a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">Turtle: Terse RDF Triple Language.</a></cite> 09 August 2011. W3C Working Draft. URL: <a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">http://www.w3.org/TR/2011/WD-turtle-20110809/</a>",
+        localBiblio: {
+            TURTLE: "Eric Prud'hommeaux, Gavin Carothers. <cite><a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">Turtle: Terse RDF Triple Language.</a></cite> 09 August 2011. W3C Working Draft. URL: <a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\">http://www.w3.org/TR/2011/WD-turtle-20110809/</a>",
         },
-
+    
         // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
         specStatus:           "unofficial",
         copyrightStart:       "2010",
@@ -23,7 +23,7 @@
         shortName:            "turtle-earl",
         subtitle:             "Turtle Implementation Conformance Report",
         // if you wish the publication date to be other than today, set this
-        publishDate:  "2012/11/25",
+        publishDate:  "2012/11/26",
     
         // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
         // and its maturity status
@@ -114,23 +114,13 @@
     </style>
   </head>
   <body>
-    <section about='' id='abstract' typeof='earl:Software doap:Project'>
+    <section about='' id='abstract' typeof='earl:Report'>
       <p>
         This document report processor conformance for and related specifications for
-        <span property='doap:name'>Turtle</span>
-        <span property='dc:bibliographicCitation'>[[TURTLE]]</span>
+        <span property='dc:title'></span>
+        <span property='dc:bibliographicCitation'></span>
         according to the requirements of the Evaluation and Report Language (EARL) 1.0 Schema [[EARL10-SCHEMA]].
       </p>
-      <p>
-        This report is also available in alternate formats:
-        <a href='earl.ttl'>
-          Turtle
-        </a>
-        and
-        <a href='earl.jsonld'>
-          JSON-LD
-        </a>
-      </p>
     </section>
     <section id='sodt'></section>
     <section>
@@ -155,23 +145,21 @@
             <link href='http://example/manifest.ttl#testeval00' property='earl:test' />
             <link href='http://rubygems.org/gems/rdf-turtle' property='earl:subject' />
             <link href='earl:automatic' property='earl:mode' />
-            <span property='earl:result' resource='_' typeof='earl:TestResult'>
+            <span property='earl:result' typeof='earl:TestResult'>
               <span property='earl:outcome' resource='earl:passed'>
                 PASS
               </span>
             </span>
           </td>
         </tr>
-        <tr resource='_:g70363621872700'>
+        <tr resource='_:g70304060229600'>
           <td>
-            <a href='#test_g70363621872700'>subm-test-01</a>
+            <a href='#test_g70304060229600'>subm-test-01</a>
           </td>
           <td class='UNTEST' inlist='inlist' property='earl:assertions' typeof='earl:Assertion'>
-            <link property='earl:assertedBy' />
-            <link href='_:g70363621872700' property='earl:test' />
+            <link href='_:g70304060229600' property='earl:test' />
             <link href='http://rubygems.org/gems/rdf-turtle' property='earl:subject' />
-            <link property='earl:mode' />
-            <span property='earl:result' resource='_' typeof='earl:TestResult'>
+            <span property='earl:result' typeof='earl:TestResult'>
               <span property='earl:outcome' resource='earl:untested'>
                 UNTEST
               </span>
@@ -194,7 +182,7 @@
         <dd inlist='inlist' property='earl:testSubjects' resource='http://rubygems.org/gems/rdf-turtle' typeof='earl:TestSubject doap:Project'>
           <dl>
             <dt>Description</dt>
-            <dd property='doap:description'>RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.</dd>
+            <dd lang='en' property='doap:description'>RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.</dd>
             <dt>Programming Language</dt>
             <dd property='doap:programming-language'>Ruby</dd>
             <dt>Developer</dt>
@@ -240,7 +228,7 @@
           <span property='dc:title'>subm-test-00</span>
         </dt>
         <dd inlist='inlist' property='earl:tests' resource='http://example/manifest.ttl#testeval00' typeof='earl:TestCriterion earl:TestCase'>
-          <p property='dc:description'>Blank subject</p>
+          <p lang='en' property='dc:description'>Blank subject</p>
           <dl>
             <dt>
               <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>
@@ -248,12 +236,12 @@
             </dt>
           </dl>
         </dd>
-        <dt id='test_g70363621872700' resource='_:g70363621872700'>
+        <dt id='test_g70304060229600' resource='_:g70304060229600'>
           Test
           <span property='dc:title'>subm-test-01</span>
         </dt>
-        <dd inlist='inlist' property='earl:tests' resource='_:g70363621872700' typeof='earl:TestCriterion earl:TestCase'>
-          <p property='dc:description'>@prefix and qnames</p>
+        <dd inlist='inlist' property='earl:tests' resource='_:g70304060229600' typeof='earl:TestCriterion earl:TestCase'>
+          <p lang='en' property='dc:description'>@prefix and qnames</p>
           <dl>
             <dt>
               <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>
@@ -263,5 +251,33 @@
         </dd>
       </dl>
     </section>
+    <section id='appendix' property='earl:generatedBy' resource='http://rubygems.org/gems/earl-report' typeof='doap:Project'>
+      <h2>
+        Report Generation Software
+      </h2>
+      <p>
+        This report generated by
+        <span property='doap:name'><a href='http://rubygems.org/gems/earl-report'>earl-report</a></span>
+        <meta content='Earl Report summary generator' lang='en' property='doap:shortdesc' />
+        <meta content='Earl Report generates HTML+RDFa rollups of multiple EARL reports' lang='en' property='doap:description' />
+        version
+        <span property='doap:release' resource='https://github.com/gkellogg/earl-report/tree/0.1.1' typeof='doap:Version'>
+          <span property='doap:revision'>0.1.1</span>
+          <meta content='earl-report-0.1.1' property='doap:name' />
+          <meta content='2012-11-25' datatype='xsd:date' property='doap:created' />
+        </span>
+        an
+        <a href='http://unlicense.org' property='doap:license'>Unlicensed</a>
+        <span property='doap:programming-language'>Ruby</span>
+        package available at
+        <a href='https://github.com/gkellogg/earl-report' property='doap:homepage'>https://github.com/gkellogg/earl-report</a>
+        .
+      </p>
+      <p property='doap:developer' resource='http://greggkellogg.net/foaf#me' typeof='foaf:Person'>
+        This software is provided by
+        <a href='http://greggkellogg.net/' property='foaf:homepage'><span aboue='http://greggkellogg.net/foaf#me' property='foaf:name'>Gregg Kellogg</span></a>
+        in hopes that it might make the lives of conformance testers easier.
+      </p>
+    </section>
   </body>
 </html>

data/spec/test-files/results.jsonld

@@ -20,8 +20,13 @@
     "bibRef": {
       "@id": "dc:bibliographicCitation"
     },
+    "created": {
+      "@id": "doap:created",
+      "@type": "xsd:date"
+    },
     "description": {
-      "@id": "dc:description"
+      "@id": "dc:description",
+      "@language": "en"
     },
     "developer": {
       "@id": "doap:developer",
@@ -29,18 +34,27 @@
       "@container": "@set"
     },
     "doapDesc": {
-      "@id": "doap:description"
+      "@id": "doap:description",
+      "@language": "en"
+    },
+    "generatedBy": {
+      "@type": "@id"
     },
     "homepage": {
       "@id": "doap:homepage",
       "@type": "@id"
     },
     "label": {
-      "@id": "rdfs:label"
+      "@id": "rdfs:label",
+      "@language": "en"
     },
     "language": {
       "@id": "doap:programming-language"
     },
+    "license": {
+      "@id": "doap:license",
+      "@type": "@id"
+    },
     "mode": {
       "@type": "@id"
     },
@@ -50,6 +64,14 @@
     "outcome": {
       "@type": "@id"
     },
+    "release": {
+      "@id": "doap:release",
+      "@type": "@id"
+    },
+    "shortdesc": {
+      "@id": "doap:shortdesc",
+      "@language": "en"
+    },
     "subject": {
       "@type": "@id"
     },
@@ -74,18 +96,41 @@
     },
     "title": {
       "@id": "dc:title"
+    },
+    "xsd": {
+      "@id": "http://www.w3.org/2001/XMLSchema#"
     }
   },
   "@id": "",
-  "@type": [
-    "earl:Software",
-    "doap:Project"
-  ],
+  "@type": "earl:Report",
+  "title": null,
+  "bibRef": null,
+  "generatedBy": {
+    "@id": "http://rubygems.org/gems/earl-report",
+    "@type": "doap:Project",
+    "name": "earl-report",
+    "shortdesc": "Earl Report summary generator",
+    "doapDesc": "Earl Report generates HTML+RDFa rollups of multiple EARL reports",
+    "homepage": "https://github.com/gkellogg/earl-report",
+    "language": "Ruby",
+    "license": "http://unlicense.org",
+    "release": {
+      "@id": "https://github.com/gkellogg/earl-report/tree/0.1.1",
+      "@type": "doap:Version",
+      "name": "earl-report-0.1.1",
+      "created": "2012-11-25",
+      "revision": "0.1.1"
+    },
+    "developer": {
+      "@type": "foaf:Person",
+      "@id": "http://greggkellogg.net/foaf#me",
+      "foaf:name": "Gregg Kellogg",
+      "foaf:homepage": "http://greggkellogg.net/"
+    }
+  },
   "assertions": [
     "test-files/report-complete.ttl"
   ],
-  "name": "Turtle",
-  "bibRef": "[[TURTLE]]",
   "testSubjects": [
     {
       "@id": "http://rubygems.org/gems/rdf-turtle",
@@ -133,7 +178,7 @@
       "testResult": "http://example/test-00.out"
     },
     {
-      "@id": "_:g70363621872700",
+      "@id": "_:g70304060229600",
       "@type": [
         "earl:TestCriterion",
         "earl:TestCase"
@@ -143,7 +188,7 @@
       "assertions": [
         {
           "@type": "earl:Assertion",
-          "test": "_:g70363621872700",
+          "test": "_:g70304060229600",
           "subject": "http://rubygems.org/gems/rdf-turtle",
           "result": {
             "@type": "earl:TestResult",

data/spec/test-files/results.ttl

@@ -9,23 +9,38 @@
 @prefix xhv: <http://www.w3.org/1999/xhtml/vocab#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<> a earl:Software, doap:Project;
-  doap:homepage <>;
-  doap:name "Turtle";
-  dc:bibliographicCitation "[[TURTLE]]";
+
+<> a earl:Report;
+  dc:title "";
+  dc:bibliographicCitation "";
+  earl:generatedBy <http://rubygems.org/gems/earl-report>;
   earl:assertions
     <test-files/report-complete.ttl>;
   earl:testSubjects (
     <http://rubygems.org/gems/rdf-turtle>);
   earl:tests (
     <http://example/manifest.ttl#testeval00>
-    _:g70363621872700) .
+    _:g70304060229600) .
+
+    
+
+<http://rubygems.org/gems/earl-report> a earl:Software, doap:Project;
+  doap:name "earl-report";
+  doap:shortdesc "Earl Report summary generator"@en;
+  doap:description "EarlReport generates HTML+RDFa rollups of multiple EARL reports"@en;
+  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.1.1>;
+  doap:developer <http://greggkellogg.net/foaf#me> .
+
+    
 #
 # Subject Definitions
 #
 <http://rubygems.org/gems/rdf-turtle> a earl:TestSubject, doap:Project;
   doap:name "RDF::Turtle";
-  doap:description """RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.""";
+  doap:description """RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite."""@en;
   doap:programming-language "Ruby";
  .
 
@@ -41,7 +56,7 @@
 #
 <http://example/manifest.ttl#testeval00> a earl:TestCriterion, earl:TestCase;
   dc:title "subm-test-00";
-  dc:description """Blank subject""";
+  dc:description """Blank subject"""@en;
   mf:result <http://example/test-00.out>;
   mf:action <http://example/test-00.ttl>;
   earl:assertions (
@@ -53,3 +68,15 @@
       earl:result [ a earl:TestResult; earl:outcome earl:passed ]]
   ) .
 
+_:g70304060229600 a earl:TestCriterion, earl:TestCase;
+  dc:title "subm-test-01";
+  dc:description """@prefix and qnames"""@en;
+  mf:result <http://example/test-01.out>;
+  mf:action <http://example/test-01.ttl>;
+  earl:assertions (
+    [ a earl:Assertion;
+      earl:test _:g70304060229600;
+      earl:subject <http://rubygems.org/gems/rdf-turtle>;
+      earl:result [ a earl:TestResult; earl:outcome earl:untested ]]
+  ) .
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earl-report
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
-description: EarlReport generates HTML+RDFa rollups of multiple EARL report.
+description: EarlReport generates HTML+RDFa rollups of multiple EARL reports.
 email: gregg@greggkellogg.net
 executables:
 - earl-report
@@ -68,6 +68,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - VERSION
+- lib/earl_report/version.rb
+- lib/earl_report/views/earl_report.html.haml
 - lib/earl_report.rb
 - spec/earl_report_spec.rb
 - spec/spec_helper.rb