json-ld 0.9.1 → 1.0.0

data/spec/suite_compact_spec.rb

@@ -5,18 +5,21 @@ require 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/compact-manifest.jsonld')
-    describe m.name, :pending => "Major update" do
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/compact-manifest.jsonld")
+    describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
           begin
-            case t.property('input')
-            when /compact-(0032|0033|0034)/
-              pending("undesireable property generator corner cases")
-            end
+            #case t.property('input')
+            #when /compact-(0032|0033|0034)/
+            #  pending("undesireable property generator corner cases")
+            #end
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
-            t.debug << "context: #{t.context.read}" if t.property('context')
-            result = JSON::LD::API.compact(t.input, t.context, nil,
+            if t.property('context')
+              t.debug << "context: #{t.context.read}"
+              t.context.rewind
+            end
+            result = JSON::LD::API.compact(t.input, t.context,
                                           :base => t.base,
                                           :debug => t.debug)
             expected = JSON.load(t.expect)

data/spec/suite_error_expand_spec.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+$:.unshift "."
+require 'spec_helper'
+
+describe JSON::LD do
+  describe "test suite" do
+    require 'suite_helper'
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/error-expand-manifest.jsonld")
+    describe m.name do
+      m.entries.each do |t|
+        specify "#{t.property('input')}: #{t.name}" do
+          begin
+            t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
+            t.debug << "context: #{t.context.read}" if t.property('context')
+            lambda {
+              JSON::LD::API.expand(t.input, nil, :base => t.base, :validate => true)
+            }.should raise_error
+          end
+        end
+      end
+    end
+  end
+end unless ENV['CI']

data/spec/suite_expand_spec.rb

@@ -5,18 +5,14 @@ require 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/expand-manifest.jsonld')
-    describe m.name, :pending => "Major update" do
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/expand-manifest.jsonld")
+    describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
           begin
-            case t.property('input')
-            when /expand-(0039)/
-              pending("As if!")
-            end
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
             t.debug << "context: #{t.context.read}" if t.property('context')
-            result = JSON::LD::API.expand(t.input, nil, nil,
+            result = JSON::LD::API.expand(t.input, nil,
                                           :base => t.base,
                                           :debug => t.debug)
             expected = JSON.load(t.expect)

data/spec/suite_flatten_spec.rb

@@ -6,14 +6,14 @@ describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/flatten-manifest.jsonld')
-    describe m.name, :pending => "New flattening algorithm" do
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/flatten-manifest.jsonld")
+    describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
           begin
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
             t.debug << "frame: #{t.frame.read}" if t.property('frame')
-            result = JSON::LD::API.flatten(t.input, nil, t.context, nil,
+            result = JSON::LD::API.flatten(t.input, t.context,
                                           :base => t.base,
                                           :debug => t.debug)
             expected = JSON.load(t.expect)

data/spec/suite_frame_spec.rb

@@ -6,24 +6,24 @@ describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/frame-manifest.jsonld')
-    describe m.name, :pending => "New framing algorithm" do
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/frame-manifest.jsonld")
+    describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
           begin
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
             t.debug << "frame: #{t.frame.read}" if t.property('frame')
-            result = JSON::LD::API.frame(t.input, t.frame, nil, 
+            result = JSON::LD::API.frame(t.input, t.frame,
                                           :base => t.base,
                                           :debug => t.debug)
             expected = JSON.load(t.expect)
             result.should produce(expected, t.debug)
           rescue JSON::LD::ProcessingError => e
-            fail("Processing error: #{e.message}")
+            fail("Processing error: #{e.message}\n#{t.debug.join("\n")}\n#{e.backtrace.join("\n")}}")
           rescue JSON::LD::InvalidContext => e
-            fail("Invalid Context: #{e.message}")
+            fail("Invalid Context: #{e.message}\n#{t.debug.join("\n")}\n#{e.backtrace.join("\n")}}")
           rescue JSON::LD::InvalidFrame => e
-            fail("Invalid Frame: #{e.message}")
+            fail("Invalid Frame: #{e.message}\n#{t.debug.join("\n")}\n#{e.backtrace.join("\n")}}")
           end
         end
       end

data/spec/suite_from_rdf_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/fromRdf-manifest.jsonld')
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
@@ -14,8 +14,8 @@ describe JSON::LD do
             t.input.rewind
             t.debug << "result: #{t.expect.read}"
             repo = RDF::Repository.load(t.base)
-            t.debug << "repo: #{repo.dump(:trig)}"
-            result = JSON::LD::API.fromRDF(repo.each_statement.to_a, nil,
+            t.debug << "repo: #{repo.dump(t.id == '#t0012' ? :nquads : :trig)}"
+            result = JSON::LD::API.fromRDF(repo.each_statement.to_a,
                                           :debug => t.debug)
             expected = JSON.load(t.expect)
             result.should produce(expected, t.debug)

data/spec/suite_helper.rb

@@ -48,11 +48,10 @@ module RDF::Util
           else
             Kernel.open(filename_or_url.to_s, &block)
           end
-        rescue Errno::ENOENT
+        rescue Errno::ENOENT #, OpenURI::HTTPError
           # Not there, don't run tests
           StringIO.new("")
         end
-      else
       end
     end
   end
@@ -66,7 +65,11 @@ module Fixtures
         #puts "open: #{file}"
         RDF::Util::File.open_file(file) do |f|
           json = JSON.parse(f.read)
-          self.from_jsonld(json)
+          if block_given?
+            yield self.from_jsonld(json)
+          else
+            self.from_jsonld(json)
+          end
         end
       end
 
@@ -94,11 +97,15 @@ module Fixtures
 
       # Alias input, context, expect and frame
       %w(input context expect frame).each do |m|
-        define_method(m.to_sym) {RDF::Util::File.open_file "#{SUITE}tests/#{property(m)}"}
+        define_method(m.to_sym) {property(m) && RDF::Util::File.open_file("#{SUITE}tests/#{property(m)}")}
+      end
+
+      def testType
+        property('@type').reject {|t| t =~ /EvaluationTest/}.first
       end
 
-      def positiveTest
-        property('positiveTest') == 'true'
+      def positiveTest?
+        property('@type').include?('jld:PositiveEvaluationTest')
       end
       
       def trace; @debug.join("\n"); end

data/spec/suite_to_rdf_spec.rb

@@ -5,17 +5,17 @@ require 'spec_helper'
 describe JSON::LD do
   describe "test suite" do
     require 'suite_helper'
-    m = Fixtures::SuiteTest::Manifest.open('http://json-ld.org/test-suite/tests/toRdf-manifest.jsonld')
-    describe m.name, :pending => "Major update" do
+    m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/toRdf-manifest.jsonld")
+    describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}" do
           begin
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
-            quads = []
-            JSON::LD::API.toRDF(t.input, nil, nil,
-                                :base => t.base,
-                                :debug => t.debug) do |statement|
-              quads << to_quad(statement)
+            quads = JSON::LD::API.toRDF(t.input, nil,
+                                        :base => t.base,
+                                        :debug => t.debug
+            ).map do |statement|
+              to_quad(statement)
             end
 
             sorted_expected = t.expect.readlines.sort.join("")
@@ -51,9 +51,15 @@ describe JSON::LD do
         %("#{i}.#{f}E#{e}"^^<http://www.w3.org/2001/XMLSchema#double>)
       end
     when RDF::Literal
-      quoted(escaped(thing.value)) +
-      (thing.datatype? ? "^^<#{thing.datatype}>" : "") +
-      (thing.language? ? "@#{thing.language}" : "")
+      v = quoted(escaped(thing.value))
+      case thing.datatype
+      when nil, "http://www.w3.org/2001/XMLSchema#string", "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+        # Ignore these
+      else
+        v += "^^<#{thing.datatype}>"
+      end
+      v += "@#{thing.language}" if thing.language
+      v
     when RDF::Statement
       thing.to_quad.map {|r| to_quad(r)}.compact.join(" ") + " .\n"
     end

data/spec/test-files/test-1-rdf.ttl

@@ -1,7 +1,8 @@
 @prefix avatar: <http://xmlns.com/foaf/0.1/avatar> .
 @prefix homepage: <http://xmlns.com/foaf/0.1/homepage> .
 @prefix name: <http://xmlns.com/foaf/0.1/name> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
- [ avatar: "http://twitter.com/account/profile_image/manusporny";
-    homepage: "http://manu.sporny.org/";
-    name: "Manu Sporny"] .
+ [ avatar: "http://twitter.com/account/profile_image/manusporny"^^xsd:string;
+    homepage: "http://manu.sporny.org/"^^xsd:string;
+    name: "Manu Sporny"^^xsd:string] .

data/spec/test-files/test-3-rdf.ttl

@@ -1,7 +1,8 @@
 @prefix age: <http://xmlns.com/foaf/0.1/age> .
 @prefix homepage: <http://xmlns.com/foaf/0.1/homepage> .
 @prefix name: <http://xmlns.com/foaf/0.1/name> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
  [ age: 41;
     homepage: <http://manu.sporny.org/>;
-    name: "Manu Sporny"] .
+    name: "Manu Sporny"^^xsd:string] .

data/spec/test-files/test-4-compacted.json

@@ -6,5 +6,5 @@
   "@id":       ":#me",
   "@type":          "foaf:Person",
   "foaf:name":      "Manu Sporny",
-  "foaf:homepage":  { "@id": "" }
+  "foaf:homepage":  { "@id": "http://manu.sporny.org/" }
 }

data/spec/test-files/test-5-rdf.ttl

@@ -1,6 +1,7 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <http://manu.sporny.org/#me> a foaf:Person;
    foaf:knows [ a foaf:Person;
-     foaf:name "Gregg Kellogg"];
-   foaf:name "Manu Sporny" .
+     foaf:name "Gregg Kellogg"^^xsd:string];
+   foaf:name "Manu Sporny"^^xsd:string .

data/spec/test-files/test-6-rdf.ttl

@@ -1,5 +1,6 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <http://example.org/people#joebob> a foaf:Person;
-   foaf:name "Joe Bob";
-   foaf:nick ("joe" "bob" "jaybe") .
+   foaf:name "Joe Bob"^^xsd:string;
+   foaf:nick ("joe"^^xsd:string "bob"^^xsd:string "jaybe"^^xsd:string) .

data/spec/test-files/test-7-compacted.json

@@ -2,19 +2,19 @@
   "@context": { "foaf": "http://xmlns.com/foaf/0.1/" },
   "@graph": [
     {
-      "@id": "_:t0",
+      "@id": "_:bnode1",
       "@type": "foaf:Person",
       "foaf:homepage": "http://example.com/bob/",
       "foaf:name": "Bob"
     },
     {
-      "@id": "_:t1",
+      "@id": "_:bnode2",
       "@type": "foaf:Person",
       "foaf:homepage": "http://example.com/eve/",
       "foaf:name": "Eve"
     },
     {
-      "@id": "_:t2",
+      "@id": "_:bnode3",
       "@type": "foaf:Person",
       "foaf:homepage": "http://example.com/manu/",
       "foaf:name": "Manu"

data/spec/test-files/test-7-expanded.json

@@ -1,18 +1,18 @@
 [
   {
-    "@id": "_:t0",
+    "@id": "_:bnode1",
     "@type": ["http://xmlns.com/foaf/0.1/Person"],
     "http://xmlns.com/foaf/0.1/homepage": [{"@value": "http://example.com/bob/"}],
     "http://xmlns.com/foaf/0.1/name": [{"@value": "Bob"}]
   },
   {
-    "@id": "_:t1",
+    "@id": "_:bnode2",
     "@type": ["http://xmlns.com/foaf/0.1/Person"],
     "http://xmlns.com/foaf/0.1/homepage": [{"@value": "http://example.com/eve/"}],
     "http://xmlns.com/foaf/0.1/name": [{"@value": "Eve"}]
   },
   {
-    "@id": "_:t2",
+    "@id": "_:bnode3",
     "@type": ["http://xmlns.com/foaf/0.1/Person"],
     "http://xmlns.com/foaf/0.1/homepage": [{"@value": "http://example.com/manu/"}],
     "http://xmlns.com/foaf/0.1/name": [{"@value": "Manu"}]

data/spec/test-files/test-7-rdf.ttl

@@ -1,13 +1,14 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
  [ a foaf:Person;
-    foaf:homepage "http://example.com/manu/";
-    foaf:name "Manu"] .
+    foaf:homepage "http://example.com/manu/"^^xsd:string;
+    foaf:name "Manu"^^xsd:string] .
 
  [ a foaf:Person;
-    foaf:homepage "http://example.com/eve/";
-    foaf:name "Eve"] .
+    foaf:homepage "http://example.com/eve/"^^xsd:string;
+    foaf:name "Eve"^^xsd:string] .
 
  [ a foaf:Person;
-    foaf:homepage "http://example.com/bob/";
-    foaf:name "Bob"] .
+    foaf:homepage "http://example.com/bob/"^^xsd:string;
+    foaf:name "Bob"^^xsd:string] .

data/spec/test-files/test-9-compacted.json

@@ -10,7 +10,7 @@
     "term5": {"@id": "http://example.com/term", "@language": null},
     "@language": "de"
   },
-  "@id": "id1",
+  "@id": "http://example.com/id1",
   "@type": "t1",
   "term1": "v1",
   "term2": "v2",

data/spec/to_rdf_spec.rb

@@ -12,18 +12,19 @@ describe JSON::LD::API do
           %q({
             "http://example.com/foo": "bar"
           }),
-          %q([ <http://example.com/foo> "bar"] .)
+          %q([ <http://example.com/foo> "bar"^^xsd:string] .)
         ],
         "@id with _:a" => [
           %q({
             "@id": "_:a",
             "http://example.com/foo": "bar"
           }),
-          %q([ <http://example.com/foo> "bar"] .)
+          %q([ <http://example.com/foo> "bar"^^xsd:string] .)
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -37,17 +38,10 @@ describe JSON::LD::API do
           }),
           %q(<http://example.com/a> <http://example.com/foo> "bar" .)
         ],
-        "with empty term" => [
-          %({
-            "@context": {"": "http://example.com/"},
-            "@id": "",
-            "@type": "#{RDF::RDFS.Resource}"
-          }),
-          %(<http://example.com/> a <#{RDF::RDFS.Resource}>)
-        ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
       
@@ -74,9 +68,10 @@ describe JSON::LD::API do
             }),
             %(<http://example.org/#a> a <#{RDF::RDFS.Resource}>)
           ],
-        }.each do |title, (js, nt)|
+        }.each do |title, (js, ttl)|
           it title do
-            parse(js, :base => "http://example.org/").should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+            ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+            parse(js, :base => "http://example.org/").should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
           end
         end
       end
@@ -102,9 +97,10 @@ describe JSON::LD::API do
           }),
           %q([ a _:foo ] .)
         ]
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -115,13 +111,13 @@ describe JSON::LD::API do
           %q({
             "http://example.com/foo": "bar"
           }),
-          %q([ <http://example.com/foo> "bar" ] .)
+          %q([ <http://example.com/foo> "bar"^^xsd:string ] .)
         ],
         "strings" => [
           %q({
             "http://example.com/foo": ["bar", "baz"]
           }),
-          %q([ <http://example.com/foo> "bar", "baz" ] .)
+          %q([ <http://example.com/foo> "bar"^^xsd:string, "baz"^^xsd:string ] .)
         ],
         "IRI" => [
           %q({
@@ -135,9 +131,10 @@ describe JSON::LD::API do
           }),
           %q([ <http://example.com/foo> <http://example.com/bar>, <http://example.com/baz> ] .)
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -152,7 +149,7 @@ describe JSON::LD::API do
         "explicit plain literal" =>
         [
           %q({"http://xmlns.com/foaf/0.1/name": {"@value": "Gregg Kellogg"}}),
-          %q(_:a <http://xmlns.com/foaf/0.1/name> "Gregg Kellogg" .)
+          %q(_:a <http://xmlns.com/foaf/0.1/name> "Gregg Kellogg"^^xsd:string .)
         ],
         "language tagged literal" =>
         [
@@ -183,9 +180,10 @@ describe JSON::LD::API do
             <http://greggkellogg.net/foaf#me> <http://purl.org/dc/terms/created> "1957-02-27"^^<http://www.w3.org/2001/XMLSchema#date> .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -194,19 +192,20 @@ describe JSON::LD::API do
       {
         "empty prefix" => [
           %q({"@context": {"": "http://example.com/default#"}, ":foo": "bar"}),
-          %q(_:a <http://example.com/default#foo> "bar" .)
+          %q(_:a <http://example.com/default#foo> "bar"^^xsd:string .)
         ],
         "empty suffix" => [
           %q({"@context": {"prefix": "http://example.com/default#"}, "prefix:": "bar"}),
-          %q(_:a <http://example.com/default#> "bar" .)
+          %q(_:a <http://example.com/default#> "bar"^^xsd:string .)
         ],
         "prefix:suffix" => [
           %q({"@context": {"prefix": "http://example.com/default#"}, "prefix:foo": "bar"}),
-          %q(_:a <http://example.com/default#foo> "bar" .)
+          %q(_:a <http://example.com/default#foo> "bar"^^xsd:string .)
         ]
-      }.each_pair do |title, (js, nt)|
+      }.each_pair do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -222,12 +221,13 @@ describe JSON::LD::API do
           }),
           %q(
             <http://example.com/about#gregg> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> .
-            <http://example.com/about#gregg> <http://schema.org/name> "Gregg Kellogg" .
+            <http://example.com/about#gregg> <http://schema.org/name> "Gregg Kellogg"^^xsd:string .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -260,12 +260,13 @@ describe JSON::LD::API do
           }),
           %q(
             <http://greggkellogg.net/foaf#me> <http://xmlns.com/foaf/0.1/knows> _:a .
-            _:a <http://xmlns.com/foaf/0.1/name> "Manu Sporny" .
+            _:a <http://xmlns.com/foaf/0.1/name> "Manu Sporny"^^xsd:string .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -284,9 +285,10 @@ describe JSON::LD::API do
             <http://greggkellogg.net/foaf#me> <http://xmlns.com/foaf/0.1/knows> "Ivan Herman" .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -313,7 +315,7 @@ describe JSON::LD::API do
           }),
           %q(
             <http://greggkellogg.net/foaf#me> <http://xmlns.com/foaf/0.1/knows> _:a .
-            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny" .
+            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny"^^xsd:string .
             _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
           )
         ],
@@ -329,7 +331,7 @@ describe JSON::LD::API do
           }),
           %q(
             <http://greggkellogg.net/foaf#me> <http://xmlns.com/foaf/0.1/knows> _:a .
-            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny" .
+            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny"^^xsd:string .
             _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
           )
         ],
@@ -342,15 +344,16 @@ describe JSON::LD::API do
           }),
           %q(
             <http://greggkellogg.net/foaf#me> <http://xmlns.com/foaf/0.1/knows> _:a .
-            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny" .
+            _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Manu Sporny"^^xsd:string .
             _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b .
-            _:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Dave Longley" .
+            _:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "Dave Longley"^^xsd:string .
             _:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -395,7 +398,7 @@ describe JSON::LD::API do
           }),
           %q(
             _:a <http://example.com/foo> _:b .
-            _:b <http://example.org/foo> "bar" .
+            _:b <http://example.org/foo> "bar"^^xsd:string .
           )
         ],
         "contexts with a list processed in order" => [
@@ -407,7 +410,7 @@ describe JSON::LD::API do
             "foo":  "bar"
           }),
           %q(
-            _:b <http://example.org/foo> "bar" .
+            _:b <http://example.org/foo> "bar"^^xsd:string .
           )
         ],
         "term definition resolves term as IRI" => [
@@ -419,7 +422,7 @@ describe JSON::LD::API do
             "bar":  "bar"
           }),
           %q(
-            _:b <http://example.com/foo> "bar" .
+            _:b <http://example.com/foo> "bar"^^xsd:string .
           )
         ],
         "term definition resolves prefix as IRI" => [
@@ -431,22 +434,7 @@ describe JSON::LD::API do
             "bar":  "bar"
           }),
           %q(
-            _:b <http://example.com/foo#bar> "bar" .
-          )
-        ],
-        "IRI resolution uses term from current context, not active context" => [
-          %q({
-            "@context": [
-              {"foo": "not-this#"},
-              {
-                "foo": "http://example.com/foo#",
-                "bar": "foo:bar"
-              }
-            ],
-            "bar":  "bar"
-          }),
-          %q(
-            _:b <http://example.com/foo#bar> "bar" .
+            _:b <http://example.com/foo#bar> "bar"^^xsd:string .
           )
         ],
         "@language" => [
@@ -482,12 +470,13 @@ describe JSON::LD::API do
             "foo:bar":  {"@value": "baz"}
           }),
           %q(
-            _:a <http://example.com/foo#bar> "baz" .
+            _:a <http://example.com/foo#bar> "baz"^^xsd:string .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :base => "http://example/", :trace => @debug, :inputDocument => js)
         end
       end
       
@@ -537,9 +526,10 @@ describe JSON::LD::API do
                 [ dc:date "2011-11-23"^^xsd:date] .
               )
             ],
-          }.each do |title, (js, nt)|
+          }.each do |title, (js, ttl)|
             it title do
