json-ld 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e46360376bb00811dd36960ac15dae42a9d35ed
-  data.tar.gz: db5cf509c8b10b010bb62a05713037eeafe1122c
+  metadata.gz: 5154c2b04be740ac97d8e01a44384578ed8aa872
+  data.tar.gz: d027b37fc1dbecf4bed0f14340c87147fb27640b
 SHA512:
-  metadata.gz: a89eec30bedcf9e199f4bcb8aab8e9af134ab9f7fbfd1d97227c27553d356df057ed6fa9727a93d95aec7e5f85309c7db65a69aa8453f48b38c85e5544ee625c
-  data.tar.gz: f0f408d42463f63f89f9aec2fb10370d2fbddfb4a7a221f825e12b953b076a31aa44d84e627cd4e337e60e4a313cddd4a35df57e87506e5fe0a53b55b22bd2cd
+  metadata.gz: 0205eee6e03bf7c1eae78d27b18288d07462447b468e5d95b74283d4532bf1b21a4494bc0be27f2e1c2f164cdd466b5eca944a61dd03cc8fd24f9100556ca757
+  data.tar.gz: 7e3c65b3576b716c65e00a79d4fa399e05cea9d01d9494283c2d61d2df04eef2caf21e8c8c5094f3f1879adf68fa29a7f6005269b40c442dceaaddac41ad5663

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/json/ld/api.rb

@@ -87,7 +87,7 @@ module JSON::LD
     # @yieldparam [API]
     # @raise [JsonLdError]
     def initialize(input, context, options = {}, &block)
-      @options = {compactArrays: true, rename_bnodes: true}.merge(options)
+      @options = {compactArrays: true, rename_bnodes: true}.merge!(options)
       @options[:validate] = true if @options[:processingMode] == "json-ld-1.0"
       @options[:documentLoader] ||= self.class.method(:documentLoader)
       @namer = options[:unique_bnodes] ? BlankNodeUniqer.new : (@options[:rename_bnodes] ? BlankNodeNamer.new("b") : BlankNodeMapper.new)
@@ -98,7 +98,7 @@ module JSON::LD
       @value = case input
       when Array, Hash then input.dup
       when IO, StringIO
-        @options = {base: input.base_uri}.merge(@options) if input.respond_to?(:base_uri)
+        @options = {base: input.base_uri}.merge!(@options) if input.respond_to?(:base_uri)
 
         # if input impelements #links, attempt to get a contextUrl from that link
         content_type = input.respond_to?(:content_type) ? input.content_type : "application/json"
@@ -113,7 +113,7 @@ module JSON::LD
       when String
         remote_doc = @options[:documentLoader].call(input, @options)
 
-        @options = {base: remote_doc.documentUrl}.merge(@options)
+        @options = {base: remote_doc.documentUrl}.merge!(@options)
         context_ref = remote_doc.contextUrl
 
         case remote_doc.document
@@ -322,7 +322,7 @@ module JSON::LD
         requireAll:     true,
         omitDefault:    false,
         documentLoader: method(:documentLoader)
-      }.merge(options)
+      }.merge!(options)
 
       framing_state = {
         graphs:       {'@default' => {}, '@merged' => {}},
@@ -471,7 +471,7 @@ module JSON::LD
     # @return [Object, Hash]
     #   If a block is given, the result of evaluating the block is returned, otherwise, the expanded JSON-LD document
     def self.fromRdf(input, options = {}, &block)
-      options = {useNativeTypes: false}.merge(options)
+      options = {useNativeTypes: false}.merge!(options)
       result = nil
 
       API.new(nil, nil, options) do |api|

data/lib/json/ld/compact.rb

@@ -46,7 +46,7 @@ module JSON::LD
         inside_reverse = property == '@reverse'
         result = {}
 
-        element.keys.each do |expanded_property|
+        element.each_key do |expanded_property|
           expanded_value = element[expanded_property]
           debug("") {"#{expanded_property}: #{expanded_value.inspect}"}
 

data/lib/json/ld/context.rb

@@ -337,7 +337,7 @@ module JSON::LD
             defined = {}
           # For each key-value pair in context invoke the Create Term Definition subalgorithm, passing result for active context, context for local context, key, and defined
             depth do
-              context.keys.each do |key|
+              context.each_key do |key|
                 result.create_term_definition(context, key, defined)
               end
             end
@@ -990,7 +990,7 @@ module JSON::LD
     # @raise [RDF::ReaderError] if the iri cannot be expanded
     # @see http://json-ld.org/spec/latest/json-ld-api/#value-expansion
     def expand_value(property, value, options = {})
-      options = {useNativeTypes: false}.merge(options)
+      options = {useNativeTypes: false}.merge!(options)
       depth(options) do
         debug("expand_value") {"property: #{property.inspect}, value: #{value.inspect}"}
 

data/lib/json/ld/expand.rb

@@ -15,7 +15,7 @@ module JSON::LD
     #   Ensure output objects have keys ordered properly
     # @return [Array, Hash]
     def expand(input, active_property, context, options = {})
-      options = {ordered: true}.merge(options)
+      options = {ordered: true}.merge!(options)
       debug("expand") {"input: #{input.inspect}, active_property: #{active_property.inspect}, context: #{context.inspect}"}
       result = case input
       when Array

data/lib/json/ld/resource.rb

@@ -174,7 +174,7 @@ module JSON::LD
               stub: true
               )
           else
-            obj.keys.each do |k|
+            obj.each_key do |k|
               obj[k] = update_obj(obj[k], reference_map)
             end
             obj

data/lib/json/ld/utils.rb

@@ -9,7 +9,7 @@ module JSON::LD
     # @return [Boolean]
     def node?(value)
       value.is_a?(Hash) &&
-        (value.keys & %w(@value @list @set)).empty? &&
+        !(value.has_key?('@value') || value.has_key?('@list') || value.has_key?('@set')) &&
         (value.length > 1 || !value.has_key?('@id'))
     end
 
@@ -118,7 +118,7 @@ module JSON::LD
     #   true to allow duplicates, false not to (uses
     #     a simple shallow comparison of subject ID or value).
     def add_value(subject, property, value, options = {})
-      options = {property_is_array: false, allow_duplicate: true}.merge(options)
+      options = {property_is_array: false, allow_duplicate: true}.merge!(options)
 
       if value.is_a?(Array)
         subject[property] = [] if value.empty? && options[:property_is_array]
@@ -211,14 +211,13 @@ module JSON::LD
     # Add debug event to debug array, if specified
     #
     #   param [String] message
-    #   yieldreturn [String] appended to message, to allow for lazy-evaulation of message
+    #   yieldreturn [String] appended to message, to allow for lazy-evaluation of message
     def debug(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
       return unless ::JSON::LD.debug? || @options[:debug]
-      depth = options[:depth] || @depth || 0
+      depth = @depth || 0
       list = args
       list << yield if block_given?
-      message = " " * depth * 2 + (list.empty? ? "" : list.join(": "))
+      message = " " * depth * 2 + list.join(": ")
       case @options[:debug]
       when Array
         @options[:debug] << message
@@ -308,4 +307,4 @@ module JSON::LD
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json-ld
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.