burtpath 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfa4c5a420e8defde2a70bdbf2de5a8b4376576
-  data.tar.gz: 2ddf695b4cccd57b2e0b93735f89fdeec5878509
+  metadata.gz: 1f0fad9f7110671a046e39df22effa1b65ac8644
+  data.tar.gz: 0855479643813db91c37eadc33bb43cd16789c65
 SHA512:
-  metadata.gz: b4611855c33f0104c78aa2cebef3a0ef308091f86ba63c04ca66406fa38bbccd513ed9382f551a10c33a192f00d11fb2966e2997b1ba3221ebbbc961924e7996
-  data.tar.gz: 4bfd2c5588811ad86348e80ec2fde8ef200eebce105ba58c1b7dcf5566fbedd4dc618e259f84405800ca6b6bcc43d71a893253631273776926dfd3ec4f89567d
+  metadata.gz: d165fe70830ff20c9f453bbce8f6a1af849bd010fe5ce2421c9650b715f4db97a038ff8e1279549ea7b30db54e9f852d73eee1a3b73ccd6fb23840715fc5c9f3
+  data.tar.gz: b2647b7e414c3a9f32b6444a2663feb802f0819769de492ddf83710f93a46a16f6a390b57c22546b814b1d337d5507d99e45fe0d268fc2ca5a7fa0a3a4336c86

data/lib/jmespath/errors.rb

@@ -3,10 +3,10 @@ module JMESPath
 
     class Error < StandardError; end
 
-    class RuntimeError < Error; end
-
     class SyntaxError < Error; end
 
+    class InvalidValueError < Error; end
+
     class InvalidTypeError < Error; end
 
     class InvalidArityError < Error; end

data/lib/jmespath/nodes/function.rb

@@ -4,13 +4,15 @@ module JMESPath
     class Function < Node
       FUNCTIONS = {}
 
-      def initialize(children)
+      def initialize(children, options = {})
         @children = children
+        @options = options
+        @disable_visit_errors = @options[:disable_visit_errors]
       end
 
-      def self.create(name, children)
+      def self.create(name, children, options = {})
         if (type = FUNCTIONS[name])
-          type.new(children)
+          type.new(children, options)
         else
           raise Errors::UnknownFunctionError, "unknown function #{name}()"
         end
@@ -21,7 +23,7 @@ module JMESPath
       end
 
       def optimize
-        self.class.new(@children.map(&:optimize))
+        self.class.new(@children.map(&:optimize), @options)
       end
 
       class FunctionName
@@ -34,6 +36,12 @@ module JMESPath
 
       private
 
+      def maybe_raise(error_type, message)
+        unless @disable_visit_errors
+          raise error_type, message
+        end
+      end
+
       def call(args)
         nil
       end
@@ -78,12 +86,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          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
-          raise Errors::InvalidTypeError, "function abs() expects a number"
+          return maybe_raise Errors::InvalidTypeError, "function abs() expects a number"
         end
       end
     end
@@ -95,18 +103,18 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          raise Errors::InvalidArityError, "function avg() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function avg() expects one argument"
         end
         if Array === values
           values.inject(0) do |total,n|
             if Numeric === n
               total + n
             else
-              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
-          raise Errors::InvalidTypeError, "function avg() expects a number"
+          return maybe_raise Errors::InvalidTypeError, "function avg() expects a number"
         end
       end
     end
@@ -118,12 +126,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          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
-          raise Errors::InvalidTypeError, "function ceil() expects a numeric value"
+          return maybe_raise Errors::InvalidTypeError, "function ceil() expects a numeric value"
         end
       end
     end
@@ -138,10 +146,10 @@ module JMESPath
           if String === haystack || Array === haystack
             haystack.include?(needle)
           else
-            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
-          raise Errors::InvalidArityError, "function contains() expects 2 arguments"
+          return maybe_raise Errors::InvalidArityError, "function contains() expects 2 arguments"
         end
       end
     end
@@ -153,12 +161,12 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          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
-          raise Errors::InvalidTypeError, "function floor() expects a numeric value"
+          return maybe_raise Errors::InvalidTypeError, "function floor() expects a numeric value"
         end
       end
     end
@@ -170,11 +178,11 @@ module JMESPath
         if args.count == 1
           value = args.first
         else
-          raise Errors::InvalidArityError, "function length() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function length() expects one argument"
         end
         case value
         when Hash, Array, String then value.size
-        else raise Errors::InvalidTypeError, "function length() expects string, array or object"
+        else return maybe_raise Errors::InvalidTypeError, "function length() expects string, array or object"
         end
       end
     end
@@ -186,18 +194,18 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          raise Errors::InvalidArityError, "function max() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function max() expects one argument"
         end
         if Array === values
           values.inject(values.first) do |max, v|
             if Numeric === v
               v > max ? v : max
             else
-              raise Errors::InvalidTypeError, "function max() expects numeric values"
+              return maybe_raise Errors::InvalidTypeError, "function max() expects numeric values"
             end
           end
         else
-          raise Errors::InvalidTypeError, "function max() expects an array"
+          return maybe_raise Errors::InvalidTypeError, "function max() expects an array"
         end
       end
     end
@@ -209,18 +217,18 @@ module JMESPath
         if args.count == 1
           values = args.first
         else
-          raise Errors::InvalidArityError, "function min() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function min() expects one argument"
         end
         if Array === values
           values.inject(values.first) do |min, v|
             if Numeric === v
               v < min ? v : min
             else
-              raise Errors::InvalidTypeError, "function min() expects numeric values"
+              return maybe_raise Errors::InvalidTypeError, "function min() expects numeric values"
             end
           end
         else
-          raise Errors::InvalidTypeError, "function min() expects an array"
+          return maybe_raise Errors::InvalidTypeError, "function min() expects an array"
         end
       end
     end
@@ -234,7 +242,7 @@ module JMESPath
         if args.count == 1
           TYPE_NAMES[get_type(args.first)]
         else
-          raise Errors::InvalidArityError, "function type() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function type() expects one argument"
         end
       end
     end
@@ -252,10 +260,10 @@ module JMESPath
             else raise NotImplementedError
             end
           else
-            raise Errors::InvalidTypeError, "function keys() expects a hash"
+            return maybe_raise Errors::InvalidTypeError, "function keys() expects a hash"
           end
         else
-          raise Errors::InvalidArityError, "function keys() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function keys() expects one argument"
         end
       end
     end
@@ -271,10 +279,10 @@ module JMESPath
           elsif Array === value
             value
           else
-            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
-          raise Errors::InvalidArityError, "function values() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function values() expects one argument"
         end
       end
     end
@@ -287,14 +295,14 @@ module JMESPath
           glue = args[0]
           values = args[1]
           if !(String === glue)
-            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 Array === values && values.all? { |v| String === v }
             values.join(glue)
           else
-            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
-          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
@@ -305,9 +313,9 @@ module JMESPath
       def call(args)
         if args.count == 1
           value = args.first
-          String === value ? value : MultiJson.dump(value)
+          String === value ? value : JSON.dump(value)
         else
-          raise Errors::InvalidArityError, "function to_string() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function to_string() expects one argument"
         end
       end
     end
@@ -324,7 +332,7 @@ module JMESPath
             nil
           end
         else
-          raise Errors::InvalidArityError, "function to_number() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function to_number() expects one argument"
         end
       end
     end
@@ -338,11 +346,11 @@ module JMESPath
             if Numeric === n
               sum + n
             else
-              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
-          raise Errors::InvalidArityError, "function sum() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function sum() expects one argument"
         end
       end
     end
@@ -354,7 +362,7 @@ module JMESPath
         if args.count > 0
           args.find { |value| !value.nil? }
         else
-          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
@@ -374,14 +382,14 @@ module JMESPath
               if (a_type == STRING_TYPE || a_type == NUMBER_TYPE) && a_type == b_type
                 a <=> b
               else
-                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
             end
           else
-            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
-          raise Errors::InvalidArityError, "function sort() expects one argument"
+          return maybe_raise Errors::InvalidArityError, "function sort() expects one argument"
         end
       end
     end