-              parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+              ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+              parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
             end
           end
         end
@@ -572,9 +562,10 @@ describe JSON::LD::API do
                 _:a <http://example.org/foo#bar> (<http://example.org/foo#bar>) .
               )
             ],
-          }.each do |title, (js, nt)|
+          }.each do |title, (js, ttl)|
             it title do
-              parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+              ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+              parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
             end
           end
         end
@@ -586,12 +577,12 @@ describe JSON::LD::API do
         "number syntax (decimal)" =>
         [
           %q({"@context": { "measure": "http://example/measure#"}, "measure:cups": 5.3}),
-          %q(_:a <http://example/measure#cups> "5.3"^^<http://www.w3.org/2001/XMLSchema#double> .)
+          %q(_:a <http://example/measure#cups> "5.3E0"^^<http://www.w3.org/2001/XMLSchema#double> .)
         ],
         "number syntax (double)" =>
         [
           %q({"@context": { "measure": "http://example/measure#"}, "measure:cups": 5.3e0}),
-          %q(_:a <http://example/measure#cups> "5.3"^^<http://www.w3.org/2001/XMLSchema#double> .)
+          %q(_:a <http://example/measure#cups> "5.3E0"^^<http://www.w3.org/2001/XMLSchema#double> .)
         ],
         "number syntax (integer)" =>
         [
@@ -628,9 +619,10 @@ describe JSON::LD::API do
             <http://example.com/#you> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
           )
         ],
-      }.each do |title, (js, nt)|
+      }.each do |title, (js, ttl)|
         it title do
-          parse(js).should be_equivalent_graph(nt, :trace => @debug, :inputDocument => js)
+          ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
+          parse(js).should be_equivalent_graph(ttl, :trace => @debug, :inputDocument => js)
         end
       end
     end
@@ -640,7 +632,7 @@ describe JSON::LD::API do
     @debug = []
     graph = options[:graph] || RDF::Graph.new
     options = {:debug => @debug, :validate => true, :canonicalize => false}.merge(options)
-    JSON::LD::API.toRDF(StringIO.new(input), nil, nil, options) {|st| graph << st}
+    JSON::LD::API.toRDF(StringIO.new(input), nil, options) {|st| graph << st}
     graph
   end
 end