jmespath 1.4.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2d08f64e74ad4927d6323f98b91486ad7d8f79c
-  data.tar.gz: ce7796a88dab9241efacdeac1a3b36c9083ff6ca
+SHA256:
+  metadata.gz: 6dd359b84687e9959f5ceefc730e01783a02c3c3fd32419112c9cc68bac69fe8
+  data.tar.gz: 19078671387ef295d8d00dfdc6d04758be5d54974b0bf7adfad998af8c0427c1
 SHA512:
-  metadata.gz: ca3d9a98c00cedf8b5bafdc70d3cdb8b2ee754ef85dfa270807650fa9517d50db68e513d3713d431ac8ac1b9bdb9757ca76b2758bc8ddfde1add3eedb08973e4
-  data.tar.gz: 7c09a5ee313e2f7feba1334c240fdc2a820eb9127d5e2db3392ac1dad3b29b2b8b4c55aee4f6c4309417d857df84f8854201a79ba5fe405d724f91a44db331d3
+  metadata.gz: 07234d57953b71829d79eeb7862ad7b55b06f96fb6c35ba7b0764ec1339c5b4c6b632b8d3d81ec4a193300e335e371772b54eb91c1092d46eb8ab374afd598b5
+  data.tar.gz: acc8a1daca807053070f8487a76703e45c67da851b3d32753294e67ad67dd7a930ef8f0596ff327c2779aea61b65c2f874ff5bcd4b34df79ba2366d7b6514f43

data/VERSION

@@ -0,0 +1 @@
+1.6.2

data/bin/jmespath.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'jmespath'
+require 'json'
+
+expression = ARGV[0]
+json = JSON.parse(STDIN.read)
+
+$stdout.puts(JSON.dump(JMESPath.search(expression, json)))

data/lib/jmespath/caching_parser.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 require 'thread'
 
 module JMESPath
   class CachingParser
-
     def initialize(options = {})
       @parser = options[:parser] || Parser.new(options)
       @mutex = Mutex.new
@@ -25,6 +25,5 @@ module JMESPath
         @cache[expression] = @parser.parse(expression)
       end
     end
-
   end
 end

data/lib/jmespath/errors.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module JMESPath
   module Errors
-
     class Error < StandardError; end
 
     class RuntimeError < Error; end
@@ -14,6 +15,5 @@ module JMESPath
     class InvalidArityError < Error; end
 
     class UnknownFunctionError < Error; end
-
   end
 end

data/lib/jmespath/lexer.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 require 'json'
 require 'set'
 
 module JMESPath
   # @api private
   class Lexer
-
     T_DOT = :dot
     T_STAR = :star
     T_COMMA = :comma
@@ -134,14 +134,14 @@ module JMESPath
       'w'  => STATE_IDENTIFIER,
       'x'  => STATE_IDENTIFIER,
       'y'  => STATE_IDENTIFIER,
-      'z'  => STATE_IDENTIFIER,
-    }
+      'z'  => STATE_IDENTIFIER
+    }.freeze
 
     VALID_IDENTIFIERS = Set.new(%w(
-      A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-      a b c d e f g h i j k l m n o p q r s t u v w x y z
-      _ 0 1 2 3 4 5 6 7 8 9
-    ))
+                                  A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+                                  a b c d e f g h i j k l m n o p q r s t u v w x y z
+                                  _ 0 1 2 3 4 5 6 7 8 9
+                                ))
 
     NUMBERS = Set.new(%w(0 1 2 3 4 5 6 7 8 9))
 
@@ -155,13 +155,12 @@ module JMESPath
       '(' => T_LPAREN,
       ')' => T_RPAREN,
       '{' => T_LBRACE,
-      '}' => T_RBRACE,
-    }
+      '}' => T_RBRACE
+    }.freeze
 
     # @param [String<JMESPath>] expression
     # @return [Array<Hash>]
     def tokenize(expression)
-
       tokens = []
       chars = CharacterStream.new(expression.chars.to_a)
 
@@ -253,7 +252,7 @@ module JMESPath
           tokens << match_or(chars, '&', '&', T_AND, T_EXPREF)
         when STATE_NOT
           # consume not equals
-          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_NOT);
+          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_NOT)
         else
           # either '<' or '>'
           # consume less than and greater than
@@ -298,12 +297,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,27 +316,25 @@ 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')
-      rescue JSON::ParserError
-        true
-      end
+      JSON.parse('false')
+    rescue JSON::ParserError
+      true
     end
 
     if requires_wrapping?
       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 +346,13 @@ 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 = begin
+                            JSON.parse(token.value)
+                          rescue
+                            JSON.parse(sprintf('"%s"', token.value.lstrip))
+                          end
           end
         rescue JSON::ParserError
           token.type = T_UNKNOWN
@@ -361,7 +362,6 @@ module JMESPath
     end
 
     class CharacterStream
-
       def initialize(chars)
         @chars = chars
         @position = 0
@@ -376,10 +376,7 @@ module JMESPath
         @chars[@position]
       end
 
-      def position
-        @position
-      end
-
+      attr_reader :position
     end
   end
 end

data/lib/jmespath/nodes/and.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 module JMESPath
   module Nodes
     class And < Node
-
       def initialize(left, right)
         @left = left
         @right = right
@@ -19,7 +19,6 @@ module JMESPath
       def optimize
         self.class.new(@left.optimize, @right.optimize)
       end
-
     end
   end
 end

data/lib/jmespath/nodes/comparator.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
     class Comparator < Node
+      COMPARABLE_TYPES = [Numeric, String].freeze
+
       attr_reader :left, :right
 
       def initialize(left, right)
@@ -33,62 +36,51 @@ module JMESPath
 
       private
 
-      def check(left_value, right_value)
+      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)
-            left_value > right_value
-          else
-            nil
-          end
+          left_value > right_value if comparable?(left_value, right_value)
         end
       end
 
       class Gte < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
-            left_value >= right_value
-          else
-            nil
-          end
+          left_value >= right_value if comparable?(left_value, right_value)
         end
       end
 
       class Lt < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
-            left_value < right_value
-          else
-            nil
-          end
+          left_value < right_value if comparable?(left_value, right_value)
         end
       end
 
       class Lte < Comparator
         def check(left_value, right_value)
-          if left_value.is_a?(Numeric) && right_value.is_a?(Numeric)
-            left_value <= right_value
-          else
-            nil
-          end
+          left_value <= right_value if comparable?(left_value, right_value)
         end
       end
     end

data/lib/jmespath/nodes/condition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -27,6 +28,7 @@ module JMESPath
 
     class ComparatorCondition < Node
       COMPARATOR_TO_CONDITION = {}
+      COMPARABLE_TYPES = [Numeric, String].freeze
 
       def initialize(left, right, child)
         @left = left
@@ -34,16 +36,24 @@ module JMESPath
         @child = child
       end
 
-      def visit(value)
+      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 +72,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 +80,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 +99,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 +109,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 +119,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 +129,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 +139,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/current.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes

data/lib/jmespath/nodes/expression.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -8,7 +9,7 @@ module JMESPath
         @expression = expression
       end
 
-      def visit(value)
+      def visit(_value)
         self
       end
 
@@ -22,4 +23,3 @@ module JMESPath
     end
   end
 end
-

data/lib/jmespath/nodes/field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -8,9 +9,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?
@@ -40,17 +42,16 @@ module JMESPath
       def initialize(keys)
         @keys = keys
         @key_syms = keys.each_with_object({}) do |k, syms|
-          if k.respond_to?(:to_sym)
-            syms[k] = k.to_sym
-          end
+          syms[k] = k.to_sym if k.respond_to?(:to_sym)
         end
       end
 
       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?
@@ -68,10 +69,7 @@ module JMESPath
 
       private
 
-      def keys
-        @keys
-      end
-
+      attr_reader :keys
     end
   end
 end

data/lib/jmespath/nodes/flatten.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -8,16 +9,14 @@ 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
           end
-        else
-          nil
         end
       end