jmespath 1.6.1 → 1.6.2

data/lib/jmespath/nodes/function.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
     class Function < Node
-
       FUNCTIONS = {}
 
       def initialize(children, options = {})
@@ -38,12 +38,10 @@ module JMESPath
       private
 
       def maybe_raise(error_type, message)
-        unless @disable_visit_errors
-          raise error_type, message
-        end
+        raise error_type, message unless @disable_visit_errors
       end
 
-      def call(args)
+      def call(_args)
         nil
       end
     end
@@ -54,7 +52,7 @@ module JMESPath
           STRING_TYPE
         elsif value == true || value == false
           BOOLEAN_TYPE
-        elsif value == nil
+        elsif value.nil?
           NULL_TYPE
         elsif value.is_a?(Numeric)
           NUMBER_TYPE
@@ -82,7 +80,7 @@ module JMESPath
         NULL_TYPE => 'null',
         NUMBER_TYPE => 'number',
         OBJECT_TYPE => 'object',
-        STRING_TYPE => 'string',
+        STRING_TYPE => 'string'
       }.freeze
     end
 
@@ -93,12 +91,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function abs() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function abs() expects one argument'
         end
         if Numeric === value
           value.abs
         else
-          return maybe_raise Errors::InvalidTypeError, "function abs() expects a number"
+          return maybe_raise Errors::InvalidTypeError, 'function abs() expects a number'
         end
       end
     end
@@ -110,20 +108,20 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function avg() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function avg() expects one argument'
         end
         if values.respond_to?(:to_ary)
           values = values.to_ary
           return nil if values.empty?
-          values.inject(0) do |total,n|
+          values.inject(0) do |total, n|
             if Numeric === n
               total + n
             else
-              return maybe_raise Errors::InvalidTypeError, "function avg() expects numeric values"
+              return maybe_raise Errors::InvalidTypeError, 'function avg() expects numeric values'
             end
           end / values.size.to_f
         else
-          return maybe_raise Errors::InvalidTypeError, "function avg() expects a number"
+          return maybe_raise Errors::InvalidTypeError, 'function avg() expects a number'
         end
       end
     end
@@ -135,12 +133,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function ceil() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function ceil() expects one argument'
         end
         if Numeric === value
           value.ceil
         else
-          return maybe_raise Errors::InvalidTypeError, "function ceil() expects a numeric value"
+          return maybe_raise Errors::InvalidTypeError, 'function ceil() expects a numeric value'
         end
       end
     end
@@ -157,10 +155,10 @@ module JMESPath
           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"
+            return maybe_raise Errors::InvalidTypeError, 'contains expects 2nd arg to be a list'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function contains() expects 2 arguments"
+          return maybe_raise Errors::InvalidArityError, 'function contains() expects 2 arguments'
         end
       end
     end
@@ -172,12 +170,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function floor() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function floor() expects one argument'
         end
         if Numeric === value
           value.floor
         else
-          return maybe_raise Errors::InvalidTypeError, "function floor() expects a numeric value"
+          return maybe_raise Errors::InvalidTypeError, 'function floor() expects a numeric value'
         end
       end
     end
@@ -189,7 +187,7 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function length() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function length() expects one argument'
         end
         if value.respond_to?(:to_hash)
           value.to_hash.size
@@ -198,32 +196,30 @@ module JMESPath
         elsif value.respond_to?(:to_str)
           value.to_str.size
         else
-          return maybe_raise Errors::InvalidTypeError, "function length() expects string, array or object"
+          return maybe_raise Errors::InvalidTypeError, 'function length() expects string, array or object'
         end
       end
     end
 
     class Map < Function
-
       FUNCTIONS['map'] = self
 
       def call(args)
         if args.count != 2
-          return maybe_raise Errors::InvalidArityError, "function map() expects two arguments"
+          return maybe_raise Errors::InvalidArityError, 'function map() expects two arguments'
         end
         if Nodes::Expression === args[0]
           expr = args[0]
         else
-          return maybe_raise Errors::InvalidTypeError, "function map() expects the first argument to be an expression"
+          return maybe_raise Errors::InvalidTypeError, 'function map() expects the first argument to be an expression'
         end
         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"
+          return maybe_raise Errors::InvalidTypeError, 'function map() expects the second argument to be an list'
         end
         list.map { |value| expr.eval(value) }
       end
-
     end
 
     class MaxFunction < Function
@@ -235,7 +231,7 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function max() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function max() expects one argument'
         end
         if values.respond_to?(:to_ary)
           values = values.to_ary
@@ -243,7 +239,7 @@ module JMESPath
           first = values.first
           first_type = get_type(first)
           unless first_type == NUMBER_TYPE || first_type == STRING_TYPE
