jmespath 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802d17af3f269cfbd38879ff753082257effba66f383f415667b1018d9d68c5c
-  data.tar.gz: 3b9ec8bf65b3dbcf00273667510385a406fa2c23cd64890557a76263944a8b0f
+  metadata.gz: '09a128a1330ef64e0a59ae48084fa404aa705184bdf2cf2a74d477dda596aa25'
+  data.tar.gz: 50ecb149f81b2a468a24de16ce5b91b0ec5300e1d1b3a16022138b0fb4a50374
 SHA512:
-  metadata.gz: c95fe346be9e1e36a67869cad050a03e74ae414ceedb09049210419a9d4c5455df38e49403bcedf1434b56e8b45d6142527bdb3d2af86919cc833da021251e16
-  data.tar.gz: 73e3c073ccf6b57c65c2246d12fd4a3c5d5f3beb603772966c4ec92371f9ed10f4e1a10b66a1619f50fdd78137a1a6b0998f65b4e7f966a928e5fc2a8d7393be
+  metadata.gz: a66052e2a8b1cb4d9bbbb5b8e7e40b5f6cf8df91cf260e27d7ed4d32e129003c4a20bd92cd39afa168d4959400b450bb36876f6e23c4b0a440cb8e8a99d9e0d6
+  data.tar.gz: 25fc0eec3d98c4722e1792771cab62b59b5ebe1e740c6556e5d76ad23d6f248b636816eaa2c3613e523b15e5cd95917e8dad1627dfcb3abd61c4e25b716b068e

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

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,6 +38,12 @@ 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
@@ -54,7 +62,7 @@ module JMESPath
 
       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,6 +38,14 @@ 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
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Trevor Rowe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Implements JMESPath for Ruby
 email: trevorrowe@gmail.com
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: JMESPath - Ruby Edition