earl-report 0.1.2 → 0.2.0

data/README.md

@@ -78,7 +78,7 @@ The `earl-report` command may be used to directly create a report from zero or m
 
     gem install earl-report
     
-    earl \
+    earl-report \
       --base            # Base URI to use when loading test manifest
       --bibRef          # ReSpec BibRef of specification being reported upon
       --format          # Format of output, one of 'ttl', 'json', or 'html'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/earl-report

@@ -6,15 +6,12 @@ require 'earl_report'
 require 'getoptlong'
 require 'yaml'
 
-def run(input, options)
-end
-
 OPT_ARGS = [
   ["--base",              GetoptLong::REQUIRED_ARGUMENT,"Base URI to use when loading test manifest"],
   ["--bibRef",            GetoptLong::REQUIRED_ARGUMENT,"ReSpec BibRef of specification being reported upon"],
   ["--format", "-f",      GetoptLong::REQUIRED_ARGUMENT,"Format of output, one of 'ttl', 'json', or 'html'"],
   ["--json",              GetoptLong::NO_ARGUMENT,      "Input is a JSON-LD formatted result"],
-  ["--manifest",          GetoptLong::REQUIRED_ARGUMENT,"Test manifest"],
+  ["--manifest",          GetoptLong::REQUIRED_ARGUMENT,"Test manifest(s)"],
   ["--name",              GetoptLong::REQUIRED_ARGUMENT,"Name of specification"],
   ["--output", "-o",      GetoptLong::REQUIRED_ARGUMENT,"Output report to file"],
   ["--query",             GetoptLong::REQUIRED_ARGUMENT,"Query, or file containing query for extracting information from Test manifest"],
@@ -58,8 +55,8 @@ opts.each do |opt, arg|
   when '--base'         then options[:base] = arg
   when '--bibRef'       then options[:bibRef] = arg
   when '--format'       then options[:format] = arg.to_sym
-  when '--manifest'     then options[:manifest] = arg
-  when '--query'        then options[:manifest] = arg
+  when '--manifest'     then options[:manifest] = arg.split(',').map(&:strip)
+  when '--query'        then options[:query] = arg
   when '--base'         then options[:base] = arg
   when '--json'         then options[:json] = true
   when '--name'         then options[:name] = arg

data/lib/earl_report.rb

@@ -11,18 +11,26 @@ class EarlReport
 
   attr_reader :graph
 
+  # Return information about each test, and for the first test in the
+  # manifest, about the manifest itself
   MANIFEST_QUERY = %(
     PREFIX dc: <http://purl.org/dc/terms/>
     PREFIX mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#>
     PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
     PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
-    SELECT ?lh ?uri ?title ?description ?testAction ?testResult
+    SELECT ?lh ?uri ?type ?title ?description ?testAction ?testResult ?manUri  ?manComment
     WHERE {
-      ?uri mf:name ?title; mf:action ?testAction.
-      OPTIONAL { ?uri rdfs:comment ?description. }
-      OPTIONAL { ?uri mf:result ?testResult. }
-      OPTIONAL { [ mf:entries ?lh] . ?lh rdf:first ?uri . }
+      ?uri a ?type;
+        mf:name ?title;
+        mf:action ?testAction .
+      OPTIONAL { ?uri rdfs:comment ?description . }
+      OPTIONAL { ?uri mf:result ?testResult . }
+      OPTIONAL {
+        ?manUri a mf:Manifest; mf:entries ?lh .
+        ?lh rdf:first ?uri .
+        OPTIONAL { ?manUri rdfs:comment ?manComment . }
+      }
     }
   ).freeze
 
@@ -37,9 +45,9 @@ class EarlReport
       OPTIONAL { ?uri doap:homepage ?homepage . }
       OPTIONAL { ?uri doap:description ?doapDesc . }
       OPTIONAL { ?uri doap:programming-language ?language . }
+      OPTIONAL { ?developer a ?devType .}
       OPTIONAL { ?developer foaf:name ?devName .}
-      OPTIONAL { ?developer a ?devType . }
-      OPTIONAL { ?developer foaf:homepage ?devHomepage . }
+      OPTIONAL { ?developer foaf:homepage ?devHomepage .}
     }
   ).freeze
 
@@ -101,7 +109,7 @@ class EarlReport
     test:         {"@type" => "@id"},
     testAction:   {"@id" => "mf:action", "@type" => "@id"},
     testResult:   {"@id" => "mf:result", "@type" => "@id"},
-    tests:        {"@type" => "@id", "@container" => "@list"},
+    entries:      {"@id" => "mf:entries", "@type" => "@id", "@container" => "@list"},
     testSubjects: {"@type" => "@id", "@container" => "@list"},
     title:        {"@id" => "dc:title"},
     xsd:          {"@id" => "http://www.w3.org/2001/XMLSchema#"}
@@ -120,14 +128,14 @@ class EarlReport
   # @option options [String] :bibRef
   #   ReSpec bibliography reference for specification being tested
   # @option options [String] :json Result of previous JSON-LD generation
-  # @option options [String] :manifest Test manifest
+  # @option options [String, Array<String>] :manifest Test manifest
   # @option options [String] :name Name of specification
   # @option options [String] :query
-  #   Query, or file containing query for extracting information from Test manifest
+  #   Query, or file containing query for extracting information from Test manifests
   def initialize(*files)
     @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 "Test Manifests must be specified with :manifest option" unless @options[:manifest] || @options[:json]
     raise "Require at least one input file" if files.empty?
     @files = files
     @prefixes = {}
@@ -136,12 +144,16 @@ class EarlReport
       return
     end
 
-    # Load manifest, possibly with base URI
-    status "read #{@options[:manifest]}"
+    # Load manifests, possibly with base URI
+    status "read #{@options[:manifest].inspect}"
     man_opts = {}
     man_opts[:base_uri] = RDF::URI(@options[:base]) if @options[:base]
-    @graph = RDF::Graph.load(@options[:manifest], man_opts)
-    status "  loaded #{@graph.count} triples"
+    @graph = RDF::Graph.new
+    [@options[:manifest]].flatten.compact.each do |man|
+      g = RDF::Graph.load(man, man_opts)
+      status "  loaded #{g.count} triples from #{man}"
+      @graph << g
+    end
 
     # Read test assertion files
     files.flatten.each do |file|
@@ -244,8 +256,8 @@ class EarlReport
       {
         "@context" => TEST_CONTEXT,
         "@id"           => "",
-        "@type"         => "earl:Report",
-        'title'         => @options[:name],
+        "@type"         => %w(earl:Software doap:Project),
+        'name'          => @options[:name],
         'bibRef'        => @options[:bibRef],
         'generatedBy'   => {
           "@id"         => "http://rubygems.org/gems/earl-report",
@@ -270,9 +282,9 @@ class EarlReport
             "foaf:homepage" => "http://greggkellogg.net/"
           }
         },
-        "assertions"   => @files,
-        'testSubjects' => json_test_subject_info,
-        'tests'        => json_result_info
+        "assertions"    => @files,
+        'testSubjects'  => json_test_subject_info,
+        'entries'        => json_result_info
       }
     end
   end
@@ -298,7 +310,7 @@ class EarlReport
           dev['foaf:homepage'] = solution[:devHomepage].to_s if solution[:devHomepage]
           (info['developer'] ||= []) << dev
         end
-        info['developer'] = info['developer'].uniq
+        info['developer'] = info['developer'].uniq if info['developer']
       end
 
       # Map ids and values to array entries
@@ -319,8 +331,9 @@ class EarlReport
   # Return result information for each test.
   # This counts on hash maintaining insertion order
   #
-  # @return [Array]
+  # @return [Array<Hash>] List of manifests
   def json_result_info
+    manifests = []
     test_cases = {}
     subjects = json_test_subject_info.map {|s| s['@id']}
 
@@ -330,44 +343,67 @@ class EarlReport
       .inject({}) {|memo, soln| memo[soln[:uri]] = soln; memo}
 
     # If test cases are in a list, maintain order
-    solution_list = if first_soln = solutions.values.detect {|s| s[:lh]}
-      RDF::List.new(first_soln[:lh], @graph)
-    else
-      solutions.keys  # Any order will do
-    end
+    solutions.values.select {|s| s[:manUri]}.each do |man_soln|
+      # Get tests for this manifest in list order
+      solution_list = RDF::List.new(man_soln[:lh], @graph)
+
+      # Set up basic manifest information
+      man_info = manifests.detect {|m| m['@id'] == man_soln[:manUri].to_s}
+      unless man_info
+        status "manifest: #{man_soln[:manUri]}"
+        man_info = {
+          '@id' => man_soln[:manUri].to_s,
+          "@type" => %w{earl:Report mf:Manifest},
+          'title' => man_soln[:manComment].to_s,
+          'entries' => []
+        }
+        manifests << man_info
+      end
 
-    # Collect each TestCase
-    solution_list.each do |uri|
-      solution = solutions[uri]
-      tc_hash = {
-        '@id' => uri.to_s,
-        '@type' => %w(earl:TestCriterion earl:TestCase),
-        'title' => solution[:title].to_s,
-        'testAction' => solution[:testAction].to_s,
-        'assertions' => []
-      }
-      tc_hash['description'] = solution[:description].to_s if solution[:description]
-      tc_hash['testResult'] = solution[:testResult].to_s if solution[:testResult]
-      
-      # Pre-initialize results for each subject to untested
-      subjects.each do |siri|
-        tc_hash['assertions'] << {
-          '@type' => 'earl:Assertion',
-          'test'    => uri.to_s,
-          'subject' => siri,
-          'result' => {
-            '@type' => 'earl:TestResult',
-            'outcome' => 'earl:untested'
+      # Collect each TestCase
+      solution_list.each do |uri|
+        solution = solutions[uri]
+
+        # Create entry for this test case, if it doesn't already exist
+        tc = man_info['entries'].detect {|t| t['@id'] == uri}
+        unless tc
+          tc = {
+            '@id' => uri.to_s,
+            '@type' => %w(earl:TestCriterion earl:TestCase),
+            'title' => solution[:title].to_s,
+            'testAction' => solution[:testAction].to_s,
+            'assertions' => []
           }
-        }
+          tc['@type'] << solution[:type].to_s if solution[:type]
+          tc['description'] = solution[:description].to_s if solution[:description]
+          tc['testResult'] = solution[:testResult].to_s if solution[:testResult]
+      
+          # Pre-initialize results for each subject to untested
+          subjects.each do |siri|
+            tc['assertions'] << {
+              '@type'   => 'earl:Assertion',
+              'test'    => uri.to_s,
+              'subject' => siri,
+              'mode'    => 'earl:automatic',
+              'result'  => {
+                '@type' => 'earl:TestResult',
+                'outcome' => 'earl:untested'
+              }
+            }
+          end
+
+          test_cases[uri.to_s] = tc
+          man_info['entries'] << tc
+        end
       end
 
-      test_cases[uri.to_s] = tc_hash
+      raise "No test cases found" if man_info['entries'].empty?
+      status "Test cases:\n  #{man_info['entries'].map {|tc| tc['@id']}.join("\n  ")}"
     end
 
-    raise "No test cases found" if test_cases.empty?
+    raise "No manifests found" if manifests.empty?
+    status "Manifests:\n  #{manifests.map {|m| m['@id']}.join("\n  ")}"
 
-    status "Test cases:\n  #{test_cases.keys.join("\n  ")}"
     # Iterate through assertions and add to appropriate test case
     SPARQL.execute(ASSERTION_QUERY, @graph).each do |solution|
       tc = test_cases[solution[:test].to_s]
@@ -380,7 +416,7 @@ class EarlReport
       ta_hash['result']['outcome'] = "earl:#{solution[:outcome].to_s.split('#').last}"
     end
 
-    test_cases.values
+    manifests.sort_by {|m| m['title']}
   end
 
   ##
@@ -407,18 +443,17 @@ class EarlReport
     io.puts
 
     # Write earl:Software for the report
+    man_defs = json_hash['entries'].map {|defn| as_resource(defn['@id'])}.join("\n    ")
     io.puts %{
       #{as_resource(json_hash['@id'])} a #{[json_hash['@type']].flatten.join(', ')};
-        dc:title "#{json_hash['title']}";
+        doap:name "#{json_hash['name']}";
         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          ")}) .
-
+        mf:entries (\n    #{man_defs}) .
     }.gsub(/^      /, '')
 
     # Write generating software information
@@ -435,16 +470,34 @@ class EarlReport
 
     }.gsub(/^      /, '')
 
+    # Output Manifest definitions
+    # along with test cases and assertions
+    test_cases = []
+    io.puts %(\n# Manifests)
+    json_hash['entries'].each do |man|
+      io.puts %(#{as_resource(man['@id'])} a earl:Report, mf:Manifest;)
+      io.puts %(  dc:title "#{man['title']}";)
+      io.puts %(  mf:name "#{man['title']}";)
+      
+      # Test Cases
+      test_defs = man['entries'].map {|defn| as_resource(defn['@id'])}.join("\n    ")
+      io.puts %(  mf:entries (\n    #{test_defs}) .\n\n)
+
+      test_cases += man['entries']
+    end
+
     # Write out each earl:TestSubject
     io.puts %(#\n# Subject Definitions\n#)
     json_hash['testSubjects'].each do |ts_desc|
       io.write(test_subject_turtle(ts_desc))
     end
-    
+
     # Write out each earl:TestCase
     io.puts %(#\n# Test Case Definitions\n#)
-    json_hash['tests'].each do |test_case|
-      io.write(tc_turtle(test_case))
+    json_hash['entries'].each do |manifest|
+      manifest['entries'].each do |test_case|
+        io.write(tc_turtle(test_case))
+      end
     end
   end
   

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

@@ -5,7 +5,7 @@
 -#    "@context": {...},
 -#    "@id": "",
 -#    "@type": "earl:Software",
--#    "title": "...",
+-#    "name": "...",
 -#    "bibRef": "[[...]]",
 -#    "assertions": ["./rdf.rb-earl.ttl"],
 -#    "testSubjects": [
@@ -38,15 +38,15 @@
 -#      ]
 -#    }]
 -#  }
+- require 'cgi'
 
 !!! 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['title']
+      = tests['name']
     %script.remove{:type => "text/javascript", :src => "http://www.w3.org/Tools/respec/respec-w3c-common"}
     :javascript
       var respecConfig = {
@@ -148,79 +148,139 @@
         background-color: white;
         -moz-border-radius: ;
       }
-  %body
-    %section#abstract{:about => tests['@id'], :typeof => [tests['@type']].flatten.join(' ')}
+      tr.summary {font-weight: bold;}
+      td.passed-all {color: green;}
+      td.passed-most {color: darkorange;}
+      td.passed-some {color: red;}
+  %body{: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#"}
+    %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']
+        This document report test subject conformance for and related specifications for
+        %span{:property => "doap:name"}<=tests['name']
         %span{:property => "dc:bibliographicCitation"}<
           = tests['bibRef']
         according to the requirements of the Evaluation and Report Language (EARL) 1.0 Schema [[EARL10-SCHEMA]].
+      %p
+        This report is also available in alternate formats:
+        %a{:href => "earl.ttl"}
+          Turtle
+        and
+        %a{:href => "earl.jsonld"}
+          JSON-LD
     %section#sodt
     %section
+      - test_info = {}
       - 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
+        Test Manifests
+      - tests['entries'].each do |manifest|
+        - test_cases = manifest['entries']
+        %section{:typeof => manifest['@type'].join(" "), :resource => manifest['@id']}
+          %h2<=manifest['title']
+          - [manifest['description']].flatten.compact.each do |desc|
+            %p<
+              ~ CGI.escapeHTML desc
+          %table.report
+            - skip_subject = {}
+            - passed_tests = []
+            %tr
+              %th
+                Test
+              - subjects.each_with_index do |subject, index|
+                - subject_refs[subject['@id']] = "subj_#{index}"
+                -# If subject is untested for every test in this manifest, skip it
+                - skip_subject[subject['@id']] = manifest['entries'].all? {|t| t['assertions'][index]['result']['outcome'] == 'earl:untested'}
+                - unless skip_subject[subject['@id']]
+                  %th
+                    %a{:href => '#' + subject_refs[subject['@id']]}<=subject['name']
+            - test_cases.each do |test|
+              - tid = 'test_' + (test['@id'][0,2] == '_:' ? test['@id'][2..-1] : test['@id'].split('#').last)
+              - (test_info[tid] ||= []) << test
+              - test_refs[test['@id']] = tid
+              %tr{:rel => "mf:entries", :typeof => test['@type'].join(" "), :resource => test['@id'], :inlist => true}
+                %td
+                  %a{:href => "##{tid}"}<
+                    ~ CGI.escapeHTML test['title']
+                - test['assertions'].each_with_index do |assertion, ndx|
+                  - next if skip_subject[assertion['subject']]
+                  - pass_fail = assertion['result']['outcome'].split(':').last.upcase.sub(/(PASS|FAIL)ED$/, '\1')
+                  - passed_tests[ndx] = (passed_tests[ndx] || 0) + (pass_fail == 'PASS' ? 1 : 0)
+                  %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
+            %tr.summary
+              %td
+                = "Percentage passed out of #{manifest['entries'].length} Tests"
+              - passed_tests.compact.each do |r|
+                - pct = (r * 100.0) / manifest['entries'].length
+                %td{:class => (pct == 100.0 ? 'passed-all' : (pct >= 95.0 ? 'passed-most' : 'passed-some'))}
+                  = "#{'%.1f' % pct}%"
     %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']]}<
+        - subjects.each_with_index do |subject, index|
+          %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']
+                %dd{:property => "doap:description", :lang => 'en'}<
+                  ~ CGI.escapeHTML subject['doapDesc']
               - if subject['language']
                 %dt= "Programming Language"
-                %dd{:property => "doap:programming-language"}<= subject['language']
+                %dd{:property => "doap:programming-language"}<
+                  ~ CGI.escapeHTML subject['language']
+              - if subject['homepage']
+                %dt= "Home Page"
+                %dd{:property => "doap:homepage"}
+                  %a{:href=> subject['homepage']}
+                    ~ CGI.escapeHTML subject['homepage']
               - if subject['developer']
                 %dt= "Developer"
                 %dd{:rel => "doap:developer"}
                   - subject['developer'].each do |dev|
-                    %div{:resource => dev['@id'], :typeof => dev['@type']}
+                    %div{:resource => dev['@id'], :typeof => [dev['@type']].flatten.join(" ")}
                       - if dev.has_key?('@id')
                         %a{:href => dev['@id']}
-                          %span{:property => "foaf:name"}<= dev['foaf:name']
+                          %span{:property => "foaf:name"}<
+                            ~ CGI.escapeHTML dev['foaf:name']
                       - else
-                        %span{:property => "foaf:name"}<= dev['foaf:name']
+                        %span{:property => "foaf:name"}<
+                          ~ CGI.escapeHTML dev['foaf:name']
                       - if dev['foaf:homepage']
                         %dt
                           Home Page
                         %dd
                           %a{:property => "foaf:homepage", :href=> dev['foaf:homepage']}
-                            = dev['foaf:homepage']
+                            ~ CGI.escapeHTML dev['foaf:homepage']
+              %dt
+                Test Suite Compliance
+              %dd
+                %table.report
+                  %tbody
+                    - tests['entries'].each do |manifest|
+                      - passed = manifest['entries'].select {|t| t['assertions'][index]['result']['outcome'] == 'earl:passed' }.length
+                      - next if passed == 0
+                      - total = manifest['entries'].length
+                      - pct = (passed * 100.0) / total
+                      %tr
+                        %td
+                          ~ manifest['title']
+                        %td{:class => (pct == 100.0 ? 'passed-all' : (pct >= 85.0 ? 'passed-most' : 'passed-some'))}
+                          = "#{passed}/#{total} (#{'%.1f' % pct}%)"
     - unless tests['assertions'].empty?
       %section.appendix{:rel => "earl:assertions"}
         %h2
@@ -235,19 +295,21 @@
       %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
+        - tests['entries'].each do |manifest|
+          %div{:property => "mf:entries", :inlist => true, :resource => manifest['@id']}
+            - manifest['entries'].each do |test|
+              %dt{:id => test_refs[test['@id']], :resource => test['@id']}
+                Test
+                %span{:property => "dc:title mf:name"}<
+                  ~ CGI.escapeHTML test['title']
+              %dd{:resource => test['@id']}
+                %p{:property => "dc:description", :lang => 'en'}<
+                  ~ CGI.escapeHTML test['description']
                 %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"
+                  ~ CGI.escapeHTML 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"
+                    ~ CGI.escapeHTML 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