json-ld 1.0.1.1 → 1.0.3

data/lib/json/ld/reader.rb

@@ -50,6 +50,11 @@ module JSON::LD
     # @see   RDF::Reader#each_statement
     def each_statement(&block)
       JSON::LD::API.toRDF(@doc, @options[:context], @options).each do |statement|
+        # If RDF version is 1.0, fold literals with xsd:string to be just simple literals
+        statement.object.datatype = nil if
+          RDF::VERSION.to_s < "1.1" &&
+          statement.object.literal? &&
+          statement.object.datatype == RDF::XSD.string
         block.call(statement)
       end
     end

data/lib/json/ld/to_rdf.rb

@@ -20,7 +20,7 @@ module JSON::LD
         # For each id-node in active_graph
         active_graph.each do |id, node|
           # Initialize subject as the IRI or BNode representation of id
-          subject = as_resource(id)
+          subject = as_resource(id, context.doc_base)
           debug("graph_to_rdf")  {"subject: #{subject.to_ntriples}"}
 
           # For each property-values in node
@@ -29,7 +29,7 @@ module JSON::LD
             when '@type'
               # If property is @type, construct triple as an RDF Triple composed of id, rdf:type, and object from values where id and object are represented either as IRIs or Blank Nodes
               results += values.map do |value|
-                object = as_resource(value)
+                object = as_resource(value, context.doc_base)
                 debug("graph_to_rdf")  {"type: #{object.to_ntriples}"}
                 RDF::Statement.new(subject, RDF.type, object)
               end
@@ -38,7 +38,7 @@ module JSON::LD
             else
               # Otherwise, property is an IRI or Blank Node identifier
               # Initialize predicate from  property as an IRI or Blank node
-              predicate = as_resource(property)
+              predicate = as_resource(property, context.doc_base)
               debug("graph_to_rdf")  {"predicate: #{predicate.to_ntriples}"}
 
               # For each item in values
@@ -90,7 +90,7 @@ module JSON::LD
           value = lit.to_s
           datatype ||= lit.datatype
         else
-          # Otherwise, if datatype is null, set it to xsd:string or rdf:langString, depending on if item has a @language key.
+          # Otherwise, if datatype is null, set it to xsd:string or xsd:langString, depending on if item has a @language key.
           datatype ||= item.has_key?('@language') ? RDF.langString : RDF::XSD.string
         end
                   
@@ -104,7 +104,7 @@ module JSON::LD
         # Otherwise, value must be a node definition containing only @id whos value is an IRI or Blank Node identifier
         raise "Expected node reference, got #{item.inspect}" unless item.keys == %w(@id)
         # Return value associated with @id as an IRI or Blank node
-        as_resource(item['@id'])
+        as_resource(item['@id'], context.doc_base)
       end
     end
 
@@ -145,23 +145,5 @@ module JSON::LD
     def node
       RDF::Node.new(namer.get_sym)
     end
-
-    ##
-    # add a statement, object can be literal or URI or bnode
-    #
-    # @param [String] path
-    # @param [RDF::Resource] subject the subject of the statement
-    # @param [RDF::URI] predicate the predicate of the statement
-    # @param [RDF::Term] object the object of the statement
-    # @param [RDF::Resource] name the named graph context of the statement
-    # @yield statement
-    # @yieldparam [RDF::Statement] statement
-    def add_quad(path, subject, predicate, object, name)
-      predicate = RDF.type if predicate == '@type'
-      object = context.expand_iri(object.to_s, :quiet => true) if object.literal? && predicate == RDF.type
-      statement = RDF::Statement.new(subject, predicate, object, :context => name)
-      debug(path) {"statement: #{statement.to_nquads}"}
-      yield statement
-    end
   end
 end

data/lib/json/ld/utils.rb

@@ -65,10 +65,17 @@ module JSON::LD
     ##
     # Represent an id as an IRI or Blank Node
     # @param [String] id
+    # @param [RDF::URI] base (nil)
     # @return [RDF::Resource]
-    def as_resource(id)
+    def as_resource(id, base = nil)
       @nodes ||= {} # Re-use BNodes
-      id[0,2] == '_:' ? (@nodes[id] ||= RDF::Node.new(id[2..-1])) : RDF::URI(id)
+      if id[0,2] == '_:'
+        (@nodes[id] ||= RDF::Node.new(id[2..-1]))
+      elsif base
+        base.join(id)
+      else
+        RDF::URI(id)
+      end
     end
 
     private

data/spec/api_spec.rb

@@ -33,7 +33,7 @@ describe JSON::LD::API do
         end if File.exist?(framed) && File.exist?(frame)
 
         it "toRDF" do
-          RDF::Graph.load(filename, :debug => @debug).should be_equivalent_graph(RDF::Graph.load(ttl), :trace => @debug)
+          RDF::Repository.load(filename, :debug => @debug).should be_equivalent_graph(RDF::Repository.load(ttl), :trace => @debug)
         end if File.exist?(ttl)
       end
     end

data/spec/compact_spec.rb

@@ -336,8 +336,7 @@ describe JSON::LD::API do
             "@context": {
               "name": "http://xmlns.com/foaf/0.1/name",
               "isKnownBy": {
-                "@reverse": "http://xmlns.com/foaf/0.1/knows",
-                "@type": "@id"
+                "@reverse": "http://xmlns.com/foaf/0.1/knows"
               }
             },
             "@id": "http://example.com/people/markus",

data/spec/flatten_spec.rb

@@ -10,8 +10,7 @@ describe JSON::LD::API do
       "single object" => {
         :input => {"@id" => "http://example.com", "@type" => RDF::RDFS.Resource.to_s},
         :output => [
-          {"@id" => "http://example.com", "@type" => [RDF::RDFS.Resource.to_s]},
-          {"@id" => RDF::RDFS.Resource.to_s}
+          {"@id" => "http://example.com", "@type" => [RDF::RDFS.Resource.to_s]}
         ]
       },
       "embedded object" => {
@@ -35,9 +34,7 @@ describe JSON::LD::API do
           {
             "@id" => "http://greggkellogg.net/foaf#me",
             "@type" => [RDF::FOAF.Person.to_s]
-          },
-          {"@id" => RDF::FOAF.Person.to_s},
-          {"@id" => RDF::FOAF.PersonalProfile.to_s},
+          }
         ]
       },
       "embedded anon" => {
@@ -60,9 +57,7 @@ describe JSON::LD::API do
             "@id" => "http://greggkellogg.net/foaf",
             "@type" => [RDF::FOAF.PersonalProfile.to_s],
             RDF::FOAF.primaryTopic.to_s => [{"@id" => "_:b0"}]
-          },
-          {"@id" => RDF::FOAF.Person.to_s},
-          {"@id" => RDF::FOAF.PersonalProfile.to_s},
+          }
         ]
       },
       "reverse properties" => {
@@ -149,8 +144,6 @@ describe JSON::LD::API do
             {"@id": "http://www.brockhaus.de/"}
           ],
           "@graph": [{
-              "@id": "http://example.org/location/France#this"
-          }, {
               "@id": "http://example.org/location/Paris#this",
               "http://example.org/locatedIn": [{"@id": "http://example.org/location/France#this"}]
             }]
@@ -162,14 +155,6 @@ describe JSON::LD::API do
               "@id": "http://example.org/location/Paris#this",
               "http://example.org/hasPopulation": [{"@value": 7000000}]
             }]
-          }, {
-            "@id": "http://www.britannica.com/"
-          }, {
-            "@id": "http://www.brockhaus.de/"
-          }, {
-            "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#Graph"
-          }, {
-            "@id": "http://www.wikipedia.org/"
           }])),
       },
       "Test Manifest (shortened)" => {
@@ -193,8 +178,6 @@ describe JSON::LD::API do
             "@id": "#t0001",
             "http://example/input": [{"@id": "error-expand-0001-in.jsonld"}],
             "http://example/name": [{"@value": "Keywords cannot be aliased to other keywords"}]
-          }, {
-            "@id": "error-expand-0001-in.jsonld"
           }]
         }),
         :options => {}

data/spec/from_rdf_spec.rb

@@ -12,9 +12,7 @@ describe JSON::LD::API do
         {
           '@id'         => "http://a/b",
           "http://a/c"  => [{"@id" => "http://a/d"}]
-          }, {
-            '@id' => 'http://a/d'
-          }
+        }
         ], @debug)
       end
 
@@ -27,9 +25,7 @@ describe JSON::LD::API do
             {"@id" => "http://example.com/d"},
             {"@id" => "http://example.com/e"}
           ]
-        },
-        {"@id" => "http://example.com/d"},
-        {"@id" => "http://example.com/e"}
+        }
         ], @debug)
       end
     
@@ -40,9 +36,7 @@ describe JSON::LD::API do
           '@id'   => "http://example.com/b",
           "http://example.com/c"      => [{"@id" => "http://example.com/d"}],
           "http://example.com/e"      => [{"@id" => "http://example.com/f"}]
-        },
-        {"@id" => "http://example.com/d"},
-        {"@id" => "http://example.com/f"}
+        }
         ], @debug)
       end
     
@@ -55,7 +49,6 @@ describe JSON::LD::API do
         )
         serialize(input).
         should produce([
-          {'@id'  => "http://www.w3.org/2006/03/test-description#TestCase"},
           {'@id'  => "test-cases/0001", '@type' => ["http://www.w3.org/2006/03/test-description#TestCase"]},
           {'@id'  => "test-cases/0002", '@type' => ["http://www.w3.org/2006/03/test-description#TestCase"]},
         ], @debug)
@@ -170,8 +163,7 @@ describe JSON::LD::API do
         {
           "@id" => "_:a",
           "http://example.com/a"  => [{"@id" => "http://example.com/b"}]
-        },
-        {"@id" => "http://example.com/b"}
+        }
         ], @debug)
       end
     
@@ -185,8 +177,7 @@ describe JSON::LD::API do
           {
             "@id" => "http://example.com/a",
             "http://example.com/b"  => [{"@id" => "_:a"}]
-          },
-          {"@id" => "http://example.com/d"},
+          }
         ], @debug)
       end
     end
@@ -218,7 +209,7 @@ describe JSON::LD::API do
               {"@id" => "http://example.com/c"}
             ]
           }]
-        }, {"@id" => "http://example.com/c"}], @debug)
+        }], @debug)
       end
     
       it "should generate empty list" do
@@ -265,7 +256,7 @@ describe JSON::LD::API do
               "@graph" => [{
                 "@id" => "http://example.com/a",
                 "http://example.com/b" => [{"@id" => "http://example.com/c"}]
-              }, {"@id" => "http://example.com/c"}]
+              }]
             },
           ]
         },
@@ -280,10 +271,9 @@ describe JSON::LD::API do
               "@graph" => [{
                 "@id" => "http://example.com/a",
                 "http://example.com/b" => [{"@id" => "http://example.com/c"}]
-              }, {"@id" => "http://example.com/c"}],
+              }],
               "http://example.com/d" => [{"@id" => "http://example.com/e"}]
-            },
-            {"@id" => "http://example.com/e"}
+            }
           ]
         },
         "with lists" => {
@@ -301,10 +291,9 @@ describe JSON::LD::API do
               "@graph" => [{
                 "@id" => "http://example.com/a",
                 "http://example.com/b" => [{"@list" => [{"@id" => "http://example.com/c"}]}]
-              }, {"@id" => "http://example.com/c"}],
+              }],
               "http://example.com/d" => [{"@list" => [{"@id" => "http://example.com/e"}]}]
-            },
-            {"@id" => "http://example.com/e"}
+            }
           ]
         },
         "Two Graphs with same subject and lists" => {
@@ -325,8 +314,7 @@ describe JSON::LD::API do
                   "http://example.com/b" => [{
                     "@list" => [{"@id" => "http://example.com/c"}]
                   }]
-                },
-                {"@id" => "http://example.com/c"}
+                }
               ]
             },
             {
@@ -337,8 +325,7 @@ describe JSON::LD::API do
                   "http://example.com/b" => [{
                     "@list" => [{"@id" => "http://example.com/e"}]
                   }]
-                },
-                {"@id" => "http://example.com/e"}
+                }
               ]
             }
           ]
@@ -357,7 +344,7 @@ describe JSON::LD::API do
         serialize(input, :useRdfType => false).should produce([{
           '@id'   => "http://example.com/a",
           "@type"    => ["http://example.com/b"]
-        }, {'@id' => "http://example.com/b"}], @debug)
+        }], @debug)
       end
       
       it "does not use @type if set to true" do
@@ -365,7 +352,7 @@ describe JSON::LD::API do
         serialize(input, :useRdfType => true).should produce([{
           '@id'   => "http://example.com/a",
           '@type'    => ["http://example.com/b"]
-        }, {"@id" => "http://example.com/b"}], @debug)
+        }], @debug)
       end
     end
   
@@ -383,7 +370,7 @@ describe JSON::LD::API do
             "http://www.w3.org/2000/01/rdf-schema#range" => [
               { "@id" => "http://www.w3.org/2001/XMLSchema#boolean" }
             ]
-          }, { "@id" => "http://www.w3.org/2001/XMLSchema#boolean" }]
+          }]
         ],
       }.each do |t, (input, output)|
         it "#{t}" do

data/spec/matchers.rb

@@ -6,12 +6,12 @@ Info = Struct.new(:about, :information, :trace, :inputDocument, :outputDocument,
 
 def normalize(graph)
   case graph
-  when RDF::Graph then graph
+  when RDF::Enumerable then graph
   when IO, StringIO
     RDF::Graph.new.load(graph, :base => @info.about)
   else
     # Figure out which parser to use
-    g = RDF::Graph.new
+    g = RDF::Repository.new
     reader_class = detect_format(graph)
     reader_class.new(graph, :base => @info.about).each {|s| g << s}
     g
@@ -37,7 +37,7 @@ RSpec::Matchers.define :be_equivalent_graph do |expected, info|
   
   failure_message_for_should do |actual|
     info = @info.respond_to?(:information) ? @info.information : @info.inspect
-    if @expected.is_a?(RDF::Graph) && @actual.size != @expected.size
+    if @expected.is_a?(RDF::Enumerable) && @actual.size != @expected.size
       "Graph entry count differs:\nexpected: #{@expected.size}\nactual:   #{@actual.size}"
     elsif @expected.is_a?(Array) && @actual.size != @expected.length
       "Graph entry count differs:\nexpected: #{@expected.length}\nactual:   #{@actual.size}"

data/spec/reader_spec.rb

@@ -36,7 +36,7 @@ describe JSON::LD::Reader do
 
     describe "#initialize" do
       it "yields reader given string" do
-        inner = mock("inner")
+        inner = double("inner")
         inner.should_receive(:called).with(JSON::LD::Reader)
         JSON::LD::Reader.new(subject) do |reader|
           inner.called(reader.class)
@@ -44,7 +44,7 @@ describe JSON::LD::Reader do
       end
 
       it "yields reader given IO" do
-        inner = mock("inner")
+        inner = double("inner")
         inner.should_receive(:called).with(JSON::LD::Reader)
         JSON::LD::Reader.new(StringIO.new(subject)) do |reader|
           inner.called(reader.class)
@@ -58,7 +58,7 @@ describe JSON::LD::Reader do
 
     describe "#each_statement" do
       it "yields statements" do
-        inner = mock("inner")
+        inner = double("inner")
         inner.should_receive(:called).with(RDF::Statement).exactly(3)
         JSON::LD::Reader.new(subject).each_statement do |statement|
           inner.called(statement.class)
@@ -68,7 +68,7 @@ describe JSON::LD::Reader do
 
     describe "#each_triple" do
       it "yields statements" do
-        inner = mock("inner")
+        inner = double("inner")
         inner.should_receive(:called).exactly(3)
         JSON::LD::Reader.new(subject).each_triple do |subject, predicate, object|
           inner.called(subject.class, predicate.class, object.class)

data/spec/suite_compact_spec.rb

@@ -10,10 +10,6 @@ describe JSON::LD 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
             t.debug = ["test: #{t.inspect}", "source: #{t.input.read}"]
             if t.property('context')
               t.debug << "context: #{t.context.read}"

data/spec/suite_to_rdf_spec.rb

@@ -18,8 +18,8 @@ describe JSON::LD do
               to_quad(statement)
             end
 
-            sorted_expected = t.expect.readlines.sort.join("")
-            quads.sort.join("").should produce(sorted_expected, t.debug)
+            sorted_expected = t.expect.readlines.uniq.sort.join("")
+            quads.uniq.sort.join("").should produce(sorted_expected, t.debug)
           rescue JSON::LD::ProcessingError => e
             fail("Processing error: #{e.message}")
           rescue JSON::LD::InvalidContext => e

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

@@ -3,6 +3,6 @@
 @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"^^xsd:string;
-    homepage: "http://manu.sporny.org/"^^xsd:string;
-    name: "Manu Sporny"^^xsd:string] .
+ [ avatar: "http://twitter.com/account/profile_image/manusporny";
+    homepage: "http://manu.sporny.org/";
+    name: "Manu Sporny"] .

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

@@ -5,4 +5,4 @@
 
  [ age: 41;
     homepage: <http://manu.sporny.org/>;
-    name: "Manu Sporny"^^xsd:string] .
+    name: "Manu Sporny"] .

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

@@ -3,5 +3,5 @@
 
 <http://manu.sporny.org/#me> a foaf:Person;
    foaf:knows [ a foaf:Person;
-     foaf:name "Gregg Kellogg"^^xsd:string];
-   foaf:name "Manu Sporny"^^xsd:string .
+     foaf:name "Gregg Kellogg"];
+   foaf:name "Manu Sporny" .

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

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