json-ld 1.99.1 → 1.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba81727972fdb49ae06b098ce1754bbab4fad06
-  data.tar.gz: 084a57e8647980ce9e972ffdeefa1725d5a90edb
+  metadata.gz: 4c02d86fe66a58214d00b28c5542377cebcb3620
+  data.tar.gz: 966da6c48876b3728e89cedf867d7e9b163c53b3
 SHA512:
-  metadata.gz: d0fb6704553d2dbfa3ef5f65e006bdbb1c3fb2192d182c43606a6a9fb620303ff45500f613d970aa2a451f6722f25be00ff3b6bf0a0c335322e1855169560661
-  data.tar.gz: 9d0f250e54edb0f1cd2aa15e9c1282fc4cf7e87a6cc511db7afaa3cd0c73ed1b18b40debb369242ffac8205f1e41105c4b0a8794d82fda780bb8bb97b80832a1
+  metadata.gz: c4b28db10c7dd63d9dd5e6cafec485672ca40cf86edd6bf225534a8bae7e7feaf4804e7d979960fee280cf2528ff3547a96dc67c29abbc3ff5f67f9cf6ed7be2
+  data.tar.gz: 0d98b744bff6f6c2dad942e25d88c52c82d7348599ab7ba6d06b3a147be8e588884ff9ed1b62e8359069e8dd3ad37fc50512527ba779bb5a5f99aff25a132779

data/VERSION

@@ -1 +1 @@
-1.99.1
+1.99.2

data/lib/json/ld/api.rb

@@ -78,7 +78,7 @@ module JSON::LD
     # @option options [Boolean] :rename_bnodes (true)
     #   Rename bnodes as part of expansion, or keep them the same.
     # @option options [Boolean]  :unique_bnodes   (false)
-    #   Use unique bnode identifiers, defaults to using the identifier which the node was originall initialized with (if any).
+    #   Use unique bnode identifiers, defaults to using the identifier which the node was originally initialized with (if any).
     # @option options [Boolean]  :simple_compact_iris   (false)
     #   When compacting IRIs, do not use terms with expanded term definitions
     # @option options [Symbol] :adapter used with MultiJson
@@ -132,7 +132,7 @@ module JSON::LD
       context ||= (@value['@context'] if @value.is_a?(Hash)) || context_ref
       @context = Context.new(@options)
       @context = @context.parse(context) if context
-      
+
       if block_given?
         case block.arity
           when 0, -1 then instance_eval(&block)

data/lib/json/ld/context.rb

@@ -268,7 +268,7 @@ module JSON::LD
             begin
               ctx = JSON.load(context)
               raise JSON::LD::JsonLdError::InvalidRemoteContext, "Context missing @context key" if @options[:validate] && ctx['@context'].nil?
-              result = parse(ctx["@context"] ? ctx["@context"].dup : {})
+              result = result.dup.parse(ctx["@context"] ? ctx["@context"].dup : {})
               result.provided_context = ctx["@context"] if [context] == local_context
               result
             rescue JSON::ParserError => e
@@ -285,7 +285,7 @@ module JSON::LD
             raise JsonLdError::RecursiveContextInclusion, "#{context}" if remote_contexts.include?(context.to_s)
             remote_contexts << context.to_s
 
-            context_no_base = self.dup
+            context_no_base = result.dup
             context_no_base.base = nil
             context_no_base.context_base = context.to_s
 

data/lib/json/ld/utils.rb

@@ -70,7 +70,7 @@ module JSON::LD
     def as_resource(id, base = nil)
       @nodes ||= {} # Re-use BNodes
       if id[0,2] == '_:'
-        (@nodes[id] ||= RDF::Node.new(id[2..-1]))
+        (@nodes[id] ||= RDF::Node.new(namer.get_sym(id)))
       elsif base
         base.join(id)
       else

data/spec/context_spec.rb

@@ -111,6 +111,24 @@ describe JSON::LD::Context do
           "bar" => "http://example.com/foo"
         }, @debug)
       end
+
+      it "merges definitions from remote contexts" do
+        expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
+        rd2 = JSON::LD::API::RemoteDocument.new("http://example.com/c2", %q({
+          "@context": {
+            "title": {"@id": "http://purl.org/dc/terms/title"}
+          }
+        }))
+        expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/c2", anything).and_yield(rd2)
+        ec = subject.parse(%w(http://example.com/context http://example.com/c2))
+        expect(ec.send(:mappings)).to produce({
+          "xsd"      => "http://www.w3.org/2001/XMLSchema#",
+          "name"     => "http://xmlns.com/foaf/0.1/name",
+          "homepage" => "http://xmlns.com/foaf/0.1/homepage",
+          "avatar"   => "http://xmlns.com/foaf/0.1/avatar",
+          "title"    => "http://purl.org/dc/terms/title"
+        }, @debug)
+      end
     end
 
     context "Hash" do

data/spec/suite_to_rdf_spec.rb

@@ -11,7 +11,6 @@ describe JSON::LD do
         specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
           skip "Native value fidelity" if %w(toRdf-0035-in.jsonld).include?(t.property('input'))
           pending "Generalized RDF" if %w(toRdf-0118-in.jsonld).include?(t.property('input'))
-          pending "Blank nodes with reverse properties" if %w(toRdf-0119-in.jsonld).include?(t.property('input'))
           t.run self
         end
       end

data/spec/writer_spec.rb

@@ -195,7 +195,6 @@ describe JSON::LD::Writer do
         t.debug = ["test: #{t.inspect}", "source: #{t.input}"]
         specify "#{t.property('input')}: #{t.name}" do
           pending "Shared list BNode in different graphs" if t.property('input').include?("fromRdf-0021")
-          pending "graph comparison issue" if t.property('input').include?("fromRdf-0008")
           repo = RDF::Repository.load(t.input_loc, format: :nquads)
           jsonld = JSON::LD::Writer.buffer(debug: t.debug) do |writer|
             writer << repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.99.1
+  version: 1.99.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf