jmespath 1.5.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802d17af3f269cfbd38879ff753082257effba66f383f415667b1018d9d68c5c
-  data.tar.gz: 3b9ec8bf65b3dbcf00273667510385a406fa2c23cd64890557a76263944a8b0f
+  metadata.gz: 6dd359b84687e9959f5ceefc730e01783a02c3c3fd32419112c9cc68bac69fe8
+  data.tar.gz: 19078671387ef295d8d00dfdc6d04758be5d54974b0bf7adfad998af8c0427c1
 SHA512:
-  metadata.gz: c95fe346be9e1e36a67869cad050a03e74ae414ceedb09049210419a9d4c5455df38e49403bcedf1434b56e8b45d6142527bdb3d2af86919cc833da021251e16
-  data.tar.gz: 73e3c073ccf6b57c65c2246d12fd4a3c5d5f3beb603772966c4ec92371f9ed10f4e1a10b66a1619f50fdd78137a1a6b0998f65b4e7f966a928e5fc2a8d7393be
+  metadata.gz: 07234d57953b71829d79eeb7862ad7b55b06f96fb6c35ba7b0764ec1339c5b4c6b632b8d3d81ec4a193300e335e371772b54eb91c1092d46eb8ab374afd598b5
+  data.tar.gz: acc8a1daca807053070f8487a76703e45c67da851b3d32753294e67ad67dd7a930ef8f0596ff327c2779aea61b65c2f874ff5bcd4b34df79ba2366d7b6514f43

data/VERSION

@@ -1 +1 @@
-1.5.0
+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,13 +36,18 @@ 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)
           Util.as_json(left_value) == Util.as_json(right_value)
@@ -54,41 +62,25 @@ module JMESPath
 
       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,9 +36,17 @@ 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
@@ -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
@@ -41,9 +42,7 @@ 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
 
@@ -70,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
@@ -16,8 +17,6 @@ module JMESPath
               values.push(v)
             end
           end
-        else
-          nil
         end
       end