@@ -404,14 +412,14 @@ module JMESPath
               if (a_type == STRING_TYPE || a_type == NUMBER_TYPE) && a_type == b_type
                 a_value <=> b_value
               else
-                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
             end
           else
-            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
-          raise Errors::InvalidArityError, "function sort_by() expects two arguments"
+          return maybe_raise Errors::InvalidArityError, "function sort_by() expects two arguments"
         end
       end
     end
@@ -429,14 +437,14 @@ module JMESPath
               if get_type(value) == NUMBER_TYPE
                 value
               else
-                raise Errors::InvalidTypeError, "function #{mode}() expects values to be an numbers"
+                return maybe_raise Errors::InvalidTypeError, "function #{mode}() expects values to be an numbers"
               end
             end
           else
-            raise Errors::InvalidTypeError, "function #{mode}() expects an array and an expression"
+            return maybe_raise Errors::InvalidTypeError, "function #{mode}() expects an array and an expression"
           end
         else
-          raise Errors::InvalidArityError, "function #{mode}() expects two arguments"
+          return maybe_raise Errors::InvalidArityError, "function #{mode}() expects two arguments"
         end
       end
     end

data/lib/jmespath/nodes/slice.rb

@@ -6,11 +6,13 @@ module JMESPath
         @start = start
         @stop = stop
         @step = step
+        raise Errors::InvalidValueError.new('slice step cannot be 0') if @step == 0
       end
 
       def visit(value)
         if String === value || Array === value
           start, stop, step = adjust_slice(value.size, @start, @stop, @step)
+          return unless start && stop && step
           result = []
           if step > 0
             i = start
@@ -44,8 +46,6 @@ module JMESPath
       def adjust_slice(length, start, stop, step)
         if step.nil?
           step = 1
-        elsif step == 0
-          raise Errors::RuntimeError, 'slice step cannot be 0'
         end
 
         if start.nil?

data/lib/jmespath/parser.rb

@@ -20,6 +20,7 @@ module JMESPath
     # @option options [Lexer] :lexer
     def initialize(options = {})
       @lexer = options[:lexer] || Lexer.new()
+      @disable_visit_errors = options[:disable_visit_errors]
     end
 
     # @param [String<JMESPath>] expression
@@ -188,7 +189,7 @@ module JMESPath
         end
       end
       stream.next
-      Nodes::Function.create(name, args)
+      Nodes::Function.create(name, args, :disable_visit_errors => @disable_visit_errors)
     end
 
     def led_or(stream, left)

data/lib/jmespath/runtime.rb

@@ -49,6 +49,11 @@ module JMESPath
     #   searches, so it's highly recommended if you're using the same expression
     #   multiple times and have not disabled caching. Defaults to `true`.
     #
+    # @option options [Boolean] :disable_visit_errors (false) When `true`,
+    #   no errors will be raised during runtime processing. Parse errors
+    #   will still be raised, but unexpected data sent to visit will
+    #   result in nil being returned.
+    #
     # @option options [Parser] :parser
     #
     def initialize(options = {})
@@ -68,7 +73,7 @@ module JMESPath
     private
 
     def create_parser(options)
-      parser = Parser.new
+      parser = Parser.new(:disable_visit_errors => !!options[:disable_visit_errors])
       unless options[:optimize_expression] == false
         parser = OptimizingParser.new(parser)
       end

data/lib/jmespath/version.rb

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

data/lib/jmespath.rb

@@ -23,14 +23,14 @@ module JMESPath
     # @param [Hash] data
     # @return [Mixed,nil] Returns the matched values. Returns `nil` if the
     #   expression does not resolve inside `data`.
-    def search(expression, data)
+    def search(expression, data, runtime_options = {})
       data = case data
         when Hash, Struct then data # check for most common case first
         when Pathname then load_json(data)
         when IO, StringIO then JSON.load(data.read)
         else data
         end
-      Runtime.new.search(expression, data)
+      Runtime.new(runtime_options).search(expression, data)
     end
 
     # @api private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: burtpath
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Trevor Rowe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json