json-ld 1.1.6.1 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fee10018378978dc0a87102e4c783208b1613cf
-  data.tar.gz: 9cde4a421857ee6a66cd9e0978ec168046d2675b
+  metadata.gz: b6c779ef87a832a22299e041f6247302d291701d
+  data.tar.gz: 1dea55d7a1187607566c39865ed76ca4dbc8131a
 SHA512:
-  metadata.gz: a85611f4cd46ca52b6a75bdb2cddb6185e603848c3bea5caf1719936f9f96d32ee05fbd5bf4c55c1b41fdebef51d9fad450797a64f8bc73a37b47097a2ee341f
-  data.tar.gz: df6233a9715ce191085f38a4b21f158dc0fdc36efca5db1fd3eee9049925d5117101ed96717c93cfab1544d058ce99f2df284a9b37d903d62e387c958d944e08
+  metadata.gz: 2e8560d7338e1d891bf5dc2d0959d1a767b5fa1e73a89be5533f5b064dbc135187a755f0f736683945e2ea52fe89fece40bed2f24e5dd075cd10790634c4a7a8
+  data.tar.gz: 987d781688176b608e3f0d70f18e50936376096857176293f14b995d061982ec5c9bc1e64e75fdbca7e797d5a3069ffe6002658e5c623205b605d796430a770f

data/VERSION

@@ -1 +1 @@
-1.1.6.1
+1.1.7

data/lib/json/ld/api.rb

@@ -493,7 +493,7 @@ module JSON::LD
                 remote_document = RemoteDocument.new(parsed_url.to_s, response.body)
 
                 # If the input has been retrieved, the response has an HTTP Link Header [RFC5988] using the http://www.w3.org/ns/json-ld#context link relation and a content type of application/json or any media type with a +json suffix as defined in [RFC6839] except application/ld+json, update the active context using the Context Processing algorithm, passing the context referenced in the HTTP Link Header as local context. The HTTP Link Header is ignored for documents served as application/ld+json If multiple HTTP Link Headers using the http://www.w3.org/ns/json-ld#context link relation are found, the promise is rejected with a JsonLdError whose code is set to multiple context link headers and processing is terminated.
-                unless content_type.start_with?("application/ld+json")
+                unless content_type.to_s.start_with?("application/ld+json")
                   links = response["link"].to_s.
                     split(",").
                     map(&:strip).

data/lib/json/ld/context.rb

@@ -190,6 +190,14 @@ module JSON::LD
       yield(self) if block_given?
     end
 
+    ##
+    # Initial context, without mappings, vocab or default language
+    #
+    # @return [Boolean]
+    def empty?
+      @term_definitions.empty? && self.vocab.nil? && self.default_language.nil?
+    end
+
     # @param [String] value must be an absolute IRI
     def base=(value)
       if value
@@ -247,6 +255,8 @@ module JSON::LD
     # @see http://json-ld.org/spec/latest/json-ld-api/index.html#context-processing-algorithm
     def parse(local_context, remote_contexts = [])
       result = self.dup
+      result.provided_context = local_context if self.empty?
+
       local_context = [local_context] unless local_context.is_a?(Array)
 
       local_context.each do |context|
@@ -265,7 +275,7 @@ module JSON::LD
               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.provided_context = ctx["@context"]
+              result.provided_context = ctx["@context"] if [context] == local_context
               result
             rescue JSON::ParserError => e
               debug("parse") {"Failed to parse @context from remote document at #{context}: #{e.message}"}
@@ -283,9 +293,6 @@ module JSON::LD
 
             context_no_base = self.dup
             context_no_base.base = nil
-            unless @options[:processingMode] == "json-ld-1.0"
-              context_no_base.provided_context = context.to_s
-            end
             context_no_base.context_base = context.to_s
 
             begin
@@ -310,7 +317,7 @@ module JSON::LD
 
             # 3.2.6) Set context to the result of recursively calling this algorithm, passing context no base for active context, context for local context, and remote contexts.
             context = context_no_base.parse(context, remote_contexts.dup)
-            context.provided_context = context_no_base.provided_context
+            context.provided_context = result.provided_context
             context.base ||= result.base
             result = context
             debug("parse") {"=> provided_context: #{context.inspect}"}

data/spec/context_spec.rb

@@ -80,6 +80,20 @@ describe JSON::LD::Context do
           "avatar"   => "http://xmlns.com/foaf/0.1/avatar"
         }, @debug)
       end
+
+      context "remote with local mappings" do
+        let(:ctx) {["http://example.com/context", {"integer" => "xsd:integer"}]}
+        it "retrieves and parses a remote context document" do
+          expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context").and_yield(remote_doc)
+          ec = subject.parse(ctx)
+        end
+
+        it "does not use passed context as provided_context" do
+          expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context").and_yield(remote_doc)
+          ec = subject.parse(ctx)
+          expect(ec.provided_context).to produce(ctx, @debug)
+        end
+      end
     end
 
     context "Array" do
@@ -557,7 +571,7 @@ describe JSON::LD::Context do
       {
         "extra key" => {
           :input => {"foo" => {"@id" => "http://example.com/foo", "@baz" => "foobar"}},
-          :result => {"@context" => {"foo" => "http://example.com/foo"}}
+          :result => {"@context" => {"foo" => {"@id" => "http://example.com/foo", "@baz" => "foobar"}}}
         }
       }.each do |title, params|
         it title do

data/spec/suite_flatten_spec.rb

@@ -10,6 +10,7 @@ describe JSON::LD do
     describe m.name do
       m.entries.each do |t|
         specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
+          pending "context corner-case" if t.input_loc.end_with?('flatten-0044-in.jsonld')
           t.run self
         end
       end

data/spec/suite_helper.rb

@@ -64,6 +64,10 @@ module Fixtures
         end
 
         define_method("#{m}_loc".to_sym) {property(m) && "#{SUITE}tests/#{property(m)}"}
+
+        define_method("#{m}_json".to_sym) do
+          JSON.parse(self.send(m)) if property(m)
+        end
       end
 
       def testType
@@ -100,7 +104,7 @@ module Fixtures
             when "jld:ExpandTest"
               JSON::LD::API.expand(input_loc, options.merge(:debug => debug))
             when "jld:CompactTest"
-              JSON::LD::API.compact(input_loc, context_loc, options.merge(:debug => debug))
+              JSON::LD::API.compact(input_loc, context_json['@context'], options.merge(:debug => debug))
             when "jld:FlattenTest"
               JSON::LD::API.flatten(input_loc, context_loc, options.merge(:debug => debug))
             when "jld:FrameTest"
@@ -148,7 +152,7 @@ module Fixtures
                 when "jld:ExpandTest"
                   JSON::LD::API.expand(t.input_loc, options.merge(:debug => debug))
                 when "jld:CompactTest"
-                  JSON::LD::API.compact(t.input_loc, t.context_loc, options.merge(:debug => debug))
+                  JSON::LD::API.compact(t.input_loc, t.context_json['@context'], options.merge(:debug => debug))
                 when "jld:FlattenTest"
                   JSON::LD::API.flatten(t.input_loc, t.context_loc, options.merge(:debug => debug))
                 when "jld:FrameTest"
@@ -263,7 +267,7 @@ module Fixtures
 
                 remote_document = JSON::LD::API::RemoteDocument.new(parsed_url.to_s, response.body)
 
-                unless content_type.start_with?("application/ld+json")
+                unless content_type.to_s.start_with?("application/ld+json")
                   links = response["link"].to_s.
                     split(",").
                     map(&:strip).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.6.1
+  version: 1.1.7
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -30,20 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement