rdf-rdfa 0.2.2 → 0.3.0

data/spec/literal_spec.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 $:.unshift "."
 require File.join(File.dirname(__FILE__), 'spec_helper')
-require 'nokogiri'
 
 describe RDF::Literal do
   require 'nokogiri' rescue nil
@@ -73,7 +72,7 @@ describe RDF::Literal do
                       :dc => "http://purl.org/dc/terms/",
                     })
         }
-        it "should add namespace" do subject.to_s.should == "<svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\"></svg:svg>" end
+        it "should add namespace" do subject.to_s.should == "<svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:dc=\"http://purl.org/dc/terms/\"></svg:svg>" end
       end
 
       describe "and language with an existing language embedded" do
@@ -91,7 +90,7 @@ describe RDF::Literal do
     describe "with a default namespace" do
       subject {
         @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral,
-                      :namespaces => {:__default__ => RDF::DC.to_s})
+                      :namespaces => {"" => RDF::DC.to_s})
       }
 
       it "should add namespace" do subject.to_s.should == "foo <sup xmlns=\"http://purl.org/dc/terms/\">bar</sup> baz!" end
@@ -122,7 +121,7 @@ describe RDF::Literal do
                         "my" => "http://my.example.org/",
                       })
 
-          pending("XML C14N") do
+          pending do
             l.to_s.should == "\n      <html:h1 xmlns:html=\"http://NoHTML.example.org\">\n        <b xmlns=\"http://www.w3.org/1999/xhtml\">John</b>\n      </html:h1>\n   "
           end
         end
@@ -197,7 +196,7 @@ describe RDF::Literal do
                       "svg" => "http://www.w3.org/2000/svg",
                     })
 
-        pending("XML C14N") do
+        pending do
           l.to_s.should == "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\">bold</strong> and an svg rectangle: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"
         end
       end
@@ -210,7 +209,7 @@ describe RDF::Literal do
                       "svg" => "http://www.w3.org/2000/svg",
                     })
 
-        pending("XML C14N") do
+        pending do
           l.to_s.should == "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"
         end
       end
@@ -223,7 +222,7 @@ describe RDF::Literal do
                       "svg" => "http://www.w3.org/2000/svg",
                     })
 
-        pending("XML C14N") do
+        pending do
           l.to_s.should == "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"hu\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"
         end
       end
@@ -236,7 +235,7 @@ describe RDF::Literal do
                       "svg" => "http://www.w3.org/2000/svg",
                     })
 
-        pending("XML C14N") do
+        pending do
           l.to_s.should == "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\">bold</strong> and an svg rectangle: <svg xmlns=\"http://www.w3.org/2000/svg\"><rect height=\"100\" width=\"200\"></rect></svg>"
         end
       end

data/spec/profile_spec.rb

@@ -0,0 +1,53 @@
+$:.unshift "."
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe RDF::RDFa::Profile do
+  describe ".new" do
+    describe "foaf" do
+      subject { RDF::RDFa::Profile.new("http://rdfa.digitalbazaar.com/test-suite/profiles/foaf") }
+      
+      it "has 74 terms" do
+        subject.terms.keys.length.should == 74
+      end
+      
+      it "has no vocabulary" do
+        subject.vocabulary.should be_nil
+      end
+      
+      it "has no prefixes" do
+        subject.prefixes.should be_empty
+      end
+    end
+
+    describe "basic" do
+      subject { RDF::RDFa::Profile.new("http://rdfa.digitalbazaar.com/test-suite/profiles/basic") }
+      
+      it "has no terms" do
+        subject.terms.should be_empty
+      end
+      
+      it "has no vocabulary" do
+        subject.vocabulary.should be_nil
+      end
+      
+      it "has 6 prefixes" do
+        subject.prefixes.keys.length.should == 6
+      end
+    end
+  end
+  
+  describe ".find" do
+    before(:all) do
+      RDF::RDFa::Profile.find("http://rdfa.digitalbazaar.com/test-suite/profiles/basic")
+      RDF::RDFa::Profile.find("http://rdfa.digitalbazaar.com/test-suite/profiles/foaf")
+    end
+    
+    it "cached basic" do
+      RDF::RDFa::Profile.cache[RDF::URI.intern("http://rdfa.digitalbazaar.com/test-suite/profiles/basic")].should be_a(RDF::RDFa::Profile)
+    end
+    
+    it "cached foaf" do
+      RDF::RDFa::Profile.cache[RDF::URI.intern("http://rdfa.digitalbazaar.com/test-suite/profiles/foaf")].should be_a(RDF::RDFa::Profile)
+    end
+  end
+end

data/spec/rdfa_helper.rb

@@ -4,7 +4,6 @@ autoload :YAML, "yaml"
 autoload :CGI, 'cgi'
 
 RDFA_DIR = File.join(File.dirname(__FILE__), 'rdfa-test-suite')
-RDFA_NT_DIR = File.join(File.dirname(__FILE__), 'rdfa-triples')
 RDFA_MANIFEST_URL = "http://rdfa.digitalbazaar.com/test-suite/"
 RDFA_TEST_CASE_URL = "#{RDFA_MANIFEST_URL}test-cases/"
 
@@ -24,6 +23,7 @@ module RdfaHelper
     attr_accessor :informationResourceResults
     attr_accessor :purpose
     attr_accessor :reviewStatus
+    attr_accessor :classification
     attr_accessor :suite
     attr_accessor :specificationReference
     attr_accessor :expectedResults
@@ -43,7 +43,7 @@ module RdfaHelper
         puts "#{pred}: #{obj}" if ::RDF::RDFa::debug?
 
         unless self.about
-          self.about = statement.subject
+          self.about = statement.subject.to_s
           self.name = self.about.to_s.split(/[\#\/]/).last || self.about
         end
 
@@ -66,6 +66,7 @@ module RdfaHelper
         informationResourceResults
         purpose
         reviewStatus
+        classification
         specificationReference
         expectedResults
       ).map {|a| v = self.send(a); "#{a}='#{v}'" if v}.compact.join(", ") +
@@ -96,6 +97,7 @@ module RdfaHelper
         if found_head
           line.chop
         else
+          found_head ||= line.match(%r(http://www.w3.org/2000/svg))
           namespaces << line
           nil
         end
@@ -105,26 +107,24 @@ module RdfaHelper
       
       case suite
       when "xhtml"
-        head = "" +
-        %(<?xml version="1.0" encoding="UTF-8"?>\n) +
-        %(<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">\n) +
-        %(<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0"\n)
-        head + "#{namespaces}>\n#{body.gsub(TCPATHRE, tcpath)}\n</html>"
-      when "xhtml11"
         head = "" +
         %(<?xml version="1.0" encoding="UTF-8"?>\n) +
         %(<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">\n) +
-        %(<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"\n)
+        %(<html xmlns="http://www.w3.org/1999/xhtml"\n)
         head + "#{namespaces}>\n#{body.gsub(TCPATHRE, tcpath)}\n</html>"
       when "html4"
         head ="" +
-        %(<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\n) +
-        %(<html version="XHTML+RDFa 1.0"\n)
+        %(<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/MarkUp/DTD/html401-rdfa11-1.dtd">\n) +
+        %(<html\n)
         head + "#{namespaces}>\n#{body.gsub(TCPATHRE, tcpath).gsub(HTMLRE, '\1.html')}\n</html>"
       when "html5"
         head = "<!DOCTYPE html>\n"
-        head += namespaces.empty? ? %(<html version="HTML+RDFa 1.0">) : "<html\n#{namespaces}>"
+        head += namespaces.empty? ? %(<html>) : "<html\n#{namespaces}>"
         head + "\n#{body.gsub(TCPATHRE, tcpath).gsub(HTMLRE, '\1.html')}\n</html>"
+      when "svgtiny"
+        head = %(<?xml version="1.0" encoding="UTF-8"?>\n)
+        head += namespaces.empty? ? %(<svg>) : "<svg\n#{namespaces}>"
+        head + "\n#{body.gsub(TCPATHRE, tcpath).gsub(HTMLRE, '\1.svg')}\n</svg>"
       else
         nil
       end
@@ -135,20 +135,18 @@ module RdfaHelper
       f = self.name + ".sparql"
       body = File.read(File.join(RDFA_DIR, "tests", f)).gsub(TCPATHRE, tcpath)
       
-      suite =~ /xhtml/ ? body : body.gsub(HTMLRE, '\1.html')
-    end
-    
-    def triples
-      f = self.name + ".nt"
-      body = File.read(File.join(RDFA_NT_DIR, f)).gsub(TCPATHRE, tcpath)
-      suite =~ /xhtml/ ? body : body.gsub(HTMLRE, '\1.html')
+      case suite
+      when /xhtml/  then body
+      when /svg/    then body.gsub(HTMLRE, '\1.svg')
+      else               body.gsub(HTMLRE, '\1.html')
+      end
     end
     
     def inputDocument; self.name + ".txt"; end
     def outputDocument; self.name + ".sparql"; end
 
     def version
-      suite == "xhtml11" ? :rdfa_1_1 : :rdfa_1_0
+      :rdfa_1_1
     end
     
     # Run test case, yields input for parser to create triples
@@ -160,12 +158,7 @@ module RdfaHelper
 
       query_string = results
 
-      triples = self.triples rescue nil
-      
-      if (query_string.match(/UNION|OPTIONAL/) || title.match(/XML/)) && triples
-        # Check triples, as Rasql doesn't implement UNION
-        graph.should be_equivalent_graph(triples, self)
-      elsif $redland_enabled
+      if $redland_enabled
         # Run SPARQL query
         graph.should pass_query(query_string, self)
       else
@@ -190,9 +183,12 @@ module RdfaHelper
       yaml_file = File.join(File.dirname(__FILE__), "#{suite}-manifest.yml")
       
       @test_cases = unless File.file?(yaml_file)
+        t = Time.now
         puts "parse #{manifest_file} @#{Time.now}"
-        graph = RDF::Graph.load(manifest_file, :base_uri => @manifest_url)
-        puts "parsed #{graph.size} statements @#{Time.now}"
+        graph = RDF::Graph.new
+        graph << RDF::RDFXML::Reader.new(File.open(manifest_file), :base_url => @manifest_url)
+        diff = Time.now - t
+        puts "parsed #{graph.size} statements in #{diff} seconds (#{(graph.size / diff).to_i} statements/sec) @#{Time.now}"
 
         graph.subjects.map do |subj|
           t = TestCase.new(graph.query(:subject => subj), suite)
@@ -225,32 +221,37 @@ module RdfaHelper
   end
 end
 
+# Stub RDF::Reader.open
 module RDF
-  class Graph
-    def self.load(url, options = {}, &block)
-      url = case url.to_s
+  class Reader
+    class << self
+      alias orig_open open
+    end
+
+    def self.stub_file(filename)
+      case filename.to_s
+      when %r(http://rdfa.digitalbazaar.com/test-suite/profile/\w+)
+        filename.to_s.sub(%r(http://rdfa.digitalbazaar.com/test-suite/profile/\w+),
+          File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile'))
       when %r(http://rdfa.digitalbazaar.com/test-suite/test-cases/\w+)
-        file = url.to_s.sub(%r(http://rdfa.digitalbazaar.com/test-suite/test-cases/\w+),
+        filename.to_s.sub(%r(http://rdfa.digitalbazaar.com/test-suite/test-cases/\w+),
           File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'tests'))
-        file
       when "http://www.w3.org/1999/xhtml/vocab"
-        file = File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile', "xhv")
-        file
+        File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile', "xhv")
       when "http://www.w3.org/2005/10/profile"
-        file = File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile', "xhv")
+        File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile', "xhv")
+      when "http://example.com/profile"
+        File.join(TMP_DIR, "profile.html")
       else
-        url
-      end
-
-      self.new(url, options) do |graph|
-        graph.load! unless graph.unnamed?
-        if block_given?
-          case block.arity
-            when 1 then block.call(graph)
-            else graph.instance_eval(&block)
-          end
-        end
+        filename
       end
     end
+    
+    def self.open(filename, options = {}, &block)
+      filename = ::RDF::Reader.stub_file(filename)
+      options[:format] ||= :rdfa
+      puts "parse #{filename} with format #{options[:format]}" if $verbose
+      orig_open(filename, options, &block)
+    end
   end
 end

data/spec/rdfa_reader_spec.rb

@@ -18,7 +18,7 @@ describe RDF::RDFa::Format do
 end
 
 describe "RDF::RDFa::Reader" do
-  context "discovery" do
+  describe "discovery" do
     {
       "html" => RDF::Reader.for(:rdfa),
       "etc/foaf.html" => RDF::Reader.for("etc/foaf.html"),
@@ -32,21 +32,20 @@ describe "RDF::RDFa::Reader" do
     end
   end
 
-  context :interface do
+  describe :interface do
     before(:each) do
-      @sampledoc = <<-EOF;
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:dc="http://purl.org/dc/elements/1.1/">
-<head>
-  <title>Test 0001</title>
-</head>
-<body>
-  <p>This photo was taken by <span class="author" about="photo1.jpg" property="dc:creator">Mark Birbeck</span>.</p>
-</body>
-</html>
-EOF
+      @sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml"
+              xmlns:dc="http://purl.org/dc/elements/1.1/">
+        <head>
+          <title>Test 0001</title>
+        </head>
+        <body>
+          <p>This photo was taken by <span class="author" about="photo1.jpg" property="dc:creator">Mark Birbeck</span>.</p>
+        </body>
+        </html>
+        )
     end
 
     it "should yield reader" do
@@ -78,23 +77,22 @@ EOF
     end
   end
 
-  context "parsing a simple doc" do
+  describe "parsing a simple doc" do
     before :each do
-      sampledoc = <<-EOF;
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:dc="http://purl.org/dc/elements/1.1/">
-<head>
-  <title>Test 0001</title>
-</head>
-<body>
-  <p>This photo was taken by <span class="author" about="photo1.jpg" property="dc:creator">Mark Birbeck</span>.</p>
-</body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0001.xhtml", :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml"
+              xmlns:dc="http://purl.org/dc/elements/1.1/">
+        <head>
+          <title>Test 0001</title>
+        </head>
+        <body>
+          <p>This photo was taken by <span class="author" about="photo1.jpg" property="dc:creator">Mark Birbeck</span>.</p>
+        </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0001.xhtml", :validate => true)
       @statement = @graph.statements.first
     end
 
@@ -115,20 +113,19 @@ EOF
     end
   end
 
-  context "parsing a simple doc without a base URI" do
+  describe "parsing a simple doc without a base URI" do
     before :each do
-      sampledoc = <<-EOF;
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:dc="http://purl.org/dc/elements/1.1/">
-<body>
-  <p>This photo was taken by <span class="author" about="_:photo" property="dc:creator">Mark Birbeck</span>.</p>
-</body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml"
+              xmlns:dc="http://purl.org/dc/elements/1.1/">
+        <body>
+          <p>This photo was taken by <span class="author" about="_:photo" property="dc:creator">Mark Birbeck</span>.</p>
+        </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :validate => true)
       @statement = @graph.statements.first
     end
 
@@ -149,27 +146,26 @@ EOF
     end
   end
 
-  context "parsing a document containing an XML Literal" do
+  describe "parsing a document containing an XML Literal" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:dc="http://purl.org/dc/elements/1.1/"
-      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <head>
-    <title>Test 0011</title>
-  </head>
-  <body>
-    <div about="">
-      Author: <span property="dc:creator">Albert Einstein</span>
-      <h2 property="dc:title" datatype="rdf:XMLLiteral">E = mc<sup>2</sup>: The Most Urgent Problem of Our Time</h2>
-  </div>
-  </body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0011.xhtml", :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml"
+              xmlns:dc="http://purl.org/dc/elements/1.1/"
+              xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+          <head>
+            <title>Test 0011</title>
+          </head>
+          <body>
+            <div about="">
+              Author: <span property="dc:creator">Albert Einstein</span>
+              <h2 property="dc:title" datatype="rdf:XMLLiteral">E = mc<sup>2</sup>: The Most Urgent Problem of Our Time</h2>
+          </div>
+          </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0011.xhtml", :validate => true)
     end
 
     it "should return 2 triples" do
@@ -185,35 +181,38 @@ EOF
     end
 
     it "should have an XML Literal for the dc:title of the document" do
-      @graph.should have_triple([
-        RDF::URI('http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0011.xhtml'),
-        RDF::DC11.title,
-        RDF::Literal("E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time", :datatype => RDF.XMLLiteral)
-      ])
+      begin
+        @graph.should have_triple([
+          RDF::URI('http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0011.xhtml'),
+          RDF::DC11.title,
+          RDF::Literal(%(E = mc<sup xmlns="http://www.w3.org/1999/xhtml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">2</sup>: The Most Urgent Problem of Our Time), :datatype => RDF.XMLLiteral)
+        ])
+      rescue RSpec::Expectations::ExpectationNotMetError => e
+        pending("XMLLiteral canonicalization not implemented yet")
+      end
     end
   end
 
-  context "parsing a document containing sereral bnodes" do
+  describe "parsing a document containing sereral bnodes" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
-      xmlns:foaf="http://xmlns.com/foaf/0.1/">
-  <head>
-  <title>Test 0017</title>
-  </head>
-  <body>
-     <p>
-          <span about="[_:a]" property="foaf:name">Manu Sporny</span>
-           <span about="[_:a]" rel="foaf:knows" resource="[_:b]">knows</span>
-           <span about="[_:b]" property="foaf:name">Ralph Swick</span>.
-        </p>
-  </body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0017.xhtml", :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
+              xmlns:foaf="http://xmlns.com/foaf/0.1/">
+          <head>
+          <title>Test 0017</title>
+          </head>
+          <body>
+             <p>
+                  <span about="[_:a]" property="foaf:name">Manu Sporny</span>
+                   <span about="[_:a]" rel="foaf:knows" resource="[_:b]">knows</span>
+                   <span about="[_:b]" property="foaf:name">Ralph Swick</span>.
+                </p>
+          </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0017.xhtml", :validate => true)
     end
 
     it "should return 3 triples" do
@@ -245,25 +244,24 @@ EOF
     end
   end
 
-  context "parsing a document that uses the typeof attribute" do
+  describe "parsing a document that uses the typeof attribute" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
-      xmlns:foaf="http://xmlns.com/foaf/0.1/">
-  <head>
-    <title>Test 0049</title>
-  </head>
-  <body>
-    <div about="http://www.example.org/#me" typeof="foaf:Person">
-      <p property="foaf:name">John Doe</p>
-    </div>
-  </body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0049.xhtml", :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
+              xmlns:foaf="http://xmlns.com/foaf/0.1/">
+          <head>
+            <title>Test 0049</title>
+          </head>
+          <body>
+            <div about="http://www.example.org/#me" typeof="foaf:Person">
+              <p property="foaf:name">John Doe</p>
+            </div>
+          </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0049.xhtml", :validate => true)
     end
 
     it "should return 2 triples" do
@@ -287,27 +285,26 @@ EOF
     end
   end
 
-  context "parsing a document with a <base> tag in the <head>" do
+  describe "parsing a document with a <base> tag in the <head>" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
-    xmlns:dc="http://purl.org/dc/elements/1.1/">
- <head>
-    <base href="http://www.example.org/"></base>
-    <title>Test 0072</title>
- </head>
- <body>
-    <p about="faq">
-       Learn more by reading the example.org
-       <span property="dc:title">Example FAQ</span>.
-    </p>
- </body>
-</html>
-EOF
-
-      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0072.xhtml", :strict => true)
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1"
+            xmlns:dc="http://purl.org/dc/elements/1.1/">
+         <head>
+            <base href="http://www.example.org/"></base>
+            <title>Test 0072</title>
+         </head>
+         <body>
+            <p about="faq">
+               Learn more by reading the example.org
+               <span property="dc:title">Example FAQ</span>.
+            </p>
+         </body>
+        </html>
+        )
+
+      @graph = parse(sampledoc, :base_uri => "http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0072.xhtml", :validate => true)
     end
 
     it "should return 1 triple" do
@@ -319,27 +316,26 @@ EOF
     end
   end
 
-  context "parsing a document with a profile containing a prefix mapping" do
+  describe "parsing a document with a profile containing a prefix mapping" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1">
-  <head>
-    <title>Test</title>
-    <base href="http://example.org/"/>
-  </head>
-  <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../profiles/basic">
-  <div about="#me">
-    <p>
-      <span property="foaf:name">Ivan Herman</span>
-    </p>
-  </div>
-  </body>
-</html>
-EOF
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1">
+          <head>
+            <title>Test</title>
+            <base href="http://example.org/"/>
+          </head>
+          <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../../profiles/basic">
+          <div about="#me">
+            <p>
+              <span property="foaf:name">Ivan Herman</span>
+            </p>
+          </div>
+          </body>
+        </html>
+        )
       
-      @graph = parse(sampledoc, :strict => true)
+      @graph = parse(sampledoc, :validate => true)
       @statement = @graph.statements.first
     end
 
@@ -360,27 +356,26 @@ EOF
     end
   end
 
-  context "parsing a document with a profile containing a term mapping" do
+  describe "parsing a document with a profile containing a term mapping" do
     before :each do
-      sampledoc = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1">
-  <head>
-    <title>Test</title>
-    <base href="http://example.org/"/>
-  </head>
-  <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../profiles/foaf">
-  <div about="#me">
-    <p>
-      <span property="name">Ivan Herman</span>
-    </p>
-  </div>
-  </body>
-</html>
-EOF
+      sampledoc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.1">
+          <head>
+            <title>Test</title>
+            <base href="http://example.org/"/>
+          </head>
+          <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../../profiles/foaf">
+          <div about="#me">
+            <p>
+              <span property="name">Ivan Herman</span>
+            </p>
+          </div>
+          </body>
+        </html>
+      )
       
-      @graph = parse(sampledoc, :strict => true)
+      @graph = parse(sampledoc, :validate => true)
       @statement = @graph.statements.first
     end
 
@@ -401,16 +396,133 @@ EOF
     end
   end
 
+  describe :profiles do
+    before(:all) do
+      FileUtils.mkdir(TMP_DIR)
+      File.open(File.join(TMP_DIR, "profile.html"), "w") do |f|
+        f.write(%(<?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE html>
+          <html xmlns="http://www.w3.org/1999/xhtml">
+            <head>
+              <title>Test mappings</title>
+            </head>
+            <body prefix="rdfa: http://www.w3.org/ns/rdfa#">
+              <p typeof=""><span property="rdfa:uri">#{RDF::DC}</span><span property="rdfa:prefix">dc</span></p>
+              <p typeof=""><span property="rdfa:uri">#{RDF::DC.title}</span><span property="rdfa:term">title</span></p>
+            </body>
+          </html>
+          )
+        )
+      end
+
+      @doc = %(<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html>
+        <html xmlns="http://www.w3.org/1999/xhtml">
+          <body profile="http://example.com/profile">
+            <div about ="http://example.com/doc" typeof="dc:Agent">
+              <p property="title">A particular agent</p>
+            </div>
+          </body>
+        </html>
+        )
+    end
+
+    before(:each) do
+      @profile_repository = RDF::Repository.new(:title => "Test Profile Repository")
+      @debug = []
+      @reader = RDF::RDFa::Reader.new(@doc, :profile_repository => @profile_repository, :debug => @debug, :validate => true)
+    end
+    
+    after(:all) do
+      FileUtils.rm_rf(TMP_DIR)
+    end
+    
+    describe "new profile" do
+      before(:each) do
+        # Clear vocabulary cache
+        RDF::RDFa::Profile.cache.send(:initialize)
+        @graph = RDF::Graph.new
+        @reader.each do |statement|
+          @graph << statement
+        end
+      end
+      
+      describe "processed graph" do
+        it "should have type dc:Agent" do
+          @graph.should have_statement(RDF::Statement.new(RDF::URI.new("http://example.com/doc"), RDF.type, RDF::DC.Agent))
+        end
+      
+        it "should have property dc:title" do
+          @graph.should have_statement(RDF::Statement.new(RDF::URI.new("http://example.com/doc"), RDF::DC.title, RDF::Literal.new("A particular agent")))
+        end
+      end
+    end
+    
+    describe "cached profile" do
+      before(:each) do
+        # Clear vocabulary cache
+        RDF::RDFa::Profile.cache.send(:initialize)
+        @reader.each {|s|}
+      end
+      
+      it "should not re-parse profile" do
+        RDF::RDFa::Profile.cache.send(:initialize)
+        RDF::Reader.should_not_receive(:open).with("http://example.com/profile")
+        RDF::RDFa::Reader.new(@doc, :profile_repository => @profile_repository).each {|p|}
+      end
+      
+      it "should create vocab_cache" do
+        RDF::RDFa::Profile.cache.should be_a(RDF::Util::Cache)
+      end
+    end
+    
+    describe "profile content" do
+      before(:each) do
+        bn_p = RDF::Node.new("prefix")
+        bn_t = RDF::Node.new("term")
+        @profile_repository << RDF::Statement.new(bn_p, RDF::RDFA.prefix, RDF::Literal.new("dc"))
+        @profile_repository << RDF::Statement.new(bn_p, RDF::RDFA.uri, RDF::Literal.new(RDF::DC.to_s))
+        @profile_repository << RDF::Statement.new(bn_p, RDF::RDFA.term, RDF::Literal.new("title"))
+        @profile_repository << RDF::Statement.new(bn_p, RDF::RDFA.uri, RDF::Literal.new(RDF::DC.title.to_s))
+
+        # Clear vocabulary cache
+        RDF::RDFa::Profile.cache.send(:initialize)
+      end
+
+      it "should not recieve RDF::Reader.open" do
+        RDF::Reader.should_not_receive(:open).with("http://example.com/profile")
+      end
+
+      it "should have type dc:Agent" do
+        @graph = RDF::Graph.new
+        @reader.each do |statement|
+          @graph << statement
+        end
+
+        @graph.should have_statement(RDF::Statement.new(RDF::URI.new("http://example.com/doc"), RDF.type, RDF::DC.Agent))
+      end
+    
+      it "should have property dc:title" do
+        @graph = RDF::Graph.new
+        @reader.each do |statement|
+          @graph << statement
+        end
+
+        @graph.should have_statement(RDF::Statement.new(RDF::URI.new("http://example.com/doc"), RDF::DC.title, RDF::Literal.new("A particular agent")))
+      end
+    end
+  end
+  
   def self.test_cases(suite)
     RdfaHelper::TestCase.test_cases(suite)
   end
 
   # W3C Test suite from http://www.w3.org/2006/07/SWD/RDFa/testsuite/
-  %w(xhtml xhtml11).each do |suite| # html4 html5
+  %w(xhtml html5 html5 svgtiny).each do |suite| # html4 html5
     describe "w3c #{suite} testcases" do
-      describe "that are approved" do
+      describe "that are required" do
         test_cases(suite).each do |t|
-          next unless t.status == "approved"
+          next unless t.classification =~ /required/
           #next unless t.name =~ /0001/
           specify "test #{t.name}: #{t.title}#{",  (negative test)" unless t.expectedResults}" do
             #puts t.input
@@ -423,7 +535,7 @@ EOF
                     :debug => t.debug,
                     :version => t.version)
               end
-            rescue Spec::Expectations::ExpectationNotMetError => e
+            rescue RSpec::Expectations::ExpectationNotMetError => e
               if t.input =~ /XMLLiteral/
                 pending("XMLLiteral canonicalization not implemented yet")
               else
@@ -435,9 +547,37 @@ EOF
           end
         end
       end
-      describe "that are unreviewed" do
+
+      describe "that are optional" do
+        test_cases(suite).each do |t|
+          next unless t.classification =~ /optional/
+          #next unless t.name =~ /0185/
+          #puts t.inspect
+          specify "test #{t.name}: #{t.title}#{",  (negative test)" unless t.expectedResults}" do
+            begin
+              t.run_test do |rdfa_string|
+                t.debug = []
+                parse(rdfa_string,
+                    :base_uri => t.informationResourceInput,
+                    :debug => t.debug,
+                    :version => t.version)
+              end
+            rescue SparqlException => e
+              pending(e.message) { raise }
+            rescue RSpec::Expectations::ExpectationNotMetError => e
+              if t.name =~ /01[789]\d/
+                raise
+              else
+                pending() {  raise }
+              end
+            end
+          end
+        end
+      end
+
+      describe "that are buggy" do
         test_cases(suite).each do |t|
-          next unless t.status == "unreviewed"
+          next unless t.classification =~ /buggy/
           #next unless t.name =~ /0185/
           #puts t.inspect
           specify "test #{t.name}: #{t.title}#{",  (negative test)" unless t.expectedResults}" do
@@ -451,7 +591,7 @@ EOF
               end
             rescue SparqlException => e
               pending(e.message) { raise }
-            rescue Spec::Expectations::ExpectationNotMetError => e
+            rescue RSpec::Expectations::ExpectationNotMetError => e
               if t.name =~ /01[789]\d/
                 raise
               else