earl-report 0.3.6 → 0.4.0

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

@@ -42,17 +42,17 @@
 - require 'digest'
 
 !!! 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#"}
+%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']
   %head
-    %meta{"http-equiv" => "Content-Type", :content => "text/html;charset=utf-8"}
-    %link{:rel => "alternate", :href => "earl.ttl"}
-    %link{:rel => "alternate", :href => "earl.jsonld"}
+    %meta{"http-equiv" => "Content-Type", content: "text/html;charset=utf-8"}
+    %link{rel: "alternate", href: "earl.ttl"}
+    %link{rel: "alternate", href: "earl.jsonld"}
     - tests['assertions'].each do |file|
-      %link{:rel => "related", :href => file}
+      %link{rel: "related", href: file}
     %title
       = tests['name']
-    %script.remove{:type => "text/javascript", :src => "http://www.w3.org/Tools/respec/respec-w3c-common"}
+    %script.remove{type: "text/javascript", src: "http://www.w3.org/Tools/respec/respec-w3c-common"}
     :javascript
       var respecConfig = {
           // extend the bibliography entries
@@ -85,12 +85,6 @@
           // 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:  [
@@ -127,7 +121,7 @@
           ],
       };
     :css
-      span[property='dc:description'] { display: none; }
+      span[property='dc:description rdfs:comment'] { display: none; }
       td.PASS { color: green; }
       td.FAIL { color: red; }
       table.report {
@@ -158,20 +152,20 @@
       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 => Array(tests['@type']).join(" ")}
+  %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#", vocab: "http://www.w3.org/ns/earl#"}
+    %section#abstract{about: tests['@id'], typeof: Array(tests['@type']).join(" ")}
       %p
         This document report test subject conformance for and related specifications for
-        %span{:property => "doap:name"}<=tests['name']
-        %span{:property => "dc:bibliographicCitation"}<
+        %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{:rel => "xhv:alternate", :href => "earl.ttl"}
+        %a{rel: "xhv:alternate", href: "earl.ttl"}
           Turtle
         and
-        %a{:rel => "xhv:alternate", :href => "earl.jsonld"}
+        %a{rel: "xhv:alternate", href: "earl.jsonld"}
           JSON-LD
     %section#sodt
     %section
@@ -182,11 +176,12 @@
         Test Manifests
       - tests['entries'].each do |manifest|
         - test_cases = manifest['entries']
-        %section{:typeof => manifest['@type'].join(" "), :resource => manifest['@id']}
-          %h2{:property => "dc:title mf:name"}<=manifest['title'] ||  'Test Manifest'
+        %section{typeof: manifest['@type'].join(" "), resource: manifest['@id']}
+          %h2{property: "dc:title mf:name"}<=manifest['title'] ||  'Test Manifest'
           - Array(manifest['description']).each do |desc|
-            %p{:property => "rdfs:comment"}<
-              ~ CGI.escapeHTML desc
+            - desc = desc['@value'] if desc.is_a?(Hash)
+            %p{property: "rdfs:comment", lang: 'en'}<
+              ~ CGI.escapeHTML desc.to_s
           %table.report
             - skip_subject = {}
             - passed_tests = []
@@ -199,35 +194,36 @@
                 - 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']
+                    %a{href: '#' + subject_refs[subject['@id']]}<=subject['name']
             - test_cases.each do |test|
               - tid = "test_#{Digest::MD5.hexdigest(test['@id'])}"
               - (test_info[tid] ||= []) << test
               - test_refs[test['@id']] = tid
-              %tr{:rel => "mf:entries", :typeof => test['@type'].join(" "), :resource => test['@id'], :inlist => true}
+              %tr{rel: "mf:entries", typeof: test['@type'].join(" "), resource: test['@id'], inlist: true}
                 %td
-                  %a{:href => "##{tid}"}<
-                    ~ CGI.escapeHTML test['title']
+                  %a{href: "##{tid}"}<
+                    ~ CGI.escapeHTML test['title'].to_s
+                - # test['assertions'] = [] unless test.has_key?('assertions')
                 - 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}
