json-ld 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5adc54c6221f35206e44c2d599acc5bdf40431c5
-  data.tar.gz: 484e28238ca6b1615943d1b3040fa08cf9b077c1
+  metadata.gz: 1da92b315af019278538aaac7a28f81aa326b9d2
+  data.tar.gz: 6af02e670f5487b42020949408bc2e41a34acd15
 SHA512:
-  metadata.gz: 9d268dcf9996b5cb83bf2a775c96c04a2cca8afd6901fdf7b40815b2a654edc3e032d528bc4bc59c712c11fa0d78c6aabc08ddd8010f42abc9c76f089ccf5aed
-  data.tar.gz: a283566902b6d1896f2685c06de158d35da2a94317afaf942ebb6ee4714eb9d7d4eb1f65e2538fc381a278e457a0d99b21640bc7ab9e3a2fc90bb69799c13516
+  metadata.gz: 89bf9f2ac0f47311225074131ea1bb83a332f53b33b44a26c37c127b883208cad59e97f292275a4ffa76be4a5da6e1147990ae48f266d4251c1f596070db81ca
+  data.tar.gz: ef1940a0babfabeeee80890eceb153d57dd99d5322338c431f8c4db8c1f96fb2e79d9564af6afe6ab1c02cf837899812e00a82f7fd9f70e0d394bb680e38cc19

data/VERSION

@@ -1 +1 @@
-2.0.0.beta2
+2.0.0.beta3

data/lib/json/ld/api.rb

@@ -79,7 +79,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
@@ -133,7 +133,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

@@ -265,11 +265,11 @@ module JSON::LD
              result = context.dup
           when IO, StringIO
             log_debug("parse") {"io: #{context}"}
-            # Load context document, if it is a string
+            # Load context document, if it is an open file
             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
@@ -286,7 +286,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/lib/json/ld/writer.rb

@@ -130,7 +130,6 @@ module JSON::LD
       options[:base_uri] ||= options[:base] if options.has_key?(:base)
       options[:base] ||= options[:base_uri] if options.has_key?(:base_uri)
       super do
-        log_statistics.clear  # FIXME: shouldn't be necessary
         @repo = RDF::Repository.new
 
         if block_given?

data/spec/context_spec.rb

@@ -109,6 +109,24 @@ describe JSON::LD::Context do
           "bar" => "http://example.com/foo"
         }, logger)
       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"
+        }, logger)
+      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

@@ -201,7 +201,6 @@ describe JSON::LD::Writer do
           logger.info "source: #{t.input}"
           t.logger = logger
           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(logger: t.logger) do |writer|
             writer << repo

metadata

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