json-ld 1.0.7 → 1.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMzNjFiMDVhYTdjNTk1OGQ3NTFiMzQwZjE0ZDViM2I1Mjk1YWI2Mw==
+    MjNiZjRiMzMwODgxOTgwNjdjMjFjMWNkNjY1ZDVlNDk0ODAzYjQ3YQ==
   data.tar.gz: !binary |-
-    MGYyMDRhMjNiMWJkNDY1ODAyODk4Y2RkZTY2N2U2OGY3NWQ4YzM2OQ==
+    ZWFkOWE0MDU0ZTc0YzIyYzdkZGEwNDg0YTgxZjg1ZTc0MWU3MTYzMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTM0NTI4MzRmMzA1OTI2MDM1MzQ2ZTFkYWQ4MWM0OTM4MjkwMGE0NGU3ZGQ4
-    ZmFlNjM5MzBlNGZkZjkyMjgyYmIzM2U3MWU5OTUxOTNmZGUwMjc3ODExYWRi
-    M2Q5ZjdkMjU1M2NkY2MwZTgwNWYzNTE2N2UyMWVjNmY1NmYzYjU=
+    MDY1MDAxMDMzMmMzYjg4MzA2ODJjYTAxYjdlNmRjYzdkNGVlYTY3YTU1MTI4
+    NTMwMjQ3ZjYyNDIzNTkyYzUzMTkzNDJlMWI2MzUwZTY5NGE0NTczYTZiMjVh
+    YWE3MjQ1MzA0NjVmYmYxMGQ4NjJjYzQ0ZWVjOTg4YmEwOTJmZWY=
   data.tar.gz: !binary |-
-    MjEyNzQ4MzM5MzNlNzc2ZGMwYTgxZjNiNjBjZDlhMWEzNWZmNzliN2E2Nzlm
-    N2Y2OWJjZTIwNDFmODQ0ZmFkMGM1NDQwNDRjOTQ4MjNjMjJlNTgzZGY3NWE5
-    NjQ3MDI4YTk4Y2RhYmQ0MmEyMDkxNDVjZmViMTM2MmNhMzM0NTQ=
+    MDNhODA1ODViOTlmZTVjZGUxYjBmYmM4NTg1ZGNkNjBhNjliMjA1MzNmMDVm
+    NTdlZjNmZGExZjkwNThmNzU0YWIwZTExMDIzODVkMjI1M2Q0YzNjYTAzNzU3
+    MDA0NmI5NjYyYWZiNWM0ZGY4OWE4ZTQ4MDBjODEzZjVmYzU2MDc=

data/README.md

@@ -160,7 +160,7 @@ Install with `gem install json-ld`
       "foaf:nick":      { "@list": [ "joe", "bob", "jaybe" ] }
     })
     
-    graph = RDF::Graph.new << JSON::LD::API.toRDF(input)
+    graph = RDF::Graph.new << JSON::LD::API.toRdf(input)
 
     require 'rdf/turtle'
     graph.dump(:ttl, :prefixes => {:foaf => "http://xmlns.com/foaf/0.1/"})
@@ -190,7 +190,7 @@ Install with `gem install json-ld`
     })
 
     compacted = nil
-    JSON::LD::API::fromRDF(input) do |expanded|
+    JSON::LD::API::fromRdf(input) do |expanded|
       compacted = JSON::LD::API.compact(expanded, context['@context'])
     end
     compacted =>

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/bin/jsonld

@@ -20,7 +20,7 @@ def run(input, options)
   if options[:format] == :jsonld && options[:input_format] != :jsonld
     r = reader_class.new(input, options[:parser_options])
     g = RDF::Repository.new << r
-    input = JSON::LD::API.fromRDF(g)
+    input = JSON::LD::API.fromRdf(g)
   end
 
   prefixes = {}

data/lib/json/ld/api.rb

@@ -363,7 +363,7 @@ module JSON::LD
     # @return [Array<RDF::Statement>] if no block given
     # @yield statement
     # @yieldparam [RDF::Statement] statement
-    def self.toRDF(input, options = {}, &block)
+    def self.toRdf(input, options = {}, &block)
       results = []
       results.extend(RDF::Enumerable)
 
@@ -373,21 +373,21 @@ module JSON::LD
       API.new(expanded_input, nil, options) do
         # 1) Perform the Expansion Algorithm on the JSON-LD input.
         #    This removes any existing context to allow the given context to be cleanly applied.
-        debug(".toRDF") {"expanded input: #{expanded_input.to_json(JSON_STATE)}"}
+        debug(".toRdf") {"expanded input: #{expanded_input.to_json(JSON_STATE)}"}
 
         # Generate _nodeMap_
         node_map = Hash.ordered
         node_map['@default'] = Hash.ordered
         generate_node_map(expanded_input, node_map)
-        debug(".toRDF") {"node map: #{node_map.to_json(JSON_STATE)}"}
+        debug(".toRdf") {"node map: #{node_map.to_json(JSON_STATE)}"}
 
         # Start generating statements
         node_map.each do |graph_name, graph|
           context = as_resource(graph_name) unless graph_name == '@default'
-          debug(".toRDF") {"context: #{context ? context.to_ntriples : 'null'}"}
+          debug(".toRdf") {"context: #{context ? context.to_ntriples : 'null'}"}
           # Drop results for graphs which are named with relative IRIs
           if graph_name.is_a?(RDF::URI) && !graph_name.absolute
-            debug(".toRDF") {"drop relative graph_name: #{statement.to_ntriples}"}
+            debug(".toRdf") {"drop relative graph_name: #{statement.to_ntriples}"}
             next
           end
           graph_to_rdf(graph).each do |statement|
@@ -404,7 +404,7 @@ module JSON::LD
               end
             end
             if relative
-              debug(".toRDF") {"drop statement with relative IRIs: #{statement.to_ntriples}"}
+              debug(".toRdf") {"drop statement with relative IRIs: #{statement.to_ntriples}"}
               next
             end
 
@@ -433,7 +433,7 @@ module JSON::LD
     #   The JSON-LD document in expanded form
     # @return [Array<Hash>]
     #   The JSON-LD document in expanded form
-    def self.fromRDF(input, options = {}, &block)
+    def self.fromRdf(input, options = {}, &block)
       options = {:useNativeTypes => false}.merge(options)
       result = nil
 
@@ -526,6 +526,12 @@ module JSON::LD
       end
     end
 
+    # Add class method aliases for backwards compatibility
+    class << self
+      alias :toRDF :toRdf
+      alias :fromRDF :fromRdf
+    end
+
     ##
     # A {RemoteDocument} is returned from a {documentLoader}.
     class RemoteDocument

data/lib/json/ld/flatten.rb

@@ -25,6 +25,7 @@ module JSON::LD
                           list            = nil)
       depth do
         debug("node_map") {"active_graph: #{active_graph}, element: #{element.inspect}"}
+        debug("  =>") {"active_subject: #{active_subject.inspect}, active_property: #{active_property.inspect}, list: #{list.inspect}"}
         if element.is_a?(Array)
           # If element is an array, process each entry in element recursively by passing item for element, node map, active graph, active subject, active property, and list.
           element.map {|o|
@@ -90,7 +91,10 @@ module JSON::LD
             graph[id] ||= {'@id' => id}
 
             # If active property is not null, perform the following steps:
-            if active_property
+            if node?(active_subject) || node_reference?(active_subject)
+              debug("node_map") {"active_subject is an object, merge into #{id}"}
+              merge_value(graph[id], active_property, active_subject)
+            elsif active_property
               # Create a new JSON object reference consisting of a single member @id whose value is id.
               reference = {'@id' => id}
 
@@ -125,13 +129,12 @@ module JSON::LD
               element.delete('@reverse').each do |property, values|
                 values.each do |value|
                   debug("node_map") {"@reverse(#{id}): #{value.inspect}"}
-                  # If value has a property member, append referenced node to its value; otherwise create a property member whose value is an array containing referenced node.
-                  merge_value(value, property, {'@id' => id})
-
                   # Recursively invoke this algorithm passing value for element, node map, and active graph.
                   generate_node_map(value,
                                     node_map,
-                                    active_graph)
+                                    active_graph,
+                                    {'@id' => id},
+                                    property)
                 end
               end
             end

data/lib/json/ld/format.rb

@@ -47,5 +47,11 @@ module JSON::LD
     def self.to_sym
       :jsonld
     end
+
+    ##
+    # Override normal format name
+    def self.name
+      "JSON-LD"
+    end
   end
 end

data/lib/json/ld/from_rdf.rb

@@ -113,7 +113,7 @@ module JSON::LD
         node.delete(:usages)
         result << node unless node_reference?(node)
       end
-      debug("fromRDF") {result.to_json(JSON_STATE)}
+      debug("fromRdf") {result.to_json(JSON_STATE)}
       result
     end
   end

data/lib/json/ld/reader.rb

@@ -49,7 +49,7 @@ module JSON::LD
     # @private
     # @see   RDF::Reader#each_statement
     def each_statement(&block)
-      JSON::LD::API.toRDF(@doc, @options).each do |statement|
+      JSON::LD::API.toRdf(@doc, @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" &&

data/lib/json/ld/writer.rb

@@ -147,7 +147,7 @@ module JSON::LD
       @debug = @options[:debug]
 
       debug("writer") { "serialize #{@repo.count} statements, #{@options.inspect}"}
-      result = API.fromRDF(@repo, @options)
+      result = API.fromRdf(@repo, @options)
 
       # If we were provided a context, or prefixes, use them to compact the output
       context = RDF::Util::File.open_file(@options[:context]) if @options[:context].is_a?(String)

data/spec/api_spec.rb

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

data/spec/flatten_spec.rb

@@ -181,6 +181,35 @@ describe JSON::LD::API do
           }]
         }),
         :options => {}
+      },
+      "@reverse bnode issue (0045)" => {
+        :input => ::JSON.parse(%q{
+          {
+            "@context": {
+              "foo": "http://example.org/foo",
+              "bar": { "@reverse": "http://example.org/bar", "@type": "@id" }
+            },
+            "foo": "Foo",
+            "bar": [ "http://example.org/origin", "_:b0" ]
+          }
+        }),
+        :output => ::JSON.parse(%q{
+          [
+            {
+              "@id": "_:b0",
+              "http://example.org/foo": [ { "@value": "Foo" } ]
+            },
+            {
+              "@id": "_:b1",
+              "http://example.org/bar": [ { "@id": "_:b0" } ]
+            },
+            {
+              "@id": "http://example.org/origin",
+              "http://example.org/bar": [ { "@id": "_:b0" } ]
+            }
+          ]
+        }),
+        :options => {}
       }
     }.each do |title, params|
       it title do

data/spec/from_rdf_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rdf/spec/writer'
 
 describe JSON::LD::API do
-  describe ".fromRDF" do
+  describe ".fromRdf" do
     context "simple tests" do
       it "One subject IRI object" do
         input = %(<http://a/b> <http://a/c> <http://a/d> .)
@@ -374,6 +374,6 @@ describe JSON::LD::API do
     g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
     @debug << g.dump(:trig)
     statements = g.each_statement.to_a
-    JSON::LD::API.fromRDF(statements, options.merge(:debug => @debug))
+    JSON::LD::API.fromRdf(statements, options.merge(:debug => @debug))
   end
 end

data/spec/suite_helper.rb

@@ -108,9 +108,9 @@ module Fixtures
             when "jld:FromRDFTest"
               repo = RDF::Repository.load(input_loc, :format => :nquads)
               debug << "repo: #{repo.dump(id == '#t0012' ? :nquads : :trig)}"
-              JSON::LD::API.fromRDF(repo, options.merge(:debug => debug))
+              JSON::LD::API.fromRdf(repo, options.merge(:debug => debug))
             when "jld:ToRDFTest"
-              JSON::LD::API.toRDF(input_loc, options.merge(:debug => debug)).map do |statement|
+              JSON::LD::API.toRdf(input_loc, options.merge(:debug => debug)).map do |statement|
                 to_quad(statement)
               end
             else
@@ -156,9 +156,9 @@ module Fixtures
                 when "jld:FromRDFTest"
                   repo = RDF::Repository.load(t.input_loc)
                   debug << "repo: #{repo.dump(id == '#t0012' ? :nquads : :trig)}"
-                  JSON::LD::API.fromRDF(repo, options.merge(:debug => debug))
+                  JSON::LD::API.fromRdf(repo, options.merge(:debug => debug))
                 when "jld:ToRDFTest"
-                  JSON::LD::API.toRDF(t.input_loc, options.merge(:debug => debug)).map do |statement|
+                  JSON::LD::API.toRdf(t.input_loc, options.merge(:debug => debug)).map do |statement|
                     t.to_quad(statement)
                   end
                 else

data/spec/to_rdf_spec.rb

@@ -3,9 +3,13 @@ $:.unshift "."
 require 'spec_helper'
 
 describe JSON::LD::API do
-  before(:each) { @debug = []}
+  before(:each) {@debug = []}
+
+  context ".toRdf" do
+    it "should implement RDF::Enumerable" do
+      expect(JSON::LD::API.toRdf({})).to be_a(RDF::Enumerable)
+    end
 
-  context ".toRDF" do
     context "unnamed nodes" do
       {
         "no @id" => [
@@ -646,7 +650,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), options) {|st| graph << st}
+    JSON::LD::API.toRdf(StringIO.new(input), options) {|st| graph << st}
     graph
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf