jmespath 1.4.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2d08f64e74ad4927d6323f98b91486ad7d8f79c
-  data.tar.gz: ce7796a88dab9241efacdeac1a3b36c9083ff6ca
+SHA256:
+  metadata.gz: e9276a9f614d19179d10e5e166950070fdbce091b7154ea2c15e700ca155ab4e
+  data.tar.gz: e3a122d91c10056382b50876583f550be0bf07a015c68ffaaff8cb2c3e4fcacf
 SHA512:
-  metadata.gz: ca3d9a98c00cedf8b5bafdc70d3cdb8b2ee754ef85dfa270807650fa9517d50db68e513d3713d431ac8ac1b9bdb9757ca76b2758bc8ddfde1add3eedb08973e4
-  data.tar.gz: 7c09a5ee313e2f7feba1334c240fdc2a820eb9127d5e2db3392ac1dad3b29b2b8b4c55aee4f6c4309417d857df84f8854201a79ba5fe405d724f91a44db331d3
+  metadata.gz: 46128b4ab5e58de1f2cdcb80a2b2e8e69690cce7455da154da4b4c18406e80a83de24c07339eca4cddef142afea29b74f131b48fe7292ce36131b8e2cd1cb80c
+  data.tar.gz: 0f44933d7fc3736bf71273736089b7c6787ce4127f96742b263822a7eb7123e9326f7a9512b408d9128bdd0fb6dcf8839ddceaf773c75f031c1c65436929ee42

data/VERSION

@@ -0,0 +1 @@
+1.6.1

data/lib/jmespath/lexer.rb

@@ -298,12 +298,12 @@ module JMESPath
     # Certain versions of Ruby and of the pure_json gem not support loading
     # scalar JSON values, such a numbers, booleans, strings, etc. These
     # simple values must be first wrapped inside a JSON object before calling
-    # `JSON.load`.
+    # `JSON.parse`.
     #
     #    # works in most JSON versions, raises in some versions
-    #    JSON.load("true")
-    #    JSON.load("123")
-    #    JSON.load("\"abc\"")
+    #    JSON.parse("true")
+    #    JSON.parse("123")
+    #    JSON.parse("\"abc\"")
     #
     # This is an known issue for:
     #
@@ -317,12 +317,12 @@ module JMESPath
     # causes issues in environments that cannot compile the gem. We previously
     # had a direct dependency on `json_pure`, but this broke with the v2 update.
     #
-    # This method allows us to detect how the `JSON.load` behaves so we know
+    # This method allows us to detect how the `JSON.parse` behaves so we know
     # if we have to wrap scalar JSON values to parse them or not.
     # @api private
     def self.requires_wrapping?
       begin
-        JSON.load('false')
+        JSON.parse('false')
       rescue JSON::ParserError
         true
       end
@@ -332,12 +332,12 @@ module JMESPath
       def parse_json(token, quoted = false)
         begin
           if quoted
-            token.value = JSON.load("{\"value\":#{token.value}}")['value']
+            token.value = JSON.parse("{\"value\":#{token.value}}")['value']
           else
             begin
-              token.value = JSON.load("{\"value\":#{token.value}}")['value']
+              token.value = JSON.parse("{\"value\":#{token.value}}")['value']
             rescue
-              token.value = JSON.load(sprintf('{"value":"%s"}', token.value.lstrip))['value']
+              token.value = JSON.parse(sprintf('{"value":"%s"}', token.value.lstrip))['value']
             end
           end
         rescue JSON::ParserError
@@ -349,9 +349,9 @@ module JMESPath
       def parse_json(token, quoted = false)
         begin
           if quoted
-            token.value = JSON.load(token.value)
+            token.value = JSON.parse(token.value)
           else
-            token.value = JSON.load(token.value) rescue JSON.load(sprintf('"%s"', token.value.lstrip))
+            token.value = JSON.parse(token.value) rescue JSON.parse(sprintf('"%s"', token.value.lstrip))
           end
         rescue JSON::ParserError
           token.type = T_UNKNOWN

data/lib/jmespath/nodes/comparator.rb

@@ -2,6 +2,8 @@ module JMESPath
   # @api private
   module Nodes
     class Comparator < Node
+      COMPARABLE_TYPES = [Numeric, String].freeze
+
       attr_reader :left, :right
 
       def initialize(left, right)
@@ -36,25 +38,31 @@ module JMESPath
       def check(left_value, right_value)
         nil
       end
+
+      def comparable?(left_value, right_value)
+        COMPARABLE_TYPES.any? do |type|
+          left_value.is_a?(type) && right_value.is_a?(type)
+        end
+      end
     end
 
     module Comparators
 
       class Eq < Comparator
         def check(left_value, right_value)
-          left_value == right_value
+          Util.as_json(left_value) == Util.as_json(right_value)
         end
       end
 
       class Neq < Comparator
         def check(left_value, right_value)
-          left_value != right_value
+          Util.as_json(left_value) != Util.as_json(right_value)
         end
       end
 
       class Gt < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
+          if comparable?(left_value, right_value)
             left_value > right_value
           else
             nil
@@ -64,7 +72,7 @@ module JMESPath
 
       class Gte < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
+          if comparable?(left_value, right_value)
             left_value >= right_value
           else
             nil
@@ -74,7 +82,7 @@ module JMESPath
 
       class Lt < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
+          if comparable?(left_value, right_value)
             left_value < right_value
           else
             nil
@@ -84,7 +92,7 @@ module JMESPath
 
       class Lte < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
+          if comparable?(left_value, right_value)
             left_value <= right_value
           else
             nil

data/lib/jmespath/nodes/condition.rb

@@ -27,6 +27,7 @@ module JMESPath
 
     class ComparatorCondition < Node
       COMPARATOR_TO_CONDITION = {}
+      COMPARABLE_TYPES = [Integer, String].freeze
 
       def initialize(left, right, child)
         @left = left
@@ -37,13 +38,21 @@ module JMESPath
       def visit(value)
         nil
       end
+
+      private
+
+      def comparable?(left_value, right_value)
+        COMPARABLE_TYPES.any? do |type|
+          left_value.is_a?(type) && right_value.is_a?(type)
+        end
+      end
     end
 
     class EqCondition < ComparatorCondition
       COMPARATOR_TO_CONDITION[Comparators::Eq] = self
 
       def visit(value)
-        @left.visit(value) == @right.visit(value) ? @child.visit(value) : nil
+        Util.as_json(@left.visit(value)) == Util.as_json(@right.visit(value)) ? @child.visit(value) : nil
       end
 
       def optimize
@@ -62,7 +71,7 @@ module JMESPath
       end
 
       def visit(value)
-        @left.visit(value) == @right ? @child.visit(value) : nil
+        Util.as_json(@left.visit(value)) == @right ? @child.visit(value) : nil
       end
     end
 
@@ -70,7 +79,7 @@ module JMESPath
       COMPARATOR_TO_CONDITION[Comparators::Neq] = self
 
       def visit(value)
-        @left.visit(value) != @right.visit(value) ? @child.visit(value) : nil
+        Util.as_json(@left.visit(value)) != Util.as_json(@right.visit(value)) ? @child.visit(value) : nil
       end
 
       def optimize
@@ -89,7 +98,7 @@ module JMESPath
       end
 
       def visit(value)
-        @left.visit(value) != @right ? @child.visit(value) : nil
+        Util.as_json(@left.visit(value)) != @right ? @child.visit(value) : nil
       end
     end
 