+                  %td{class: pass_fail, property: "earl:assertions", typeof: assertion['@type']}
                     - if assertion['assertedBy']
-                      %link{:property => "earl:assertedBy", :href => assertion['assertedBy']}
-                    %link{:property => "earl:test", :href => assertion['test']}
-                    %link{:property => "earl:subject", :href => assertion['subject']}
+                      %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']}
+                      %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'))}
+                %td{class: (pct == 100.0 ? 'passed-all' : (pct >= 95.0 ? 'passed-most' : 'passed-some'))}
                   = "#{'%.1f' % pct}%"
     %section.appendix
       %h2
@@ -236,38 +232,39 @@
         This report was tested using the following test subjects:
       %dl
         - 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 => Array(subject['@type']).join(" "), :inlist => true}
+          %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: Array(subject['@type']).join(" ")}
             %dl
               - if subject['doapDesc']
+                - subject['doapDesc'] = subject['doapDesc']['@value'] if subject['doapDesc'].is_a?(Hash)
                 %dt= "Description"
-                %dd{:property => "doap:description", :lang => 'en'}<
+                %dd{property: "doap:description", lang: 'en'}<
                   ~ CGI.escapeHTML subject['doapDesc']
               - if subject['language']
+                - subject['language'] = subject['language']['@value'] if subject['language'].is_a?(Hash)
                 %dt= "Programming Language"
-                %dd{:property => "doap:programming-language"}<
-                  ~ CGI.escapeHTML subject['language']
+                %dd{property: "doap:programming-language"}<
+                  ~ CGI.escapeHTML subject['language'].to_s
               - if subject['homepage']
                 %dt= "Home Page"
-                %dd{:property => "doap:homepage"}
-                  %a{:href=> subject['homepage']}
-                    ~ CGI.escapeHTML subject['homepage']
+                %dd{property: "doap:homepage"}
+                  %a{href: subject['homepage']}
+                    ~ CGI.escapeHTML subject['homepage'].to_s
               - if subject['developer']
                 %dt= "Developer"
-                %dd{:rel => "doap:developer"}
-                  - subject['developer'].each do |dev|
-                    %div{:resource => dev['@id'], :typeof => Array(dev['@type']).join(" ")}
+                - subject['developer'].each do |dev|
+                  %dd{rel: "doap:developer"}
+                    %div{resource: dev['@id'], typeof: Array(dev['@type']).join(" ")}
                       - if dev.has_key?('@id')
-                        %a{:href => dev['@id']}
-                          %span{:property => "foaf:name"}<
-                            ~ CGI.escapeHTML dev['foaf:name']
+                        %a{href: dev['@id']}
+                          %span{property: "foaf:name"}<
+                            ~ CGI.escapeHTML dev['foaf:name'].to_s
                       - else
-                        %span{:property => "foaf:name"}<
-                          ~ CGI.escapeHTML dev['foaf:name']
+                        %span{property: "foaf:name"}<
                       - if dev['foaf:homepage']
-                        %a{:property => "foaf:homepage", :href=> dev['foaf:homepage']}
+                        %a{property: "foaf:homepage", href: dev['foaf:homepage']}
                           ~ CGI.escapeHTML dev['foaf:homepage']
               %dt
                 Test Suite Compliance
@@ -275,17 +272,17 @@
                 %table.report
                   %tbody
                     - tests['entries'].each do |manifest|
-                      - passed = manifest['entries'].select {|t| t['assertions'][index]['result']['outcome'] == 'earl:passed' }.length
+                      - passed = manifest['entries'].select {|t| (t['assertions'][index] || {}).fetch('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'))}
+                        %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 => "xhv:related earl:assertions"}
+      %section.appendix{rel: "xhv:related earl:assertions"}
         %h2
           Individual Test Results
         %p
@@ -293,52 +290,53 @@
         %ul
           - tests['assertions'].each do |file|
             %li
-              %a.source{:href => file}<= file
+              %a.source{href: file}<= file
     %section.appendix
       %h2
         Test Definitions
       %dl
         - tests['entries'].each do |manifest|
-          %div{:property => "mf:entries", :inlist => true, :resource => manifest['@id']}
+          %div{property: "mf:entries", inlist: true, resource: manifest['@id']}
             - manifest['entries'].each do |test|
-              %dt{:id => test_refs[test['@id']], :resource => test['@id']}
+              - test['description'] = test['description']['@value'] if test['description'].is_a?(Hash)
+              %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"}<
+                %span{property: "dc:title mf:name"}<
+                  ~ CGI.escapeHTML test['title'].to_s
+              %dd{resource: test['@id']}
+                %p{property: "dc:description rdfs:comment"}<
+                  ~ CGI.escapeHTML test['description'].to_s
+                %pre{class: "example actionDoc", property: "mf:action", resource: test['testAction'], title: "#{test['title']} Input"}<
                   ~ Kernel.open(test['testAction']) {|f| f.set_encoding(Encoding::UTF_8); 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"}<
+                  %pre{class: "example resultDoc", property: "mf:result", resource: test['testResult'], title: "#{test['title']} Result"}<
                     ~ Kernel.open(test['testResult']) {|f| f.set_encoding(Encoding::UTF_8); 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']}
+    %section#appendix{property: "earl:generatedBy", resource: tests['generatedBy']['@id'], typeof: Array(tests['generatedBy']['@type']).join(' ')}
       %h2
         Report Generation Software
       - doap = tests['generatedBy']
       - rel = doap['release']
       %p
         This report generated by
-        %span{:property => "doap:name"}<
-          %a{:href => tests['generatedBy']['@id']}<
+        %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'}
+        %meta{property: "doap:shortdesc", content: doap['shortdesc']}
+        %meta{property: "doap:description", content: doap['doapDesc']}
         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"}
+        %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"
+        %a{property: "doap:license", href: doap['license']}<="Unlicensed"
+        %span{property: "doap:programming-language"}<="Ruby"
         application. More information is available at
-        %a{:property => "doap:homepage", :href => doap['homepage']}<=doap['homepage']
+        %a{property: "doap:homepage", href: doap['homepage']}<=doap['homepage']
         = "."
-      %p{:property => "doap:developer", :resource => "http://greggkellogg.net/foaf#me", :typeof => "foaf:Person"}
+      %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"}<
+        %a{property: "foaf:homepage", href: "http://greggkellogg.net/"}<
+          %span{about: "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

@@ -168,7 +168,7 @@ describe EarlReport do
     it {should be_a(Hash)}
     {
       "@id"    => "",
-      "@type"  => ["earl:Software", "doap:Project"],
+      "@type"  => ["Software", "doap:Project"],
       'bibRef' => "[[TURTLE]]",
       'name'   => "Turtle Test Results"
     }.each do |prop, value|
@@ -184,10 +184,10 @@ describe EarlReport do
         RDF::Graph.new << JSON::LD::Reader.new(subject.to_json, :base_uri => "http://example.com/report")
       end
 
-      it "saves output" do
+      it "saves output as JSON-LD" do
         expect {
           File.open(File.expand_path("../test-files/results.jsonld", __FILE__), "w") do |f|
-            f.write(subject.to_json)
+            f.write(subject.to_json(JSON::LD::JSON_STATE))
           end
         }.not_to raise_error
       end
@@ -213,215 +213,8 @@ describe EarlReport do
       end
     end
 
-    it "raises error if manifest query returns no solutions" do
-      earl.graph.clear!
-      expect {earl.send(:json_hash)}.to raise_error(%r(no results found querying manifest))
-    end
-  end
-  
-  describe "#json_test_subject_info" do
-    let(:json) {earl.send(:json_test_subject_info)}
-    subject {json}
-    it {should be_a(Array)}
-    its(:length) {should == 1}
-
-    context "test subject" do
-      let(:ts) {json.first}
-      {
-        "@id" =>  "http://rubygems.org/gems/rdf-turtle",
-        "@type" =>  %w(earl:TestSubject doap:Project),
-        doapDesc:   "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
-        homepage:   "http://ruby-rdf.github.com/rdf-turtle",
-        language:   "Ruby",
-        name:       "RDF::Turtle",
-      }.each do |prop, value|
-        specify(prop) {expect(ts[prop.to_s]).to eq value}
-      end
-      
-      context "developer" do
-        let(:dev) {ts['developer']}
-        specify {expect(dev).to be_a(Array)}
-        specify {expect(dev.first).to be_a(Hash)}
-        {
-          "@id"       => "http://greggkellogg.net/foaf#me",
-          "@type"     => %(foaf:Person),
-          "foaf:name" => "Gregg Kellogg",
-        }.each do |prop, value|
-          specify(prop) {expect(dev.first[prop.to_s]).to eq value}
-        end
-      end
-    end
-  end
-
-  describe "#json_result_info" do
-    let(:json) {earl.send(:json_result_info)}
-    subject {json}
-    it {should be_a(Array)}
-    its(:length) {should == 1}
-
-    context 'entries' do
-      let(:ts) {json.first}
-      {
-        "@id"   =>  "http://example/manifest.ttl",
-        "@type" =>  %w(earl:Report mf:Manifest),
-        title:      "Example Test Cases"
-      }.each do |prop, value|
-        specify(prop) {expect(ts[prop.to_s]).to eq value}
-      end
-
-      it "should have two entries" do
-        expect(ts['entries'].length).to eq 2
-      end
-
-      context "test case" do
-        let(:tc) {ts['entries'].first}
-        {
-          "@id" =>      "http://example/manifest.ttl#testeval00",
-          "@type" =>    %w(earl:TestCriterion earl:TestCase http://www.w3.org/ns/rdftest#TestTurtleEval),
-          title:         "subm-test-00",
-          description:  "Blank subject",
-          testAction:   "http://example/test-00.ttl",
-          testResult:   "http://example/test-00.out",
-        }.each do |prop, value|
-          specify(prop) {expect(tc[prop.to_s]).to eq value}
-        end
-
-        context('assertions') do
-          specify { expect(tc['assertions']).to be_a(Array)}
-          specify('has one entry') { expect(tc['assertions'].length).to eq 1}
-        end
-
-        context "assertion" do
-          let(:as) {tc['assertions'].first}
-          specify {expect(as).to be_a(Hash)}
-          {
-            "@type" =>  %(earl:Assertion),
-            assertedBy: "http://greggkellogg.net/foaf#me",
-            mode:       "earl:automatic",
-            subject:    "http://rubygems.org/gems/rdf-turtle",
-            test:       "http://example/manifest.ttl#testeval00",
-          }.each do |prop, value|
-            specify(prop) {expect(as[prop.to_s]).to eq value}
-          end
-
-          context "result" do
-            let(:rs) {as['result']}
-            specify {expect(rs).to be_a(Hash)}
-            {
-              "@type" =>  %(earl:TestResult),
-              outcome:    "earl:passed",
-            }.each do |prop, value|
-              specify(prop) {expect(rs[prop.to_s]).to eq value}
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe "#test_subject_turtle" do
-    let(:desc) {{
-      "@id"       => "http://rubygems.org/gems/rdf-turtle",
-      "@type"     => %w(earl:TestSubject doap:Project),
-      'doapDesc'  => "RDF::Turtle is an Turtle reader/writer for the RDF.rb library suite.",
-      'homepage'  => "http://ruby-rdf.github.com/rdf-turtle",
-      'language'  => "Ruby",
-      'name'      => "RDF::Turtle",
-      'developer' => {
-        '@id'       => "http://greggkellogg.net/foaf#me",
-        '@type'     => %w(foaf:Person earl:Assertor),
-        'foaf:name' => "Gregg Kellogg"
-      }
-    }}
-    let(:ttl) {earl.send(:test_subject_turtle, desc)}
-    subject {ttl}
-
-    its(:length) {should > 0}
-    specify {should match(/<#{desc['@id']}> a/)}
-    specify {should match(/ a #{desc['@type'].join(', ')}\s*[;\.]$/)}
-    specify {should match(/ doap:name "#{desc['name']}"\s*[;\.]$/)}
-    specify {should match(/ doap:description "#{desc['doapDesc']}"@en\s*[;\.]$/)}
-    specify {should match(/ doap:programming-language "#{desc['language']}"\s*[;\.]$/)}
-    specify {should match(/ doap:developer <#{desc['developer']['@id']}>/)}
-
-    context "developer" do
-      let(:dev) {desc['developer']}
-      specify {should match(/<#{dev['@id']}> a/)}
-      specify {should match(/ a #{dev['@type'].join(', ')}\s*[;\.]$/)}
-      specify {should match(/ foaf:name "#{dev['foaf:name']}"\s*[;\.]$/)}
-    end
-  end
-
-  describe "#tc_turtle" do
-    let(:tc) {{
-      "@id"         => "http://example/manifest.ttl#testeval00",
-      "@type"       => %w(earl:TestCriterion earl:TestCase),
-      'title'       => "subm-test-00",
-      'description' => "Blank subject",
-      'testAction'  => "http://example/test-00.ttl",
-      'testResult'  => "http://example/test-00.out",
-      'assertions'  => [{
-        "@type"      =>  %(earl:Assertion),
-        'assertedBy' =>"http://greggkellogg.net/foaf#me",
-        'mode'       => "earl:automatic",
-        'subject'    => "http://rubygems.org/gems/rdf-turtle",
-        'test'       => "http://example/manifest.ttl#testeval00",
-        'result'     => {
-          "@type"    => %(earl:TestResult),
-          'outcome'  => "earl:passed",
-        }
-      }]
-    }}
-    let(:ttl) {earl.send(:tc_turtle, tc)}
-    subject {ttl}
-    its(:length) {should > 0}
-    specify {should match(/<#{tc['@id']}> a/)}
-    specify {should match(/ a #{tc['@type'].join(', ')}\s*[;\.]$/)}
-    specify {should match(/ dc:title "#{tc['title']}"\s*[;\.]$/)}
-    specify {should match(/ dc:description "#{tc['description']}"@en\s*[;\.]$/)}
-    specify {should match(/ mf:action <#{tc['testAction']}>\s*[;\.]$/)}
-    specify {should match(/ mf:result <#{tc['testResult']}>\s*[;\.]$/)}
-    specify {should match(/ earl:assertions \(\s*\[ a earl:Assertion/m)}
-  end
-
-  describe "#as_turtle" do
-    let(:as) {{
-      "@type"      =>  %w(earl:Assertion),
-      'assertedBy' => "http://greggkellogg.net/foaf#me",
-      'mode'       => "earl:automatic",
-      'subject'    => "http://rubygems.org/gems/rdf-turtle",
-      'test'       => "http://example/manifest.ttl#testeval00",
-      'result'     => {
-        '@type'    => 'earl:TestResult',
-        'outcome'  => 'earl:passed'
-      }
-    }}
-    let(:ttl) {earl.send(:as_turtle, as)}
-    subject {ttl}
-    its(:length) {should > 0}
-    specify {should match(/ a #{as['@type'].join(', ')}\s*[;\.]$/)}
-    specify {should match(/ earl:assertedBy <#{as['assertedBy']}>\s*[;\.]$/)}
-    specify {should match(/ earl:test <#{as['test']}>\s*[;\.]$/)}
-    specify {should match(/ earl:subject <#{as['subject']}>\s*[;\.]$/)}
-    specify {should match(/ earl:mode #{as['mode']}\s*[;\.]$/)}
-    specify {should match(/ earl:result \[ a #{as['result']['@type']}; earl:outcome #{as['result']['outcome']} \]\]/)}
-    it "has type" do
-      expect(ttl).to match(/ a #{as['@type'].join(', ')}\s*[;\.]$/)
-    end
-    it "has earl:assertedBy" do
-      expect(ttl).to match(/ earl:assertedBy <#{as['assertedBy']}>\s*[;\.]$/)
-    end
-    it "has earl:test" do
-      expect(ttl).to match(/ earl:test <#{as['test']}>\s*[;\.]$/)
-    end
-    it "has earl:subject" do
-      expect(ttl).to match(/ earl:subject <#{as['subject']}>\s*[;\.]$/)
-    end
-    it "has earl:mode" do
-      expect(ttl).to match(/ earl:mode #{as['mode']}\s*[;\.]$/)
-    end
-    it "has earl:result" do
-      expect(ttl).to match(/ earl:result \[ a #{as['result']['@type']}; earl:outcome #{as['result']['outcome']} \]\]/)
+    it "raises error if manifest query returns no solutions", pending: "needs new test" do
+      fail
     end
   end
 
@@ -442,35 +235,26 @@ describe EarlReport do
     let(:as) {tc['assertions'].first}
 
     context "prefixes" do
-      %w(dc doap earl foaf mf owl rdf rdfs xsd).each do |pfx|
+      %w(dc doap earl foaf mf rdf rdfs xsd).each do |pfx|
         specify {should match(/@prefix #{pfx}: </)}
       end
     end
 
     context "earl:Software" do
-      specify {should match(/<> a earl:Software, doap:Project\s*[;\.]$/)}
+      specify {should match(/<> a earl:Software,\s+doap:Project\s*[;\.]$/m)}
       specify {should match(/  doap:name "#{json_hash['name']}"\s*[;\.]$/)}
     end
 
     context "Subject Definitions" do
-      specify {should match(/<#{ts['@id']}> a #{ts['@type'].join(', ')}\s*[;\.]$/)}
+      specify {should match(/<#{ts['@id']}> a doap:Project,\s+earl:TestSubject,\s+earl:Software;$/m)}
     end
 
     context "Manifest Definitions" do
-      specify {should match(/<#{tm['@id']}> a #{tm['@type'].join(', ')}\s*[;\.]$/)}
-    end
-
-    context "Test Case Definitions" do
-      let(:types) {
-        tc['@type'].map do |t|
-          t.include?("://") ? "<#{t}>" : t
-        end
-      }
-      specify {should match(/<#{tc['@id']}> a #{types.join(', ')}\s*[;\.]$/)}
+      specify {should match(/<#{tm['@id']}> a mf:Manifest,\s+earl:Report\s*[;\.]$/m)}
     end
 
     context "Assertion" do
-      specify {should match(/\[ a #{as['@type']}\s*[;\.]$/)}
+      specify {should match(/\sa earl:Assertion;$/)}
     end
 
     context "parsing to RDF" do
@@ -509,7 +293,7 @@ describe EarlReport do
       end
     end
   end
-
+  
   describe "#generate" do
     let(:output) {
       @output ||= begin
@@ -524,7 +308,7 @@ describe EarlReport do
         end
       end
 
-      it "saves output" do
+      it "saves output as HTML" do
         expect {
           File.open(File.expand_path("../test-files/results.html", __FILE__), "w") do |f|
             f.write(output)
@@ -566,11 +350,11 @@ describe EarlReport do
         dc:bibliographicCitation "[[TURTLE]]";
         earl:generatedBy ?generatedBy;
         earl:assertions ?assertionFile;
-        earl:testSubjects (<http://rubygems.org/gems/rdf-turtle>);
+        earl:testSubjects <http://rubygems.org/gems/rdf-turtle>;
         mf:entries (<http://example/manifest.ttl>) .
 
       <http://example/manifest.ttl> a earl:Report, mf:Manifest;
-        dc:title "Example Test Cases";
+        mf:name "Example Test Cases";
         mf:entries (
           <http://example/manifest.ttl#testeval00>
           ?test01
@@ -608,13 +392,10 @@ describe EarlReport do
           
     ASK WHERE {
       <http://example/manifest.ttl#testeval00> a earl:TestCriterion, earl:TestCase;
-        dc:title "subm-test-00";
-        dc:description """Blank subject"""@en;
+        mf:name "subm-test-00";
         mf:action <http://example/test-00.ttl>;
         mf:result <http://example/test-00.out>;
-        earl:assertions (
-          [ a earl:Assertion; earl:subject <http://rubygems.org/gems/rdf-turtle> ]
-        ) .
+        earl:assertions [ a earl:Assertion; earl:subject <http://rubygems.org/gems/rdf-turtle> ] .
     }
   )