json-ld 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f16239f3f6fc54a6a0e1e6a68d097ba97bb268893f3160df3fe86b4ac6170e
-  data.tar.gz: f21243bfcf58a41dd1a091ac9a92664be80e4e8a813ed9630285f1f96ead4f4e
+  metadata.gz: 970e177e4a776881601b87546f04cfad8c616b533d322a985f6ce588c5572c19
+  data.tar.gz: 9d8388137478a542d0e42f143ed36d90efe27fa7ff649410af35d651fafce836
 SHA512:
-  metadata.gz: 9890153889067a1d87707aac9b52cc6b914dcf0372253d51ba3e496b97f87f5b0bfaa07091513c1f3e3e8b23852151f7b221ef21e5d83e94f59cff3079120fd9
-  data.tar.gz: 0e6240f1d3e02b145a7a786a14770c181700e777d99bf7af924d50af221074ccf2e0fb20659cfc5c061ef9c5550acb397c433b029f115f1eba89dd25aa60378e
+  metadata.gz: 70b363dafd7632225a082e0ea5113ceba39779e27593f25f18f78df62bed9a202b0f2a62627096186113888cbd5bf3583e4f33b85cf94d1bbf8ca10d1d02059f
+  data.tar.gz: c6186a16b4fac554ff6893926f23c729fb1194ab3423e801d9d40915c978330a39c251645bb8775e1d46a94add2cf9f905c579f47085d2d42aafb1cd04971a61

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/json/ld/compact.rb

@@ -4,6 +4,9 @@ module JSON::LD
   module Compact
     include Utils
 
+    # The following constant is used to reduce object allocations in #compact below
+    CONTAINER_MAPPING_LANGUAGE_INDEX_ID_TYPE = Set.new(%w(@language @index @id @type)).freeze
+
     ##
     # This algorithm compacts a JSON-LD document, such that the given context is applied. This must result in shortening any applicable IRIs to terms or compact IRIs, any applicable keywords to keyword aliases, and any applicable JSON-LD values expressed in expanded form to simple values such as strings or numbers.
     #
@@ -234,7 +237,7 @@ module JSON::LD
                 add_value(nest_result, item_active_property, compacted_item,
                   property_is_array: as_array)
               end
-            elsif !(container & %w(@language @index @id @type)).empty? && !container.include?('@graph')
+            elsif container.any? { |key| CONTAINER_MAPPING_LANGUAGE_INDEX_ID_TYPE.include?(key) } && !container.include?('@graph')
               map_object = nest_result[item_active_property] ||= {}
               c = container.first
               container_key = context.compact_iri(c, vocab: true, quiet: true)

data/lib/json/ld/context.rb

@@ -527,6 +527,11 @@ module JSON::LD
       self
     end
 
+    # The following constants are used to reduce object allocations in #create_term_definition below
+    ID_NULL_OBJECT = { '@id' => nil }.freeze
+    JSON_LD_10_EXPECTED_KEYS = Set.new(%w(@container @id @language @reverse @type)).freeze
+    JSON_LD_EXPECTED_KEYS = Set.new(%w(@container @context @id @language @nest @prefix @reverse @type)).freeze
+
     ##
     # Create Term Definition
     #
@@ -570,7 +575,7 @@ module JSON::LD
       value = {'@id' => value} if simple_term
 
       case value
-      when nil, {'@id' => nil}
+      when nil, ID_NULL_OBJECT
         # If value equals null or value is a JSON object containing the key-value pair (@id-null), then set the term definition in active context to null, set the value associated with defined's key term to true, and return.
         #log_debug("") {"=> nil"}
         term_definitions[term] = TermDefinition.new(term)
@@ -581,14 +586,16 @@ module JSON::LD
         definition = TermDefinition.new(term)
         definition.simple = simple_term
 
-        expected_keys = case processingMode
-        when "json-ld-1.0", nil then %w(@container @id @language @reverse @type)
-        else  %w(@container @context @id @language @nest @prefix @reverse @type)
-        end
+        if options[:validate]
+          expected_keys = case processingMode
+          when "json-ld-1.0", nil then JSON_LD_10_EXPECTED_KEYS
+          else JSON_LD_EXPECTED_KEYS
+          end
 