@@ -99,7 +108,7 @@ module JMESPath
       def visit(value)
         left_value = @left.visit(value)
         right_value = @right.visit(value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value > right_value ? @child.visit(value) : nil
+        comparable?(left_value, right_value) && left_value > right_value ? @child.visit(value) : nil
       end
     end
 
@@ -109,7 +118,7 @@ module JMESPath
       def visit(value)
         left_value = @left.visit(value)
         right_value = @right.visit(value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value >= right_value ? @child.visit(value) : nil
+        comparable?(left_value, right_value) && left_value >= right_value ? @child.visit(value) : nil
       end
     end
 
@@ -119,7 +128,7 @@ module JMESPath
       def visit(value)
         left_value = @left.visit(value)
         right_value = @right.visit(value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value < right_value ? @child.visit(value) : nil
+        comparable?(left_value, right_value) && left_value < right_value ? @child.visit(value) : nil
       end
     end
 
@@ -129,7 +138,7 @@ module JMESPath
       def visit(value)
         left_value = @left.visit(value)
         right_value = @right.visit(value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value <= right_value ? @child.visit(value) : nil
+        comparable?(left_value, right_value) && left_value <= right_value ? @child.visit(value) : nil
       end
     end
   end

data/lib/jmespath/nodes/field.rb

@@ -8,9 +8,10 @@ module JMESPath
       end
 
       def visit(value)
-        if value.is_a?(Array) && @key.is_a?(Integer)
-          value[@key]
-        elsif value.is_a?(Hash)
+        if value.respond_to?(:to_ary) && @key.is_a?(Integer)
+          value.to_ary[@key]
+        elsif value.respond_to?(:to_hash)
+          value = value.to_hash
           if !(v = value[@key]).nil?
             v
           elsif @key_sym && !(v = value[@key_sym]).nil?
@@ -48,9 +49,10 @@ module JMESPath
 
       def visit(obj)
         @keys.reduce(obj) do |value, key|
-          if value.is_a?(Array) && key.is_a?(Integer)
-            value[key]
-          elsif value.is_a?(Hash)
+          if value.respond_to?(:to_ary) && key.is_a?(Integer)
+            value.to_ary[key]
+          elsif value.respond_to?(:to_hash)
+            value = value.to_hash
             if !(v = value[key]).nil?
               v
             elsif (sym = @key_syms[key]) && !(v = value[sym]).nil?

data/lib/jmespath/nodes/flatten.rb

@@ -8,10 +8,10 @@ module JMESPath
 
       def visit(value)
         value = @child.visit(value)
-        if Array === value
-          value.each_with_object([]) do |v, values|
-            if Array === v
-              values.concat(v)
+        if value.respond_to?(:to_ary)
+          value.to_ary.each_with_object([]) do |v, values|
+            if v.respond_to?(:to_ary)
+              values.concat(v.to_ary)
             else
               values.push(v)
             end

data/lib/jmespath/nodes/function.rb

@@ -50,14 +50,20 @@ module JMESPath
 
     module TypeChecker
       def get_type(value)
-        case value
-        when String then STRING_TYPE
-        when true, false then BOOLEAN_TYPE
-        when nil then NULL_TYPE
-        when Numeric then NUMBER_TYPE
-        when Hash, Struct then OBJECT_TYPE
-        when Array then ARRAY_TYPE
-        when Expression then EXPRESSION_TYPE
+        if value.respond_to?(:to_str)
+          STRING_TYPE
+        elsif value == true || value == false
+          BOOLEAN_TYPE
+        elsif value == nil
+          NULL_TYPE
+        elsif value.is_a?(Numeric)
+          NUMBER_TYPE
+        elsif value.respond_to?(:to_hash) || value.is_a?(Struct)
+          OBJECT_TYPE
+        elsif value.respond_to?(:to_ary)
+          ARRAY_TYPE
+        elsif value.is_a?(Expression)
+          EXPRESSION_TYPE
         end
       end
 
@@ -106,7 +112,8 @@ module JMESPath
         else
           return maybe_raise Errors::InvalidArityError, "function avg() expects one argument"
         end
-        if Array === values
+        if values.respond_to?(:to_ary)
+          values = values.to_ary
           return nil if values.empty?
           values.inject(0) do |total,n|
             if Numeric === n
@@ -144,9 +151,11 @@ module JMESPath
       def call(args)
         if args.count == 2
           haystack = args[0]
-          needle = args[1]
-          if String === haystack || Array === haystack
-            haystack.include?(needle)
+          needle = Util.as_json(args[1])
+          if haystack.respond_to?(:to_str)
+            haystack.to_str.include?(needle)
+          elsif haystack.respond_to?(:to_ary)
+            haystack.to_ary.any? { |e| Util.as_json(e) == needle }
           else
             return maybe_raise Errors::InvalidTypeError, "contains expects 2nd arg to be a list"
           end
@@ -182,9 +191,14 @@ module JMESPath
         else
           return maybe_raise Errors::InvalidArityError, "function length() expects one argument"
         end
-        case value
-        when Hash, Array, String then value.size
-        else return maybe_raise Errors::InvalidTypeError, "function length() expects string, array or object"
+        if value.respond_to?(:to_hash)
+          value.to_hash.size
+        elsif value.respond_to?(:to_ary)
+          value.to_ary.size
+        elsif value.respond_to?(:to_str)
+          value.to_str.size
+        else
+          return maybe_raise Errors::InvalidTypeError, "function length() expects string, array or object"
         end
       end
     end
@@ -202,8 +216,8 @@ module JMESPath
         else
           return maybe_raise Errors::InvalidTypeError, "function map() expects the first argument to be an expression"
         end
-        if Array === args[1]
-          list = args[1]
+        if args[1].respond_to?(:to_ary)
+          list = args[1].to_ary
         else
           return maybe_raise Errors::InvalidTypeError, "function map() expects the second argument to be an list"
         end
@@ -223,7 +237,8 @@ module JMESPath
         else
           return maybe_raise Errors::InvalidArityError, "function max() expects one argument"
         end
-        if Array === values
+        if values.respond_to?(:to_ary)
+          values = values.to_ary
           return nil if values.empty?
           first = values.first
           first_type = get_type(first)
@@ -258,7 +273,8 @@ module JMESPath
         else
           return maybe_raise Errors::InvalidArityError, "function min() expects one argument"
         end
-        if Array === values
+        if values.respond_to?(:to_ary)
+          values = values.to_ary
           return nil if values.empty?
           first = values.first
           first_type = get_type(first)
@@ -302,12 +318,10 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          if hash_like?(value)
-            case value
-            when Hash then value.keys.map(&:to_s)
-            when Struct then value.members.map(&:to_s)
-            else raise NotImplementedError
-            end
+          if value.respond_to?(:to_hash)
+            value.to_hash.keys.map(&:to_s)
+          elsif value.is_a?(Struct)
+            value.members.map(&:to_s)
           else
             return maybe_raise Errors::InvalidTypeError, "function keys() expects a hash"
           end
@@ -323,10 +337,12 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          if hash_like?(value)
+          if value.respond_to?(:to_hash)
+            value.to_hash.values
+          elsif value.is_a?(Struct)
             value.values
-          elsif Array === value
-            value
+          elsif value.respond_to?(:to_ary)
+            value.to_ary
           else
             return maybe_raise Errors::InvalidTypeError, "function values() expects an array or a hash"
           end
@@ -343,10 +359,10 @@ module JMESPath
         if args.count == 2
           glue = args[0]
           values = args[1]
-          if !(String === glue)
+          if !glue.respond_to?(:to_str)
             return maybe_raise Errors::InvalidTypeError, "function join() expects the first argument to be a string"
-          elsif Array === values && values.all? { |v| String === v }
-            values.join(glue)
+          elsif values.respond_to?(:to_ary) && values.to_ary.all? { |v| v.respond_to?(:to_str) }
+            values.to_ary.join(glue)
           else
             return maybe_raise Errors::InvalidTypeError, "function join() expects values to be an array of strings"
           end
@@ -362,7 +378,7 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          String === value ? value : value.to_json
+          value.respond_to?(:to_str) ? value.to_str : value.to_json
         else
           return maybe_raise Errors::InvalidArityError, "function to_string() expects one argument"
         end
@@ -390,8 +406,8 @@ module JMESPath
       FUNCTIONS['sum'] = self
 
       def call(args)
-        if args.count == 1 && Array === args.first
-          args.first.inject(0) do |sum,n|
+        if args.count == 1 && args.first.respond_to?(:to_ary)
+          args.first.to_ary.inject(0) do |sum,n|
             if Numeric === n
               sum + n
             else
@@ -424,7 +440,8 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          if Array === value
+          if value.respond_to?(:to_ary)
+            value = value.to_ary
             # every element in the list must be of the same type
             array_type = get_type(value[0])
             if array_type == STRING_TYPE || array_type == NUMBER_TYPE || value.size == 0
@@ -459,7 +476,7 @@ module JMESPath
       def call(args)
         if args.count == 2
           if get_type(args[0]) == ARRAY_TYPE && get_type(args[1]) == EXPRESSION_TYPE
-            values = args[0]
+            values = args[0].to_ary
             expression = args[1]
             array_type = get_type(expression.eval(values[0]))
             if array_type == STRING_TYPE || array_type == NUMBER_TYPE || values.size == 0
@@ -495,6 +512,7 @@ module JMESPath
           values = args[0]
           expression = args[1]
           if get_type(values) == ARRAY_TYPE && get_type(expression) == EXPRESSION_TYPE
+            values = values.to_ary
             type = get_type(expression.eval(values.first))
             if type != NUMBER_TYPE && type != STRING_TYPE
               msg = "function #{mode}() expects values to be strings or numbers"
@@ -616,8 +634,10 @@ module JMESPath
           return maybe_raise Errors::InvalidArityError, msg
         end
         value = args.first
-        if Array === value || String === value
-          value.reverse
+        if value.respond_to?(:to_ary)
+          value.to_ary.reverse
+        elsif value.respond_to?(:to_str)
+          value.to_str.reverse
         else
           msg = "function reverse() expects an array or string"
           return maybe_raise Errors::InvalidTypeError, msg
@@ -630,7 +650,7 @@ module JMESPath
 
       def call(args)
         value = args.first
-        Array === value ? value : [value]
+        value.respond_to?(:to_ary) ? value.to_ary : [value]
       end
     end
   end

data/lib/jmespath/nodes/projection.rb

@@ -45,8 +45,8 @@ module JMESPath
 
     class ArrayProjection < Projection
       def extract_targets(target)
-        if Array === target
-          target
+        if target.respond_to?(:to_ary)
+          target.to_ary
         else
           nil
         end
@@ -63,7 +63,9 @@ module JMESPath
 
     class ObjectProjection < Projection
       def extract_targets(target)
-        if hash_like?(target)
+        if target.respond_to?(:to_hash)
+          target.to_hash.values
+        elsif target.is_a?(Struct)
           target.values
         else
           nil

data/lib/jmespath/nodes/slice.rb

@@ -10,7 +10,7 @@ module JMESPath
       end
 
       def visit(value)
-        if String === value || Array === value
+        if (value = value.respond_to?(:to_str) ? value.to_str : value.respond_to?(:to_ary) ? value.to_ary : nil)
           start, stop, step = adjust_slice(value.size, @start, @stop, @step)
           result = []
           if step > 0
@@ -26,7 +26,7 @@ module JMESPath
               i += step
             end
           end
-          String === value ? result.join : result
+          value.respond_to?(:to_str) ? result.join : result
         else
           nil
         end
@@ -80,7 +80,7 @@ module JMESPath
       end
 
       def visit(value)
-        if String === value || Array === value
+        if (value = value.respond_to?(:to_str) ? value.to_str : value.respond_to?(:to_ary) ? value.to_ary : nil)
           value[@start, @stop - @start]
         else
           nil

data/lib/jmespath/nodes.rb

@@ -5,10 +5,6 @@ module JMESPath
       def visit(value)
       end
 
-      def hash_like?(value)
-        Hash === value || Struct === value
-      end
-
       def optimize
         self
       end

data/lib/jmespath/util.rb

@@ -9,10 +9,26 @@ module JMESPath
       #
       def falsey?(value)
         !value ||
-        (value.respond_to?(:empty?) && value.empty?) ||
+        (value.respond_to?(:to_ary) && value.to_ary.empty?) ||
+        (value.respond_to?(:to_hash) && value.to_hash.empty?) ||
+        (value.respond_to?(:to_str) && value.to_str.empty?) ||
         (value.respond_to?(:entries) && !value.entries.any?)
         # final case necessary to support Enumerable and Struct
       end
+
+      def as_json(value)
+        if value.respond_to?(:to_ary)
+          value.to_ary.map { |e| as_json(e) }
+        elsif value.respond_to?(:to_hash)
+          hash = {}
+          value.to_hash.each_pair { |k, v| hash[k] = as_json(v) }
+          hash
+        elsif value.respond_to?(:to_str)
+          value.to_str
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/jmespath/version.rb

@@ -1,3 +1,3 @@
 module JMESPath
-  VERSION = '1.4.0'
+  VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).strip
 end

data/lib/jmespath.rb

@@ -26,7 +26,7 @@ module JMESPath
       data = case data
         when Hash, Struct then data # check for most common case first
         when Pathname then load_json(data)
-        when IO, StringIO then JSON.load(data.read)
+        when IO, StringIO then JSON.parse(data.read)
         else data
         end
       Runtime.new(runtime_options).search(expression, data)
@@ -34,7 +34,7 @@ module JMESPath
 
     # @api private
     def load_json(path)
-      JSON.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
+      JSON.parse(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Trevor Rowe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies: []
 description: Implements JMESPath for Ruby
 email: trevorrowe@gmail.com
@@ -17,6 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- VERSION
 - lib/jmespath.rb
 - lib/jmespath/caching_parser.rb
 - lib/jmespath/errors.rb
@@ -50,7 +51,7 @@ homepage: http://github.com/trevorrowe/jmespath.rb
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: JMESPath - Ruby Edition
 test_files: []