jmespath 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d10b91c9178c774ea0fe4040a63a86a52ce278c9
-  data.tar.gz: 642fe0e4e75e96b007bf9bb4c219f11d89fbe60b
+  metadata.gz: 19c5b88355ab37717abe9fd6889620749d9affe2
+  data.tar.gz: 15d6e2545f4a90599ee6de98d3ab48362e2314f3
 SHA512:
-  metadata.gz: 614710b62cfd448fa00967c5000d4029c05ebcb3497e084f1be34cee8b3329dfa33348448d0e05e12378bf15c059cb81357b3e51d3d4a21f087b31b1f13b1a6e
-  data.tar.gz: ac3225baa82586c8149ab7aeb178a82870421097f05aebb812bbc535f7d91a84b251a83128d561e7790f31f8123dae5df55290ab9b2ee135981244fa847f35a8
+  metadata.gz: 2d29161692e5f7728f85d5d406b70519ba02a40e62d279ea8800c5ab9f6e678f33a07a0bbcf8df2c90d68d6956363d439514fc1381950a4e5521948b7d0d91e1
+  data.tar.gz: 299455d9553de53a802a3ce4375ed652747b8258bfcaaeca47b2a897ae2cc946d53c88ac015c2e911babea432f2b096345470b050a3dc0a21145ca8ba035be3a

data/lib/jmespath/nodes.rb

@@ -19,6 +19,7 @@ module JMESPath
     end
 
     autoload :Comparator, 'jmespath/nodes/comparator'
+    autoload :Comparators, 'jmespath/nodes/comparator'
     autoload :Condition, 'jmespath/nodes/condition'
     autoload :Current, 'jmespath/nodes/current'
     autoload :Expression, 'jmespath/nodes/expression'
@@ -36,5 +37,6 @@ module JMESPath
     autoload :ObjectProjection, 'jmespath/nodes/projection'
     autoload :Slice, 'jmespath/nodes/slice'
     autoload :Subexpression, 'jmespath/nodes/subexpression'
+
   end
 end

data/lib/jmespath/nodes/comparator.rb

@@ -12,12 +12,12 @@ module JMESPath
       def self.create(relation, left, right)
         type = begin
           case relation
-          when '==' then EqComparator
-          when '!=' then NeqComparator
-          when '>' then GtComparator
-          when '>=' then GteComparator
-          when '<' then LtComparator
-          when '<=' then LteComparator
+          when '==' then Comparators::Eq
+          when '!=' then Comparators::Neq
+          when '>' then Comparators::Gt
+          when '>=' then Comparators::Gte
+          when '<' then Comparators::Lt
+          when '<=' then Comparators::Lte
           end
         end
         type.new(left, right)
@@ -38,39 +38,42 @@ module JMESPath
       end
     end
 
-    class EqComparator < Comparator
-      def check(left_value, right_value)
-        left_value == right_value
+    module Comparators
+
+      class Eq < Comparator
+        def check(left_value, right_value)
+          left_value == right_value
+        end
       end
-    end
 
-    class NeqComparator < Comparator
-      def check(left_value, right_value)
-        left_value != right_value
+      class Neq < Comparator
+        def check(left_value, right_value)
+          left_value != right_value
+        end
       end
-    end
 
-    class GtComparator < Comparator
-      def check(left_value, right_value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value > right_value
+      class Gt < Comparator
+        def check(left_value, right_value)
+          left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value > right_value
+        end
       end
-    end
 
-    class GteComparator < Comparator
-      def check(left_value, right_value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value >= right_value
+      class Gte < Comparator
+        def check(left_value, right_value)
+          left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value >= right_value
+        end
       end
-    end
 
-    class LtComparator < Comparator
-      def check(left_value, right_value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value < right_value
+      class Lt < Comparator
+        def check(left_value, right_value)
+          left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value < right_value
+        end
       end
-    end
 
-    class LteComparator < Comparator
-      def check(left_value, right_value)
-        left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value <= right_value
+      class Lte < Comparator
+        def check(left_value, right_value)
+          left_value.is_a?(Integer) && right_value.is_a?(Integer) && left_value <= right_value
+        end
       end
     end
   end

data/lib/jmespath/nodes/condition.rb

@@ -40,7 +40,7 @@ module JMESPath
     end
 
     class EqCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[EqComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Eq] = self
 
       def visit(value)
         @left.visit(value) == @right.visit(value) ? @child.visit(value) : nil
@@ -67,7 +67,7 @@ module JMESPath
     end
 
     class NeqCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[NeqComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Neq] = self
 
       def visit(value)
         @left.visit(value) != @right.visit(value) ? @child.visit(value) : nil
@@ -94,7 +94,7 @@ module JMESPath
     end
 
     class GtCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[GtComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Gt] = self
 
       def visit(value)
         left_value = @left.visit(value)
@@ -104,7 +104,7 @@ module JMESPath
     end
 
     class GteCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[GteComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Gte] = self
 
       def visit(value)
         left_value = @left.visit(value)
@@ -114,7 +114,7 @@ module JMESPath
     end
 
     class LtCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[LtComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Lt] = self
 
       def visit(value)
         left_value = @left.visit(value)
@@ -124,7 +124,7 @@ module JMESPath
     end
 
     class LteCondition < ComparatorCondition
-      COMPARATOR_TO_CONDITION[LteComparator] = self
+      COMPARATOR_TO_CONDITION[Comparators::Lte] = self
 
       def visit(value)
         left_value = @left.visit(value)

data/lib/jmespath/version.rb

@@ -1,3 +1,3 @@
 module JMESPath
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Trevor Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json