json-ld 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b6c40e1f1bff540f8c175e321087f60a7a6c04
-  data.tar.gz: eeba4194d6cb10caa31214444882c18e8688d44c
+  metadata.gz: cbadebe1b0aed85dc5f64bf4981c8d54cf9b2ccb
+  data.tar.gz: 316d476a0f0be056a49c571f22cff6dd13feb6dc
 SHA512:
-  metadata.gz: 972abe58a807190d6cb9228f80abec5198012c4c395973025b4ca50f5ea54142170999f7210769c621861e5136704dabc2f99932ab62dc9f7c9516b7ba931ae8
-  data.tar.gz: db37dac97ad2569415b35bff8e1967d0126621dd978cc183e0d80e3dc998e2c4592a1e4f94bd5ffe39f35cb207867db6fe986092fb416fc9cd9266a6c103ad74
+  metadata.gz: b3f8ca774aff5ad98f71269f76c4a4a2bc8c2700c739cba09167185b58ae2a5d57ebdbcf412917c0c453d799d5cd2fd0510e745e87044e0c506f0648034556dc
+  data.tar.gz: cc5c07b85f8c3f77f8e6f0d07cd0a4e6d5478da02a7e2cccf62ef31bf9e47f9ad0b0a484f7e216efebef100ce8e452aa79526155700d1f42d953ad98419edea7

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.1.6

data/lib/json/ld.rb

@@ -3,6 +3,7 @@
 $:.unshift(File.expand_path("../ld", __FILE__))
 require 'rdf' # @see http://rubygems.org/gems/rdf
 require 'multi_json'
+require 'set'
 
 module JSON
   ##
@@ -41,7 +42,7 @@ module JSON
       RDF.type.to_s => {"@type" => "@id"}
     }.freeze
 
-    KEYWORDS = %w(
+    KEYWORDS = Set.new(%w(
       @base
       @container
       @context
@@ -62,7 +63,7 @@ module JSON
       @value
       @version
       @vocab
-    ).freeze
+    )).freeze
 
     # Regexp matching an NCName.
     NC_REGEXP = Regexp.new(

data/lib/json/ld/api.rb

@@ -174,7 +174,7 @@ module JSON::LD
       end
 
       # If, after the algorithm outlined above is run, the resulting element is an JSON object with just a @graph property, element is set to the value of @graph's value.
-      result = result['@graph'] if result.is_a?(Hash) && result.keys == %w(@graph)
+      result = result['@graph'] if result.is_a?(Hash) && result.length == 1 && result.key?('@graph')
 
       # Finally, if element is a JSON object, it is wrapped into an array.
       result = [result].compact unless result.is_a?(Array)
@@ -277,7 +277,9 @@ module JSON::LD
         create_node_map(value, graph_maps)
 
         default_graph = graph_maps['@default']
-        graph_maps.keys.kw_sort.reject {|k| k == '@default'}.each do |graph_name|
+        graph_maps.keys.kw_sort.each do |graph_name|
+          next if graph_name == '@default'
+
           graph = graph_maps[graph_name]
           entry = default_graph[graph_name] ||= {'@id' => graph_name}
           nodes = entry['@graph'] ||= []

data/lib/json/ld/compact.rb

@@ -43,7 +43,7 @@ module JSON::LD
         # @null objects are used in framing
         return nil if element.has_key?('@null')
 
-        if element.keys.any? {|k| %w(@id @value).include?(k)}
+        if element.key?('@id') || element.key?('@value')
           result = context.compact_value(property, element, log_depth: @options[:log_depth])
           unless result.is_a?(Hash)
             #log_debug("") {"=> scalar result: #{result.inspect}"}
@@ -58,7 +58,7 @@ module JSON::LD
           expanded_value = element[expanded_property]
           #log_debug("") {"#{expanded_property}: #{expanded_value.inspect}"}
 
-          if %w(@id @type).include?(expanded_property)
+          if expanded_property == '@id' || expanded_property == '@type'
             compacted_value = [expanded_value].flatten.compact.map do |expanded_type|
               context.compact_iri(expanded_type, vocab: (expanded_property == '@type'), log_depth: @options[:log_depth])
             end
@@ -118,14 +118,14 @@ module JSON::LD
           end
 
           # Otherwise, if expanded property is @index, @value, or @language:
-          if %w(@index @value @language).include?(expanded_property)
+          if expanded_property == '@index' || expanded_property == '@value' || expanded_property == '@language'
             al = context.compact_iri(expanded_property, vocab: true, quiet: true)
             #log_debug(expanded_property) {"#{al} => #{expanded_value.inspect}"}
             result[al] = expanded_value
             next
           end
 
-          if expanded_value == []
+          if expanded_value.empty?
             item_active_property =
               context.compact_iri(expanded_property,
                                   value: expanded_value,
@@ -181,7 +181,7 @@ module JSON::LD
               end
             end
 
-            if %w(@language @index @id @type).include?(container)
+            if container == '@language' || container == '@index' || container == '@id' || container == '@type'
               map_object = nest_result[item_active_property] ||= {}
               compacted_item = case container
               when '@id'
@@ -218,7 +218,7 @@ module JSON::LD
         end
 
         # Re-order result keys
-        result.keys.kw_sort.inject({}) {|map, kk| map[kk] = result[kk]; map}
+        result.keys.kw_sort.each_with_object({}) {|kk, memo| memo[kk] = result[kk]}
       else
         # For other types, the compacted value is the element value
         #log_debug("compact") {element.class.to_s}

data/lib/json/ld/context.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 require 'json'
 require 'bigdecimal'
+require 'set'
 
 module JSON::LD
   class Context
@@ -112,7 +113,7 @@ module JSON::LD
       def container_mapping=(mapping)
         mapping = Array(mapping)
         if @as_set = mapping.include?('@set')
-          mapping -= %w(@set)
+          mapping.delete('@set')
         end
         @container_mapping = mapping.first
       end
@@ -554,7 +555,7 @@ module JSON::LD
       end
 
       # Since keywords cannot be overridden, term must not be a keyword. Otherwise, an invalid value has been detected, which is an error.
-      if KEYWORDS.include?(term) && !%w(@vocab @language @version).include?(term)
+      if KEYWORDS.include?(term) && (term != '@vocab' && term != '@language' && term != '@version')
         raise JsonLdError::KeywordRedefinition, "term must not be a keyword: #{term.inspect}" if
           @options[:validate]
       elsif !term_valid?(term) && @options[:validate]
@@ -606,7 +607,7 @@ module JSON::LD
           else
             :error
           end
-          unless %w(@id @vocab).include?(type) || type.is_a?(RDF::URI) && type.absolute?
+          unless (type == '@id' || type == '@vocab') || type.is_a?(RDF::URI) && type.absolute?
             raise JsonLdError::InvalidTypeMapping, "unknown mapping for '@type': #{type.inspect} on term #{term.inspect}"
           end
           #log_debug("") {"type_mapping: #{type.inspect}"}
@@ -615,7 +616,7 @@ module JSON::LD
 
         if value.has_key?('@reverse')
           raise JsonLdError::InvalidReverseProperty, "unexpected key in #{value.inspect} on term #{term.inspect}" if
-            value.keys.any? {|k| %w(@id @nest).include?(k)}
+            value.key?('@id') || value.key?('@nest')
           raise JsonLdError::InvalidIRIMapping, "expected value of @reverse to be a string: #{value['@reverse'].inspect} on term #{term.inspect}" unless
             value['@reverse'].is_a?(String)
 
@@ -633,7 +634,7 @@ module JSON::LD
             container = value['@container']
             raise JsonLdError::InvalidReverseProperty,
                   "unknown mapping for '@container' to #{container.inspect} on term #{term.inspect}" unless
-                   container.is_a?(String) && ['@set', '@index'].include?(container)
+                   container.is_a?(String) && (container == '@set' || container == '@index')
             definition.container_mapping = check_container(container, local_context, defined, term)
           end
           definition.reverse_property = true
@@ -654,7 +655,7 @@ module JSON::LD
               (simple_term || ((processingMode || 'json-ld-1.0') == 'json-ld-1.0'))
         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.
-          prefix, suffix = term.split(':')
+          prefix, suffix = term.split(':', 2)
           create_term_definition(local_context, prefix, defined) if local_context.has_key?(prefix)
 
           definition.id = if td = term_definitions[prefix]
@@ -791,7 +792,7 @@ module JSON::LD
         (statements[statement.subject] ||= []) << statement
 
         # Keep track of predicate ranges
-        if [RDF::RDFS.range, RDF::SCHEMA.rangeIncludes].include?(statement.predicate) 
+        if [RDF::RDFS.range, RDF::SCHEMA.rangeIncludes].include?(statement.predicate)
           (ranges[statement.subject] ||= []) << statement.object
         end
       end
@@ -799,7 +800,7 @@ module JSON::LD
       # Add term definitions for each class and property not in vocab, and
       # for those properties having an object range
       statements.each do |subject, values|
-        types = values.select {|v| v.predicate == RDF.type}.map(&:object)
+        types = values.each_with_object([]) { |v, memo| memo << v.object if v.predicate == RDF.type }
         is_property = types.any? {|t| t.to_s.include?("Property")}
         
         term = subject.to_s.split(/[\/\#]/).last
@@ -886,7 +887,7 @@ module JSON::LD
     # @param [Term, #to_s] term in unexpanded form
     # @return [Boolean]
     def as_array?(term)
-      return true if %w(@graph @list).include?(term)
+      return true if term == '@graph' || term == '@list'
       term = find_definition(term)
       term && (term.as_set || term.container_mapping == '@list')
     end
@@ -979,12 +980,14 @@ module JSON::LD
     #   IRI or String, if it's a keyword
     # @raise [JSON::LD::JsonLdError::InvalidIRIMapping] if the value cannot be expanded
     # @see http://json-ld.org/spec/latest/json-ld-api/#iri-expansion
-    def expand_iri(value, documentRelative: false, vocab: false, local_context: nil, defined: {}, quiet: false, **options)
+    def expand_iri(value, documentRelative: false, vocab: false, local_context: nil, defined: nil, quiet: false, **options)
       return value unless value.is_a?(String)
 
       return value if KEYWORDS.include?(value)
       #log_debug("expand_iri") {"value: #{value.inspect}"} unless quiet
 
+      defined = defined || {} # if we initialized in the keyword arg we would allocate {} at each invokation, even in the 2 (common) early returns above.
+
       # If local context is not null, it contains a key that equals value, and the value associated with the key that equals value in defined is not true, then invoke the Create Term Definition subalgorithm, passing active context, local context, value as term, and defined. This will ensure that a term definition is created for value in active context during Context Processing.
       if local_context && local_context.has_key?(value) && !defined[value]
         create_term_definition(local_context, value, defined)
@@ -1003,7 +1006,7 @@ module JSON::LD
 
         # If prefix is underscore (_) or suffix begins with double-forward-slash (//), return value as it is already an absolute IRI or a blank node identifier.
         return RDF::Node.new(namer.get_sym(suffix)) if prefix == '_'
-        return RDF::URI(value) if suffix[0,2] == '//'
+        return RDF::URI(value) if suffix.start_with?('//')
 
         # If local context is not null, it contains a key that equals prefix, and the value associated with the key that equals prefix in defined is not true, invoke the Create Term Definition algorithm, passing active context, local context, prefix as term, and defined. This will ensure that a term definition is created for prefix in active context during Context Processing.
         if local_context && local_context.has_key?(prefix) && !defined[prefix]
@@ -1138,7 +1141,7 @@ module JSON::LD
         tl_value ||= '@null'
         preferred_values = []
         preferred_values << '@reverse' if tl_value == '@reverse'
-        if %w(@id @reverse).include?(tl_value) && value.is_a?(Hash) && value.has_key?('@id')
+        if (tl_value == '@id' || tl_value == '@reverse') && value.is_a?(Hash) && value.has_key?('@id')
           t_iri = compact_iri(value['@id'], vocab: true, document_relative: true)
           if (r_td = term_definitions[t_iri]) && r_td.id == value['@id']
             preferred_values.concat(%w(@vocab @id @none))
@@ -1204,6 +1207,8 @@ module JSON::LD
       end
     end
 
+    RDF_LITERAL_NATIVE_TYPES = Set.new([RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.double]).freeze
+
     ##
     # If active property has a type mapping in the active context set to @id or @vocab, a JSON object with a single member @id whose value is the result of using the IRI Expansion algorithm on value is returned.
     #
@@ -1246,7 +1251,7 @@ module JSON::LD
       when RDF::Literal
         #log_debug("Literal") {"datatype: #{value.datatype.inspect}"}
         res = {}
-        if useNativeTypes && [RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.double].include?(value.datatype)
+        if useNativeTypes && RDF_LITERAL_NATIVE_TYPES.include?(value.datatype)
           res['@value'] = value.object
           res['@type'] = uri(coerce(property)) if coerce(property)
         else
@@ -1297,7 +1302,7 @@ module JSON::LD
     def compact_value(property, value, options = {})
       #log_debug("compact_value") {"property: #{property.inspect}, value: #{value.inspect}"}
 
-      num_members = value.keys.length
+      num_members = value.length
 
       num_members -= 1 if index?(value) && container(property) == '@index'
       if num_members > 2
@@ -1407,7 +1412,7 @@ module JSON::LD
     def coerce(property)
       # Map property, if it's not an RDF::Value
       # @type is always is an IRI
-      return '@id' if [RDF.type, '@type'].include?(property)
+      return '@id' if property == RDF.type || property == '@type'
       term_definitions[property] && term_definitions[property].type_mapping
     end
 
@@ -1573,9 +1578,10 @@ module JSON::LD
     #
     # @return [Array<RDF::URI>]
     def mappings
-      term_definitions.inject({}) do |memo, (t,td)|
-        memo[t] = td ? td.id : nil
-        memo
+      {}.tap do |memo|
+        term_definitions.each_pair do |t,td|
+          memo[t] = td ? td.id : nil
+        end
       end
     end
 
@@ -1595,9 +1601,10 @@ module JSON::LD
     # @return [Array<String>]
     # @deprecated
     def languages
-      term_definitions.inject({}) do |memo, (t,td)|
-        memo[t] = td.language_mapping
-        memo
+      {}.tap do |memo|
+        term_definitions.each_pair do |t,td|
+          memo[t] = td.language_mapping
+        end
       end
     end
 
@@ -1610,7 +1617,7 @@ module JSON::LD
       end
 
       val = Array(container)
-      val -= %w(@set) if has_set = val.include?('@set')
+      val.delete('@set') if has_set = val.include?('@set')
 
       raise JsonLdError::InvalidContainerMapping,
         "'@container' has more than one value other than @set" if val.length > 1

data/lib/json/ld/expand.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+require 'set'
+
 module JSON::LD
   ##
   # Expand module, used as part of API
@@ -22,7 +24,7 @@ module JSON::LD
       when Array
         # If element is an array,
         is_list = context.container(active_property) == '@list'
-        value = input.map do |v|
+        value = input.each_with_object([]) do |v, memo|
           # Initialize expanded item to the result of using this algorithm recursively, passing active context, active property, and item as element.
           v = expand(v, active_property, context, ordered: ordered)
 
@@ -30,8 +32,8 @@ module JSON::LD
           raise JsonLdError::ListOfLists,
                 "A list may not contain another list" if
                 is_list && (v.is_a?(Array) || list?(v))
-          v
-        end.flatten.compact
+          memo << v unless v.nil?
+        end
 
         value
       when Hash
@@ -42,13 +44,11 @@ module JSON::LD
         end
 
         output_object = {}
-        keys = ordered ? input.keys.kw_sort : input.keys
 
         # See if keys mapping to @type have terms with a local context
-        input.keys.select do |key|
-          context.expand_iri(key, vocab: true) == '@type'
-        end.each do |key|
-          Array(input[key]).each do |term|
+        input.each_pair do |key, val|
+          next unless context.expand_iri(key, vocab: true) == '@type'
+          Array(val).each do |term|
             term_context = context.term_definitions[term].context if context.term_definitions[term]
             context = term_context ? context.parse(term_context) : context
           end
@@ -62,19 +62,20 @@ module JSON::LD
         # If result contains the key @value:
         if value?(output_object)
           unless (output_object.keys - %w(@value @language @type @index)).empty? &&
-                 (output_object.keys & %w(@language @type)).length < 2
+                 !(output_object.key?('@language') && output_object.key?('@type'))
             # The result must not contain any keys other than @value, @language, @type, and @index. It must not contain both the @language key and the @type key. Otherwise, an invalid value object error has been detected and processing is aborted.
             raise JsonLdError::InvalidValueObject,
             "value object has unknown keys: #{output_object.inspect}"
           end
 
-          output_object.delete('@language') if Array(output_object['@language']).join('').to_s.empty?
-          output_object.delete('@type') if Array(output_object['@type']).join('').to_s.empty?
+          output_object.delete('@language') if output_object.key?('@language') && Array(output_object['@language']).empty?
+          output_object.delete('@type') if output_object.key?('@type') && Array(output_object['@type']).empty?
 
           # If the value of result's @value key is null, then set result to null.
-          return nil if Array(output_object['@value']).empty?
+          ary = Array(output_object['@value'])
+          return nil if ary.empty?
 
-          if !Array(output_object['@value']).all? {|v| v.is_a?(String) || v.is_a?(Hash) && v.empty?} && output_object.has_key?('@language')
+          if !ary.all? {|v| v.is_a?(String) || v.is_a?(Hash) && v.empty?} && output_object.has_key?('@language')
             # Otherwise, if the value of result's @value member is not a string and result contains the key @language, an invalid language-tagged value error has been detected (only strings can be language-tagged) and processing is aborted.
             raise JsonLdError::InvalidLanguageTaggedValue,
                   "when @language is used, @value must be a string: #{output_object.inspect}"
@@ -88,7 +89,7 @@ module JSON::LD
         elsif !output_object.fetch('@type', []).is_a?(Array)
           # Otherwise, if result contains the key @type and its associated value is not an array, set it to an array containing only the associated value.
           output_object['@type'] = [output_object['@type']]
-        elsif output_object.keys.any? {|k| %w(@set @list).include?(k)}
+        elsif output_object.key?('@set') || output_object.key?('@list')
           # Otherwise, if result contains the key @set or @list:
           # The result must contain at most one other key and that key must be @index. Otherwise, an invalid set or list object error has been detected and processing is aborted.
           raise JsonLdError::InvalidSetOrListObject,
@@ -96,15 +97,15 @@ module JSON::LD
                 (output_object.keys - %w(@set @list @index)).empty?
 
           # If result contains the key @set, then set result to the key's associated value.
-          return output_object['@set'] if output_object.keys.include?('@set')
+          return output_object['@set'] if output_object.key?('@set')
         end
 
         # If result contains only the key @language, set result to null.
-        return nil if output_object.keys == %w(@language)
+        return nil if output_object.length == 1 && output_object.key?('@language')
 
         # If active property is null or @graph, drop free-floating values as follows:
         if (active_property || '@graph') == '@graph' &&
-          (output_object.keys.any? {|k| %w(@value @list).include?(k)} ||
+          (output_object.key?('@value') || output_object.key?('@list') ||
            (output_object.keys - %w(@id)).empty? && !framing)
           #log_debug(" =>") { "empty top-level: " + output_object.inspect}
           return nil
@@ -112,7 +113,7 @@ module JSON::LD
 
         # Re-order result keys if ordering
         if ordered
-          output_object.keys.kw_sort.inject({}) {|map, kk| map[kk] = output_object[kk]; map}
+          output_object.keys.kw_sort.each_with_object({}) {|kk, memo| memo[kk] = output_object[kk]}
         else
           output_object
         end
@@ -127,6 +128,8 @@ module JSON::LD
     end
 
   private
+    CONTAINER_MAPPING_INDEX_ID_TYPE = Set.new(%w(@index @id @type)).freeze
+
     # Expand each key and value of element adding them to result
     def expand_object(input, active_property, context, output_object, ordered: false)
       framing = @options[:processingMode].include?("expand-frame")
@@ -304,7 +307,7 @@ module JSON::LD
             end
 
             # If expanded value contains members other than @reverse:
-            unless value.keys.reject {|k| k == '@reverse'}.empty?
+            if !value.key?('@reverse') || value.length > 1
               # If result does not have an @reverse member, create one and set its value to an empty JSON object.
               reverse_map = output_object['@reverse'] ||= {}
               value.each do |property, items|
@@ -368,7 +371,7 @@ module JSON::LD
           end
 
           ary
-        elsif %w(@index @id @type).include?(container) && value.is_a?(Hash)
+        elsif CONTAINER_MAPPING_INDEX_ID_TYPE.include?(container) && value.is_a?(Hash)
           # Otherwise, if key's container mapping in active context is @index, @id, @type, an IRI or Blank Node and value is a JSON object then value is expanded from an index map as follows:
           
           # Set ary to an empty array.

data/lib/json/ld/extensions.rb

@@ -17,13 +17,14 @@ class Array
   # @yieldreturn [Integer]
   # @return [Array]
   KW_ORDER = %w(@base @id @value @type @language @vocab @container @graph @list @set @index).freeze
+  KW_ORDER_CACHE = KW_ORDER.each_with_object({}) do |kw, memo|
+    memo[kw] = "@#{KW_ORDER.index(kw)}"
+  end.freeze
 
   # Order, considering keywords to come before other strings
   def kw_sort
     self.sort do |a, b|
-      a = "@#{KW_ORDER.index(a)}" if KW_ORDER.include?(a)
-      b = "@#{KW_ORDER.index(b)}" if KW_ORDER.include?(b)
-      a <=> b
+      KW_ORDER_CACHE.fetch(a, a) <=> KW_ORDER_CACHE.fetch(b, b)
     end
   end
 

data/lib/json/ld/format.rb

@@ -19,7 +19,7 @@ module JSON::LD
   #     RDF::Format.file_extensions    #=> {:jsonld => [JSON::LD::Format] }
   #
   # @see http://www.w3.org/TR/json-ld/
-  # @see http://json-ld.org/test-suite/
+  # @see https://json-ld.org/test-suite/
   class Format < RDF::Format
     content_type     'application/ld+json',
                      extension: :jsonld,
@@ -53,6 +53,7 @@ module JSON::LD
           description: "Expand JSON-LD or parsed RDF",
           parse: false,
           help: "expand [--context <context-file>] files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
@@ -80,11 +81,13 @@ module JSON::LD
                 end
               end
             end
-          end
+          end,
+          option_use: {context: :removed}
         },
         compact: {
           description: "Compact JSON-LD or parsed RDF",
           parse: false,
+          filter: {output_format: :jsonld},  # Only shows output format set
           help: "compact --context <context-file> files ...",
           lambda: ->(files, options) do
             raise ArgumentError, "Compacting requires a context" unless options[:context]
@@ -115,12 +118,22 @@ module JSON::LD
                 end
               end
             end
-          end
+          end,
+          options: [
+            RDF::CLI::Option.new(
+              symbol: :context,
+              datatype: RDF::URI,
+              control: :url2,
+              use: :required,
+              on: ["--context CONTEXT"],
+              description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
+          ]
         },
         flatten: {
           description: "Flatten JSON-LD or parsed RDF",
           parse: false,
           help: "flatten [--context <context-file>] files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
@@ -155,6 +168,7 @@ module JSON::LD
           description: "Frame JSON-LD or parsed RDF",
           parse: false,
           help: "frame --frame <frame-file>  files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             raise ArgumentError, "Framing requires a frame" unless options[:frame]
             out = options[:output] || $stdout
@@ -184,7 +198,17 @@ module JSON::LD
                 end
               end
             end
-          end
+          end,
+          option_use: {context: :removed},
+          options: [
+            RDF::CLI::Option.new(
+              symbol: :frame,
+              datatype: RDF::URI,
+              control: :url2,
+              use: :required,
+              on: ["--frame FRAME"],
+              description: "Frame to use when serializing.") {|arg| RDF::URI(arg)}
+          ]
         },
       }
     end

data/lib/json/ld/frame.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+require 'set'
+
 module JSON::LD
   module Frame
     include Utils
@@ -96,7 +98,7 @@ module JSON::LD
             recurse, subframe = (state[:graph] != '@merged'), {}
           else
             subframe = frame['@graph'].first
-            recurse = !%w(@merged @default).include?(id)
+            recurse = !(id == '@merged' || id == '@default')
             subframe = {} unless subframe.is_a?(Hash)
           end
 
@@ -152,7 +154,9 @@ module JSON::LD
         end
 
         # handle defaults in order
-        frame.keys.kw_sort.reject {|p| p.start_with?('@')}.each do |prop|
+        frame.keys.kw_sort.each do |prop|
+          next if prop.start_with?('@')
+
           # if omit default is off, then include default values for properties that appear in the next frame but are not in the matching subject
           n = frame[prop].first || {}
           omit_default_on = get_frame_flag(n, options, :omitDefault)
@@ -187,21 +191,26 @@ module JSON::LD
     ##
     # Recursively find and count blankNode identifiers.
     # @return [Hash{String => Integer}]
-    def count_blank_node_identifiers(input, results = {})
+    def count_blank_node_identifiers(input)
+      {}.tap do |results|
+        count_blank_node_identifiers_internal(input, results)
+      end
+    end
+
+    def count_blank_node_identifiers_internal(input, results)
       case input
-      when Array
-        input.map {|o| count_blank_node_identifiers(o, results)}
-      when Hash
-        input.each do |k, v|
-          count_blank_node_identifiers(v, results)
-        end
-      when String
-        if input.start_with?('_:')
-          results[input] ||= 0
-          results[input] += 1
-        end
+        when Array
+          input.each {|o| count_blank_node_identifiers_internal(o, results)}
+        when Hash
+          input.each do |k, v|
+            count_blank_node_identifiers_internal(v, results)
+          end
+        when String
+          if input.start_with?('_:')
+            results[input] ||= 0
+            results[input] += 1
+          end
       end
-      results
     end
 
     ##
@@ -260,13 +269,14 @@ module JSON::LD
     #
     # @return all of the matched subjects.
     def filter_subjects(state, subjects, frame, flags)
-      subjects.inject({}) do |memo, id|
+      subjects.each_with_object({}) do |id, memo|
         subject = state[:graphMap][state[:graph]][id]
         memo[id] = subject if filter_subject(subject, frame, state, flags)
-        memo
       end
     end
 
+    EXCLUDED_FRAMING_KEYWORDS = Set.new(%w(@default @embed @explicit @omitDefault @requireAll)).freeze
+
     ##
     # Returns true if the given node matches the given frame.
     #
@@ -320,7 +330,7 @@ module JSON::LD
             validate_frame(v)
             has_default = v.has_key?('@default')
             # Exclude framing keywords
-            v = v.dup.delete_if {|kk,vv| %w(@default @embed @explicit @omitDefault @requireAll).include?(kk)}
+            v = v.reject {|kk,vv| EXCLUDED_FRAMING_KEYWORDS.include?(kk)}
           end
 
 
@@ -490,7 +500,11 @@ module JSON::LD
     # @param [Hash] flags the current framing flags.
     # @return [Array<Hash>] the implicit frame.
     def create_implicit_frame(flags)
-      flags.keys.inject({}) {|memo, key| memo["@#{key}"] = [flags[key]]; memo}
+      {}.tap do |memo|
+        flags.each_pair do |key, val|
+          memo["@#{key}"] = [val]
+        end
+      end
     end
 
   private
@@ -512,8 +526,8 @@ module JSON::LD
       v2, t2, l2 = Array(pattern['@value']), Array(pattern['@type']), Array(pattern['@language'])
       return true if (v2 + t2 + l2).empty?
       return false unless v2.include?(v1) || v2 == [{}]
-      return false unless t2.include?(t1) || t1 && t2 == [{}] || t1.nil? && (t2 || []) == []
-      return false unless l2.include?(l1) || l1 && l2 == [{}] || l1.nil? && (l2 || []) == []
+      return false unless t2.include?(t1) || t1 && t2 == [{}] || t1.nil? && (t2 || []).empty?
+      return false unless l2.include?(l1) || l1 && l2 == [{}] || l1.nil? && (l2 || []).empty?
       true
     end
   end

data/lib/json/ld/reader.rb

@@ -15,10 +15,17 @@ module JSON::LD
     def self.options
       super + [
         RDF::CLI::Option.new(
-          symbol: :compactArrays,
-          datatype: TrueClass,
-          on: ["--compact-arrays"],
-          description: "Replaces arrays with just one element with that element during compaction.") {true},
+          symbol: :expandContext,
+          control: :url2,
+          datatype: RDF::URI,
+          on: ["--expand-context CONTEXT"],
+          description: "Context to use when expanding.") {|arg| RDF::URI(arg)},
+        RDF::CLI::Option.new(
+          symbol: :processing_mode,
+          datatype: %w(json-ld-1.0 json-ld-1.1),
+          control: :radio,
+          on: ["--processingMode MODE", %w(json-ld-1.0 json-ld-1.1)],
+          description: "Set Processing Mode (json-ld-1.0 or json-ld-1.1)"),
       ]
     end
 

data/lib/json/ld/resource.rb

@@ -88,7 +88,7 @@ module JSON::LD
         node_definition
       end
       @id = @attributes['@id']
-      @anon = @id.nil? || @id.to_s[0,2] == '_:'
+      @anon = @id.nil? || @id.to_s.start_with?('_:')
     end
 
     ##
@@ -110,19 +110,19 @@ module JSON::LD
     # @return [Hash] deresolved attribute hash
     def deresolve
       node_definition = if resolved?
-        deresolved = attributes.keys.inject({}) do |memo, prop|
-          value = attributes[prop]
-          memo[prop] = case value
-          when Resource
-            {'id' => value.id}
-          when Array
-            value.map do |v|
-              v.is_a?(Resource) ? {'id' => v.id} : v
+        deresolved = [].tap do |memo|
+          attributes.each_pair do |prop, value|
+            memo[prop] = case value
+            when Resource
+              {'id' => value.id}
+            when Array
+              value.map do |v|
+                v.is_a?(Resource) ? {'id' => v.id} : v
+              end
+            else
+              value
             end
-          else
-            value
           end
-          memo
         end
         deresolved
       else
@@ -188,7 +188,7 @@ module JSON::LD
 
       #$logger.debug "resolve(0): #{attributes.inspect}"
       @attributes.each do |k, v|
-        next if %w(id type).include?(k)
+        next if k == 'id' || k == 'type'
         @attributes[k] = update_obj(@attributes[k], reference_map)
       end
       #$logger.debug "resolve(1): #{attributes.inspect}"

data/lib/json/ld/utils.rb

@@ -20,7 +20,7 @@ module JSON::LD
     # @param [Object] value
     # @return [Boolean]
     def node_reference?(value)
-      value.is_a?(Hash) && value.keys == %w(@id)
+      value.is_a?(Hash) && value.length == 1 && value.key?('@id')
     end
 
     ##
@@ -40,9 +40,9 @@ module JSON::LD
     def blank_node?(value)
       case value
       when nil    then true
-      when String then value[0,2] == '_:'
+      when String then value.start_with?('_:')
       else
-        (node?(value) || node_reference?(value)) && value.fetch('@id', '_:')[0,2] == '_:'
+        (node?(value) || node_reference?(value)) && value.fetch('@id', '_:').start_with?('_:')
       end
     end
 
@@ -80,7 +80,7 @@ module JSON::LD
     # @return [RDF::Resource]
     def as_resource(id, base = nil)
       @nodes ||= {} # Re-use BNodes
-      if id[0,2] == '_:'
+      if id.start_with?('_:')
         (@nodes[id] ||= RDF::Node.new(namer.get_sym(id)))
       elsif base
         base.join(id)

data/lib/json/ld/writer.rb

@@ -75,31 +75,37 @@ module JSON::LD
         RDF::CLI::Option.new(
           symbol: :compactArrays,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--compact-arrays"],
           description: "Replaces arrays with just one element with that element during compaction.") {true},
         RDF::CLI::Option.new(
           symbol: :compactToRelative,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--compact-to-relative"],
           description: "Creates document relative IRIs when compacting, if `true`, otherwise leaves expanded. Default is `true` use --no-compact-to-relative to disable.") {true},
         RDF::CLI::Option.new(
           symbol: :context,
           datatype: RDF::URI,
+          control: :url2,
           on: ["--context CONTEXT"],
-          description: "Context to use when serializing. Constructed context for native serialization.") {|arg| RDF::URI(arg)},
+          description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
         RDF::CLI::Option.new(
-          symbol: :frame,
-          datatype: RDF::URI,
-          on: ["--frame FRAME"],
-          description: "Frame to use when serializing.") {|arg| RDF::URI(arg)},
+          symbol: :processing_mode,
+          datatype: %w(json-ld-1.0 json-ld-1.1),
+          control: :radio,
+          on: ["--processingMode MODE", %w(json-ld-1.0 json-ld-1.1)],
+          description: "Set Processing Mode (json-ld-1.0 or json-ld-1.1)"),
         RDF::CLI::Option.new(
           symbol: :stream,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--stream"],
           description: "Do not attempt to optimize graph presentation, suitable for streaming large graphs.") {true},
         RDF::CLI::Option.new(
           symbol: :useRdfType,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--use-rdf-type"],
           description: "Treat `rdf:type` like a normal property instead of using `@type`.") {true},
       ]

data/spec/format_spec.rb

@@ -67,7 +67,7 @@ describe JSON::LD::Format do
     end
   end
 
-  describe ".cli_commands", skip: ("TextMate OptionParser issues" if ENV['TM_SELECTED_FILE']) do
+  describe ".cli_commands" do
     require 'rdf/cli'
     let(:ttl) {File.expand_path("../test-files/test-1-rdf.ttl", __FILE__)}
     let(:json) {File.expand_path("../test-files/test-1-input.json", __FILE__)}
@@ -75,37 +75,37 @@ describe JSON::LD::Format do
 
     describe "#expand" do
       it "expands RDF" do
-        expect {RDF::CLI.exec(["expand", ttl], format: :ttl)}.to write.to(:output)
+        expect {RDF::CLI.exec(["expand", ttl], format: :ttl, output_format: :jsonld)}.to write.to(:output)
       end
       it "expands JSON" do
-        expect {RDF::CLI.exec(["expand", json], format: :jsonld, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["expand", json], format: :jsonld, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
     describe "#compact" do
       it "compacts RDF" do
-        expect {RDF::CLI.exec(["compact", ttl], context: context, format: :ttl, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["compact", ttl], context: context, format: :ttl, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
       it "compacts JSON" do
-        expect {RDF::CLI.exec(["compact", json], context: context, format: :jsonld, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["compact", json], context: context, format: :jsonld, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
     describe "#flatten" do
       it "flattens RDF" do
-        expect {RDF::CLI.exec(["flatten", ttl], context: context, format: :ttl, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["flatten", ttl], context: context, format: :ttl, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
       it "flattens JSON" do
-        expect {RDF::CLI.exec(["flatten", json], context: context, format: :jsonld, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["flatten", json], context: context, format: :jsonld, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
     describe "#frame" do
       it "frames RDF" do
-        expect {RDF::CLI.exec(["frame", ttl], frame: context, format: :ttl)}.to write.to(:output)
+        expect {RDF::CLI.exec(["frame", ttl], frame: context, format: :ttl, output_format: :jsonld)}.to write.to(:output)
       end
       it "frames JSON" do
-        expect {RDF::CLI.exec(["frame", json], frame: context, format: :jsonld, validate: false)}.to write.to(:output)
+        expect {RDF::CLI.exec(["frame", json], frame: context, format: :jsonld, output_format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
   end

data/spec/spec_helper.rb

@@ -14,10 +14,10 @@ require 'rdf/spec/matchers'
 require 'yaml'
 begin
   require 'simplecov'
-  require 'coveralls'
+  require 'coveralls' unless ENV['NOCOVERALLS']
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
+    (Coveralls::SimpleCov::Formatter unless ENV['NOCOVERALLS'])
   ])
   SimpleCov.start do
     add_filter "/spec/"

data/spec/suite_helper.rb

@@ -5,7 +5,7 @@ require 'support/extensions'
 # For now, override RDF::Utils::File.open_file to look for the file locally before attempting to retrieve it
 module RDF::Util
   module File
-    REMOTE_PATH = "http://json-ld.org/test-suite/"
+    REMOTE_PATH = "https://json-ld.org/test-suite/"
     LOCAL_PATH = ::File.expand_path("../json-ld.org/test-suite", __FILE__) + '/'
 
     class << self
@@ -69,7 +69,7 @@ end
 
 module Fixtures
   module SuiteTest
-    SUITE = RDF::URI("http://json-ld.org/test-suite/")
+    SUITE = RDF::URI("https://json-ld.org/test-suite/")
 
     class Manifest < JSON::LD::Resource
       def self.open(file)
@@ -108,7 +108,7 @@ module Fixtures
       def options
         @options ||= begin
           opts = {documentLoader: Fixtures::SuiteTest.method(:documentLoader)}
-          {'specVersion' => "1.1"}.merge(property('option') || {}).each do |k, v|
+          {'specVersion' => "json-ld-1.1"}.merge(property('option') || {}).each do |k, v|
             opts[k.to_sym] = v
           end
           opts
@@ -162,7 +162,7 @@ module Fixtures
         end
         options = {validate: true}.merge(options)
 
-        unless options[:specVersion] == "1.1"
+        unless options[:specVersion] == "json-ld-1.1"
           skip "not a 1.1 test" 
           return
         end
@@ -287,7 +287,7 @@ module Fixtures
       end
     end
 
-    REMOTE_PATH = "http://json-ld.org/test-suite/"
+    REMOTE_PATH = "https://json-ld.org/test-suite/"
     LOCAL_PATH = ::File.expand_path("../json-ld.org/test-suite", __FILE__) + '/'
     ##
     # Document loader to use for tests having `useDocumentLoader` option

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: json-ld
+rubyforge_project: 
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4