-            msg = "function max() expects numeric or string values"
+            msg = String.new('function max() expects numeric or string values')
             return maybe_raise Errors::InvalidTypeError, msg
           end
           values.inject([first, first_type]) do |(max, max_type), v|
@@ -251,13 +247,13 @@ module JMESPath
             if max_type == v_type
               v > max ? [v, v_type] : [max, max_type]
             else
-              msg = "function max() encountered a type mismatch in sequence: "
+              msg = String.new('function max() encountered a type mismatch in sequence: ')
               msg << "#{max_type}, #{v_type}"
               return maybe_raise Errors::InvalidTypeError, msg
             end
           end.first
         else
-          return maybe_raise Errors::InvalidTypeError, "function max() expects an array"
+          return maybe_raise Errors::InvalidTypeError, 'function max() expects an array'
         end
       end
     end
@@ -271,7 +267,7 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          return maybe_raise Errors::InvalidArityError, "function min() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function min() expects one argument'
         end
         if values.respond_to?(:to_ary)
           values = values.to_ary
@@ -279,7 +275,7 @@ module JMESPath
           first = values.first
           first_type = get_type(first)
           unless first_type == NUMBER_TYPE || first_type == STRING_TYPE
-            msg = "function min() expects numeric or string values"
+            msg = String.new('function min() expects numeric or string values')
             return maybe_raise Errors::InvalidTypeError, msg
           end
           values.inject([first, first_type]) do |(min, min_type), v|
@@ -287,13 +283,13 @@ module JMESPath
             if min_type == v_type
               v < min ? [v, v_type] : [min, min_type]
             else
-              msg = "function min() encountered a type mismatch in sequence: "
+              msg = String.new('function min() encountered a type mismatch in sequence: ')
               msg << "#{min_type}, #{v_type}"
               return maybe_raise Errors::InvalidTypeError, msg
             end
           end.first
         else
-          return maybe_raise Errors::InvalidTypeError, "function min() expects an array"
+          return maybe_raise Errors::InvalidTypeError, 'function min() expects an array'
         end
       end
     end
@@ -307,7 +303,7 @@ module JMESPath
         if args.count == 1
           TYPE_NAMES[get_type(args.first)]
         else
-          return maybe_raise Errors::InvalidArityError, "function type() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function type() expects one argument'
         end
       end
     end
@@ -323,10 +319,10 @@ module JMESPath
           elsif value.is_a?(Struct)
             value.members.map(&:to_s)
           else
-            return maybe_raise Errors::InvalidTypeError, "function keys() expects a hash"
+            return maybe_raise Errors::InvalidTypeError, 'function keys() expects a hash'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function keys() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function keys() expects one argument'
         end
       end
     end
@@ -344,10 +340,10 @@ module JMESPath
           elsif value.respond_to?(:to_ary)
             value.to_ary
           else
-            return maybe_raise Errors::InvalidTypeError, "function values() expects an array or a hash"
+            return maybe_raise Errors::InvalidTypeError, 'function values() expects an array or a hash'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function values() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function values() expects one argument'
         end
       end
     end
@@ -360,14 +356,14 @@ module JMESPath
           glue = args[0]
           values = args[1]
           if !glue.respond_to?(:to_str)
-            return maybe_raise Errors::InvalidTypeError, "function join() expects the first argument to be a string"
+            return maybe_raise Errors::InvalidTypeError, 'function join() expects the first argument to be a string'
           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"
+            return maybe_raise Errors::InvalidTypeError, 'function join() expects values to be an array of strings'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function join() expects an array of strings"
+          return maybe_raise Errors::InvalidArityError, 'function join() expects an array of strings'
         end
       end
     end
@@ -380,7 +376,7 @@ module JMESPath
           value = args.first
           value.respond_to?(:to_str) ? value.to_str : value.to_json
         else
-          return maybe_raise Errors::InvalidArityError, "function to_string() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function to_string() expects one argument'
         end
       end
     end
@@ -397,7 +393,7 @@ module JMESPath
             nil
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function to_number() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function to_number() expects one argument'
         end
       end
     end
@@ -407,15 +403,15 @@ module JMESPath
 
       def call(args)
         if args.count == 1 && args.first.respond_to?(:to_ary)
-          args.first.to_ary.inject(0) do |sum,n|
+          args.first.to_ary.inject(0) do |sum, n|
             if Numeric === n
               sum + n
             else
-              return maybe_raise Errors::InvalidTypeError, "function sum() expects values to be numeric"
+              return maybe_raise Errors::InvalidTypeError, 'function sum() expects values to be numeric'
             end
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function sum() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function sum() expects one argument'
         end
       end
     end
@@ -427,7 +423,7 @@ module JMESPath
         if args.count > 0
           args.find { |value| !value.nil? }
         else
-          return maybe_raise Errors::InvalidArityError, "function not_null() expects one or more arguments"
+          return maybe_raise Errors::InvalidArityError, 'function not_null() expects one or more arguments'
         end
       end
     end
@@ -444,26 +440,26 @@ module JMESPath
             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
+            if array_type == STRING_TYPE || array_type == NUMBER_TYPE || value.empty?
               # stable sort
               n = 0
               value.sort_by do |v|
                 value_type = get_type(v)
                 if value_type != array_type
-                  msg = "function sort() expects values to be an array of only numbers, or only integers"
+                  msg = 'function sort() expects values to be an array of only numbers, or only integers'
                   return maybe_raise Errors::InvalidTypeError, msg
                 end
                 n += 1
                 [v, n]
               end
             else
-              return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
+              return maybe_raise Errors::InvalidTypeError, 'function sort() expects values to be an array of numbers or integers'
             end
           else
-            return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
+            return maybe_raise Errors::InvalidTypeError, 'function sort() expects values to be an array of numbers or integers'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function sort() expects one argument"
+          return maybe_raise Errors::InvalidArityError, 'function sort() expects one argument'
         end
       end
     end
@@ -479,27 +475,27 @@ module JMESPath
             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
+            if array_type == STRING_TYPE || array_type == NUMBER_TYPE || values.empty?
               # stable sort the list
               n = 0
               values.sort_by do |value|
                 value = expression.eval(value)
                 value_type = get_type(value)
                 if value_type != array_type
-                  msg = "function sort() expects values to be an array of only numbers, or only integers"
+                  msg = 'function sort() expects values to be an array of only numbers, or only integers'
                   return maybe_raise Errors::InvalidTypeError, msg
                 end
                 n += 1
                 [value, n]
               end
             else
-              return maybe_raise Errors::InvalidTypeError, "function sort() expects values to be an array of numbers or integers"
+              return maybe_raise Errors::InvalidTypeError, 'function sort() expects values to be an array of numbers or integers'
             end
           else
-            return maybe_raise Errors::InvalidTypeError, "function sort_by() expects an array and an expression"
+            return maybe_raise Errors::InvalidTypeError, 'function sort_by() expects an array and an expression'
           end
         else
-          return maybe_raise Errors::InvalidArityError, "function sort_by() expects two arguments"
+          return maybe_raise Errors::InvalidArityError, 'function sort_by() expects two arguments'
         end
       end
     end
@@ -522,7 +518,7 @@ module JMESPath
               value = expression.eval(entry)
               value_type = get_type(value)
               if value_type != type
-                msg = "function #{mode}() encountered a type mismatch in "
+                msg = String.new("function #{mode}() encountered a type mismatch in ")
                 msg << "sequence: #{type}, #{value_type}"
                 return maybe_raise Errors::InvalidTypeError, msg
               end
@@ -570,16 +566,16 @@ module JMESPath
           search_type = get_type(search)
           suffix_type = get_type(suffix)
           if search_type != STRING_TYPE
-            msg = "function ends_with() expects first argument to be a string"
+            msg = 'function ends_with() expects first argument to be a string'
             return maybe_raise Errors::InvalidTypeError, msg
           end
           if suffix_type != STRING_TYPE
-            msg = "function ends_with() expects second argument to be a string"
+            msg = 'function ends_with() expects second argument to be a string'
             return maybe_raise Errors::InvalidTypeError, msg
           end
           search.end_with?(suffix)
         else
-          msg = "function ends_with() expects two arguments"
+          msg = 'function ends_with() expects two arguments'
           return maybe_raise Errors::InvalidArityError, msg
         end
       end
@@ -596,16 +592,16 @@ module JMESPath
           search_type = get_type(search)
           prefix_type = get_type(prefix)
           if search_type != STRING_TYPE
-            msg = "function starts_with() expects first argument to be a string"
+            msg = 'function starts_with() expects first argument to be a string'
             return maybe_raise Errors::InvalidTypeError, msg
           end
           if prefix_type != STRING_TYPE
-            msg = "function starts_with() expects second argument to be a string"
+            msg = 'function starts_with() expects second argument to be a string'
             return maybe_raise Errors::InvalidTypeError, msg
           end
           search.start_with?(prefix)
         else
-          msg = "function starts_with() expects two arguments"
+          msg = 'function starts_with() expects two arguments'
           return maybe_raise Errors::InvalidArityError, msg
         end
       end
@@ -616,7 +612,7 @@ module JMESPath
 
       def call(args)
         if args.count == 0
-          msg = "function merge() expects 1 or more arguments"
+          msg = 'function merge() expects 1 or more arguments'
           return maybe_raise Errors::InvalidArityError, msg
         end
         args.inject({}) do |h, v|
@@ -630,7 +626,7 @@ module JMESPath
 
       def call(args)
         if args.count == 0
-          msg = "function reverse() expects 1 or more arguments"
+          msg = 'function reverse() expects 1 or more arguments'
           return maybe_raise Errors::InvalidArityError, msg
         end
         value = args.first
@@ -639,7 +635,7 @@ module JMESPath
         elsif value.respond_to?(:to_str)
           value.to_str.reverse
         else
-          msg = "function reverse() expects an array or string"
+          msg = 'function reverse() expects an array or string'
           return maybe_raise Errors::InvalidTypeError, msg
         end
       end

data/lib/jmespath/nodes/index.rb

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

data/lib/jmespath/nodes/literal.rb

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

data/lib/jmespath/nodes/multi_select_hash.rb

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

data/lib/jmespath/nodes/multi_select_list.rb

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

data/lib/jmespath/nodes/not.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 module JMESPath
   module Nodes
     class Not < Node
-
       def initialize(expression)
         @expression = expression
       end
@@ -13,7 +13,6 @@ module JMESPath
       def optimize
         self.class.new(@expression.optimize)
       end
-
     end
   end
 end

data/lib/jmespath/nodes/or.rb

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

data/lib/jmespath/nodes/pipe.rb

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

data/lib/jmespath/nodes/projection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -12,9 +13,7 @@ module JMESPath
           list = []
           targets.each do |v|
             vv = @projection.visit(v)
-            unless vv.nil?
-              list << vv
-            end
+            list << vv unless vv.nil?
           end
           list
         end
@@ -30,7 +29,7 @@ module JMESPath
 
       private
 
-      def extract_targets(left_value)
+      def extract_targets(_left_value)
         nil
       end
     end
@@ -45,11 +44,7 @@ module JMESPath
 
     class ArrayProjection < Projection
       def extract_targets(target)
-        if target.respond_to?(:to_ary)
-          target.to_ary
-        else
-          nil
-        end
+        target.to_ary if target.respond_to?(:to_ary)
       end
 
       def fast_instance
@@ -67,8 +62,6 @@ module JMESPath
           target.to_hash.values
         elsif target.is_a?(Struct)
           target.values
-        else
-          nil
         end
       end
 

data/lib/jmespath/nodes/slice.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -6,7 +7,7 @@ module JMESPath
         @start = start
         @stop = stop
         @step = step
-        raise Errors::InvalidValueError.new('slice step cannot be 0') if @step == 0
+        raise Errors::InvalidValueError, 'slice step cannot be 0' if @step == 0
       end
 
       def visit(value)
@@ -27,8 +28,6 @@ module JMESPath
             end
           end
           value.respond_to?(:to_str) ? result.join : result
-        else
-          nil
         end
       end
 
@@ -43,21 +42,19 @@ module JMESPath
       private
 
       def adjust_slice(length, start, stop, step)
-        if step.nil?
-          step = 1
-        end
+        step = 1 if step.nil?
 
-        if start.nil?
-          start = step < 0 ? length - 1 : 0
-        else
-          start = adjust_endpoint(length, start, step)
-        end
+        start = if start.nil?
+                  step < 0 ? length - 1 : 0
+                else
+                  adjust_endpoint(length, start, step)
+                end
 
-        if stop.nil?
-          stop = step < 0 ? -1 : length
-        else
-          stop = adjust_endpoint(length, stop, step)
-        end
+        stop = if stop.nil?
+                 step < 0 ? -1 : length
+               else
+                 adjust_endpoint(length, stop, step)
+               end
         [start, stop, step]
       end
 
@@ -82,8 +79,6 @@ module JMESPath
       def visit(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
         end
       end
     end

data/lib/jmespath/nodes/subexpression.rb

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

data/lib/jmespath/nodes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JMESPath
   # @api private
   module Nodes
@@ -9,11 +10,11 @@ module JMESPath
         self
       end
 
-      def chains_with?(other)
+      def chains_with?(_other)
         false
       end
     end
-    
+
     require  'jmespath/nodes/subexpression'
     require  'jmespath/nodes/and'
     require  'jmespath/nodes/comparator'
@@ -35,7 +36,5 @@ module JMESPath
     require  'jmespath/nodes/projection'
     require  'jmespath/nodes/projection'
     require  'jmespath/nodes/slice'
-
-
   end
 end