-        extra_keys = value.keys - expected_keys
-        if !extra_keys.empty? && @options[:validate]
-          raise JsonLdError::InvalidTermDefinition, "Term definition for #{term.inspect} has unexpected keys: #{extra_keys.join(', ')}"
+          if value.any? { |key, _| !expected_keys.include?(key) }
+            extra_keys = value.keys - expected_keys.to_a
+            raise JsonLdError::InvalidTermDefinition, "Term definition for #{term.inspect} has unexpected keys: #{extra_keys.join(', ')}"
+          end
         end
 
         if value.has_key?('@type')
@@ -650,7 +657,7 @@ module JSON::LD
 
           # If id ends with a gen-delim, it may be used as a prefix for simple terms
           definition.prefix = true if !term.include?(':') &&
-            definition.id.to_s.end_with?(*%w(: / ? # [ ] @)) &&
+            definition.id.to_s.end_with?(':', '/', '?', '#', '[', ']', '@') &&
             simple_term
         elsif term.include?(':')
           # If term is a compact IRI with a prefix that is a key in local context then a dependency has been found. Use this algorithm recursively passing active context, local context, the prefix as term, and defined.

data/lib/json/ld/expand.rb

@@ -347,7 +347,7 @@ module JSON::LD
         term_context = context.term_definitions[key].context if context.term_definitions[key]
         active_context = term_context ? context.parse(term_context) : context
         container = active_context.container(key)
-        expanded_value = if container == %w(@language) && value.is_a?(Hash)
+        expanded_value = if container.length == 1 && container.first == '@language' && value.is_a?(Hash)
           # Otherwise, if key's container mapping in active context is @language and value is a JSON object then value is expanded from a language map as follows:
           
           # Set multilingual array to an empty array.
@@ -370,7 +370,7 @@ module JSON::LD
           end
 
           ary
-        elsif !(CONTAINER_MAPPING_INDEX_ID_TYPE & container).empty? && value.is_a?(Hash)
+        elsif container.any? { |key| CONTAINER_MAPPING_INDEX_ID_TYPE.include?(key) } && value.is_a?(Hash)
           # Otherwise, if key's container mapping in active context contains @index, @id, @type and value is a JSON object then value is expanded from an index map as follows:
           
           # Set ary to an empty array.
@@ -426,14 +426,14 @@ module JSON::LD
         #log_debug {" => #{expanded_value.inspect}"}
 
         # If the container mapping associated to key in active context is @list and expanded value is not already a list object, convert expanded value to a list object by first setting it to an array containing only expanded value if it is not already an array, and then by setting it to a JSON object containing the key-value pair @list-expanded value.
-        if active_context.container(key) == %w(@list) && !list?(expanded_value)
+        if container.first == '@list' && container.length == 1 && !list?(expanded_value)
           #log_debug(" => ") { "convert #{expanded_value.inspect} to list"}
           expanded_value = {'@list' => as_array(expanded_value)}
         end
         #log_debug {" => #{expanded_value.inspect}"}
 
         # convert expanded value to @graph if container specifies it
-        if active_context.container(key) == %w(@graph)
+        if container.first == '@graph' && container.length == 1
           #log_debug(" => ") { "convert #{expanded_value.inspect} to list"}
           expanded_value = as_array(expanded_value).map do |v|
             graph?(v) ? v : {'@graph' => as_array(v)}
@@ -457,7 +457,14 @@ module JSON::LD
         else
           # Otherwise, if key is not a reverse property:
           # If result does not have an expanded property member, create one and initialize its value to an empty array.
-          (output_object[expanded_property] ||= []).concat([expanded_value].flatten)
+          (output_object[expanded_property] ||= []).tap do |memo|
+            # expanded_value is either Array[Hash] or Hash; in both case append to memo without flatten
+            if expanded_value.is_a?(Array)
+              memo.concat(expanded_value)
+            else # Hash
+              memo << expanded_value
+            end
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf