RubyGems - rdf-rdfa - Versions diffs - 0.2.1 → 0.2.2 - Mend

rdf-rdfa 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

data/History.txt +13 -1
data/Rakefile +1 -1
data/VERSION +1 -1
data/lib/rdf/rdfa/patches/literal_hacks.rb +21 -10
data/lib/rdf/rdfa/patches/nokogiri_hacks.rb +16 -0
data/lib/rdf/rdfa/patches/uri_hacks.rb +6 -1
data/lib/rdf/rdfa/reader.rb +357 -181
data/lib/rdf/rdfa/version.rb +1 -1
data/lib/rdf/rdfa.rb +4 -0
data/rdf-rdfa.gemspec +11 -6
data/script/console +3 -3
data/script/parse +49 -0
data/script/tc +10 -5
data/spec/html4-manifest.yml +176 -176
data/spec/html5-manifest.yml +176 -176
data/spec/literal_spec.rb +245 -0
data/spec/matchers.rb +1 -1
data/spec/rdfa_helper.rb +44 -3
data/spec/rdfa_reader_spec.rb +32 -67
data/spec/xhtml-manifest.yml +139 -603
data/spec/xhtml11-manifest.yml +4707 -0
metadata +28 -4

data/spec/literal_spec.rb ADDED Viewed

@@ -0,0 +1,245 @@
+# coding: utf-8
+$:.unshift "."
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'nokogiri'
+describe RDF::Literal do
+  require 'nokogiri' rescue nil
+  before :each do
+    @new = Proc.new { |*args| RDF::Literal.new(*args) }
+  end
+  describe "XML Literal" do
+    describe "with no namespace" do
+      subject { @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral) }
+      it "should return input" do subject.to_s.should == "foo <sup>bar</sup> baz!" end
+      it "should be equal if they have the same contents" do
+        should == @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral)
+      end
+    end
+    describe "with a namespace" do
+      subject {
+        @new.call("foo <dc:sup>bar</dc:sup> baz!", :datatype => RDF.XMLLiteral,
+                      :namespaces => {:dc => RDF::DC.to_s})
+      }
+      it "should add namespaces" do subject.to_s.should == "foo <dc:sup xmlns:dc=\"http://purl.org/dc/terms/\">bar</dc:sup> baz!" end
+        describe "as string prefix" do
+          subject {
+            @new.call("foo <dc:sup>bar</dc:sup> baz!", :datatype => RDF.XMLLiteral,
+                          :namespaces => {"dc" => RDF::DC.to_s})
+          }
+          it "should add namespaces" do subject.to_s.should == "foo <dc:sup xmlns:dc=\"http://purl.org/dc/terms/\">bar</dc:sup> baz!" end
+        end
+      describe "and language" do
+        subject {
+          @new.call("foo <dc:sup>bar</dc:sup> baz!", :datatype => RDF.XMLLiteral,
+                        :namespaces => {:dc => RDF::DC.to_s},
+                        :language => :fr)
+        }
+        it "should add namespaces and language" do subject.to_s.should == "foo <dc:sup xmlns:dc=\"http://purl.org/dc/terms/\" xml:lang=\"fr\">bar</dc:sup> baz!" end
+      end
+      describe "and node set" do
+        subject {
+          root = Nokogiri::XML.parse(%(<?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+          <html xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:dc="http://purl.org/dc/terms/"
+                xmlns:ex="http://example.org/rdf/"
+                xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+                xmlns:svg="http://www.w3.org/2000/svg">
+            <head profile="http://www.w3.org/1999/xhtml/vocab http://www.w3.org/2005/10/profile">
+              <title>Test 0100</title>
+            </head>
+            <body>
+              <div about="http://www.example.org">
+                <h2 property="ex:example" datatype="rdf:XMLLiteral"><svg:svg/></h2>
+              </div>
+            </body>
+          </html>
+          ), nil, nil, Nokogiri::XML::ParseOptions::DEFAULT_XML).root
+          content = root.css("h2").children
+          @new.call(content, :datatype => RDF.XMLLiteral,
+                    :namespaces => {
+                      :svg => "http://www.w3.org/2000/svg",
+                      :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
+      end
+      describe "and language with an existing language embedded" do
+        subject {
+          @new.call("foo <dc:sup>bar</dc:sup><dc:sub xml:lang=\"en\">baz</dc:sub>",
+                        :datatype => RDF.XMLLiteral,
+                        :namespaces => {:dc => RDF::DC.to_s},
+                        :language => :fr)
+        }
+        it "should add namespaces and language" do subject.to_s.should == "foo <dc:sup xmlns:dc=\"http://purl.org/dc/terms/\" xml:lang=\"fr\">bar</dc:sup><dc:sub xmlns:dc=\"http://purl.org/dc/terms/\" xml:lang=\"en\">baz</dc:sub>" end
+      end
+    end
+    describe "with a default namespace" do
+      subject {
+        @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral,
+                      :namespaces => {:__default__ => 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
+    end
+    describe "with a default namespace (as empty string)" do
+      subject {
+        @new.call("foo <sup>bar</sup> baz!", :datatype => RDF.XMLLiteral,
+                      :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
+    end
+    context "rdfcore tests" do
+      context "rdfms-xml-literal-namespaces" do
+        it "should reproduce test001" do
+          l = @new.call("
+      <html:h1>
+        <b>John</b>
+      </html:h1>
+   ",
+                      :datatype => RDF.XMLLiteral,
+                      :namespaces => {
+                        "" => "http://www.w3.org/1999/xhtml",
+                        "rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+                        "html" => "http://NoHTML.example.org",
+                        "my" => "http://my.example.org/",
+                      })
+          pending("XML C14N") 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
+        it "should reproduce test002" do
+          l = @new.call("
+    Ramifications of
+       <apply>
+      <power/>
+      <apply>
+	<plus/>
+	<ci>a</ci>
+	<ci>b</ci>
+      </apply>
+      <cn>2</cn>
+    </apply>
+    to World Peace
+  ",
+                      :datatype => RDF.XMLLiteral,
+                      :namespaces => {
+                        "" => "http://www.w3.org/TR/REC-mathml",
+                      })
+          l.to_s.should == "\n    Ramifications of\n       <apply xmlns=\"http://www.w3.org/TR/REC-mathml\">\n      <power></power>\n      <apply>\n\t<plus></plus>\n\t<ci>a</ci>\n\t<ci>b</ci>\n      </apply>\n      <cn>2</cn>\n    </apply>\n    to World Peace\n  "
+        end
+      end
+      context "rdfms-xmllang" do
+        it "should reproduce test001" do
+          l = @new.call("chat", :datatype => RDF.XMLLiteral, :language => nil)
+          l.to_s.should == "chat"
+        end
+        it "should reproduce test002" do
+          l = @new.call("chat", :datatype => RDF.XMLLiteral, :language => :fr)
+          l.to_s.should == "chat"
+        end
+      end
+      context "xml-canon" do
+        it "should reproduce test001" do
+          l = @new.call("<br />", :datatype => RDF.XMLLiteral)
+          l.to_s.should == "<br></br>"
+        end
+      end
+    end
+    context "rdfa tests" do
+      it "should reproduce test 0011: XMLLiteral" do
+        l = @new.call("E = mc<sup>2</sup>: The Most Urgent Problem of Our Time",
+                    :datatype => RDF.XMLLiteral,
+                    :namespaces => {"" => "http://www.w3.org/1999/xhtml"})
+        l.to_s.should == "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time"
+      end
+      it "should reproduce test 0092: Tests XMLLiteral content with explicit @datatype" do
+        l = @new.call(%(E = mc<sup>2</sup>: The Most Urgent Problem of Our Time<),
+                    :datatype => RDF.XMLLiteral,
+                    :namespaces => {"" => "http://www.w3.org/1999/xhtml"})
+        l.to_s.should == "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time"
+      end
+      it "should reproduce test 0100: XMLLiteral with explicit namespace" do
+        l = @new.call(%(Some text here in <strong>bold</strong> and an svg rectangle: <svg:svg><svg:rect svg:width="200" svg:height="100"/></svg:svg>),
+                    :datatype => RDF.XMLLiteral,
+                    :namespaces => {
+                      "" => "http://www.w3.org/1999/xhtml",
+                      "svg" => "http://www.w3.org/2000/svg",
+                    })
+        pending("XML C14N") 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
+      it "should reproduce 0101: XMLLiteral with explicit namespace and xml:lang" do
+        l = @new.call(%(Du texte ici en <strong>gras</strong> et un rectangle en svg: <svg:svg><svg:rect svg:width="200" svg:height="100"/></svg:svg>),
+                    :datatype => RDF.XMLLiteral, :language => :fr,
+                    :namespaces => {
+                      "" => "http://www.w3.org/1999/xhtml",
+                      "svg" => "http://www.w3.org/2000/svg",
+                    })
+        pending("XML C14N") 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
+      it "should reproduce test 0102: XMLLiteral with explicit namespace and xml:lang; not overwriting existing langs" do
+        l = @new.call(%(Du texte ici en <strong>gras</strong> et un rectangle en svg: <svg:svg xml:lang="hu"><svg:rect svg:width="200" svg:height="100"/></svg:svg>),
+                    :datatype => RDF.XMLLiteral, :language => :fr,
+                    :namespaces => {
+                      "" => "http://www.w3.org/1999/xhtml",
+                      "svg" => "http://www.w3.org/2000/svg",
+                    })
+        pending("XML C14N") 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
+      it "should reproduce test 0103: XMLLiteral with explicit namespace; not overwriting local namespaces" do
+        l = @new.call(%(Some text here in <strong>bold</strong> and an svg rectangle: <svg xmlns="http://www.w3.org/2000/svg"><rect width="200" height="100"/></svg>),
+                    :datatype => RDF.XMLLiteral,
+                    :namespaces => {
+                      "" => "http://www.w3.org/1999/xhtml",
+                      "svg" => "http://www.w3.org/2000/svg",
+                    })
+        pending("XML C14N") 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
+    end
+  end if defined?(::Nokogiri)
+end

data/spec/matchers.rb CHANGED Viewed

@@ -77,7 +77,7 @@ module Matchers
         @results = @query.execute(model)
         #puts "Redland query results: #{@results.inspect}"
-        if @expected_results
+        if @expected_results && @results
           @results.is_boolean? && @results.get_boolean?
         else
           @results.nil? || @results.is_boolean? && !@results.get_boolean?

data/spec/rdfa_helper.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'rdf/rdfxml'
+require 'open-uri'
 autoload :YAML, "yaml"
 autoload :CGI, 'cgi'
@@ -39,7 +40,7 @@ module RdfaHelper
         pred = statement.predicate.to_s.split(/[\#\/]/).last
         obj  = statement.object.is_a?(RDF::Literal) ? statement.object.value : statement.object.to_s
-        puts "#{pred}: #{obj}" if $DEBUG
+        puts "#{pred}: #{obj}" if ::RDF::RDFa::debug?
         unless self.about
           self.about = statement.subject
@@ -109,6 +110,12 @@ module RdfaHelper
         %(<!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)
+        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) +
@@ -128,18 +135,22 @@ 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')
+      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')
+      suite =~ /xhtml/ ? body : body.gsub(HTMLRE, '\1.html')
     end
     def inputDocument; self.name + ".txt"; end
     def outputDocument; self.name + ".sparql"; end
+    def version
+      suite == "xhtml11" ? :rdfa_1_1 : :rdfa_1_0
+    end
     # Run test case, yields input for parser to create triples
     def run_test
       rdfa_string = input
@@ -213,3 +224,33 @@ module RdfaHelper
     end
   end
 end
+module RDF
+  class Graph
+    def self.load(url, options = {}, &block)
+      url = case url.to_s
+      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+),
+          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
+      when "http://www.w3.org/2005/10/profile"
+        file = File.join(File.expand_path(File.dirname(__FILE__)), 'rdfa-test-suite', 'profile', "xhv")
+      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
+      end
+    end
+  end
+end

data/spec/rdfa_reader_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+$:.unshift "."
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'rdfa_helper'
@@ -17,49 +18,6 @@ describe RDF::RDFa::Format do
 end
 describe "RDF::RDFa::Reader" do
-  before(:all) do
-    # Don't load external profiles when testing
-    {
-      "basic" => {
-        :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/basic",
-        :format => :rdfa,
-        :file => File.join(File.dirname(__FILE__), "..", "etc", "basic.html"),
-      },
-      "foaf" => {
-        :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/foaf",
-        :format => :rdfa,
-        :file => File.join(File.dirname(__FILE__), "..", "etc", "foaf.html"),
-      },
-      "xhv" => {
-        :base_uri => "http://www.w3.org/1999/xhtml/vocab",
-        :format => :rdfa,
-        :file => File.join(File.dirname(__FILE__), "..", "etc", "xhv.html"),
-      },
-      "profile" => {
-        :base_uri => "http://www.w3.org/2005/10/profile",
-        :format => :rdfa,
-        :value => "PROFILE",
-      },
-      "hcard" => {
-        :base_uri => "http://microformats.org/profiles/hcard",
-        :format => :rdfa,
-        :value => "HCARD",
-      },
-    }.each_pair do |name, opts|
-      if opts[:file]
-        graph = RDF::Graph.new
-        RDF::Reader.for(opts[:format]).new(File.read(opts[:file]),
-                    :base_uri => opts[:base_uri]).each do |statement|
-          graph << statement
-        end
-        opts[:value] = graph
-      end
-      RDF::Graph.stub!(:load).with(opts[:base_uri],
-                      :base_uri => opts[:base_uri],
-                      :format => opts[:format]).and_return(opts[:value])
-    end
-  end
   context "discovery" do
     {
       "html" => RDF::Reader.for(:rdfa),
@@ -78,7 +36,7 @@ describe "RDF::RDFa::Reader" do
     before(:each) do
       @sampledoc = <<-EOF;
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<!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>
@@ -120,11 +78,11 @@ EOF
     end
   end
-  context "paring a simple doc" do
+  context "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.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<!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>
@@ -161,7 +119,7 @@ EOF
     before :each do
       sampledoc = <<-EOF;
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<!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>
@@ -195,16 +153,17 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<!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: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">E = mc<sup>2</sup>: The Most Urgent Problem of Our Time</h2>
+      <h2 property="dc:title" datatype="rdf:XMLLiteral">E = mc<sup>2</sup>: The Most Urgent Problem of Our Time</h2>
   </div>
   </body>
 </html>
@@ -238,8 +197,8 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0"
+<!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>
@@ -290,8 +249,8 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0"
+<!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>
@@ -332,8 +291,8 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0"
+<!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>
@@ -364,13 +323,13 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0">
+<!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://www.w3.org/2007/08/pyRdfa/profiles/basic">
+  <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../profiles/basic">
   <div about="#me">
     <p>
       <span property="foaf:name">Ivan Herman</span>
@@ -405,13 +364,13 @@ EOF
     before :each do
       sampledoc = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0">
+<!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://www.w3.org/2007/08/pyRdfa/profiles/foaf">
+  <body profile="http://rdfa.digitalbazaar.com/test-suite/test-cases/tests/../profiles/foaf">
   <div about="#me">
     <p>
       <span property="name">Ivan Herman</span>
@@ -447,7 +406,7 @@ EOF
   end
   # W3C Test suite from http://www.w3.org/2006/07/SWD/RDFa/testsuite/
-  %w(xhtml).each do |suite| # html4 html5
+  %w(xhtml xhtml11).each do |suite| # html4 html5
     describe "w3c #{suite} testcases" do
       describe "that are approved" do
         test_cases(suite).each do |t|
@@ -461,8 +420,14 @@ EOF
                 t.debug = []
                 parse(rdfa_string,
                     :base_uri => t.informationResourceInput,
-                    :strict => true,
-                    :debug => t.debug)
+                    :debug => t.debug,
+                    :version => t.version)
+              end
+            rescue Spec::Expectations::ExpectationNotMetError => e
+              if t.input =~ /XMLLiteral/
+                pending("XMLLiteral canonicalization not implemented yet")
+              else
+                raise
               end
             rescue SparqlException => e
               pending(e.message) { raise }
@@ -481,8 +446,8 @@ EOF
                 t.debug = []
                 parse(rdfa_string,
                     :base_uri => t.informationResourceInput,
-                    :strict => true,
-                    :debug => t.debug)
+                    :debug => t.debug,
+                    :version => t.version)
               end
             rescue SparqlException => e
               pending(e.message) { raise }