jmespath 1.1.3 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c1b07dda78e4e255a2f6b9d50705ad2d19029e
-  data.tar.gz: 07200f08f3c6c63fe284cbec59921a146ae428d3
+  metadata.gz: fdb6bfadd1b501b4a2316f67248a96b51e350e00
+  data.tar.gz: edf12df4b8e49fc520f507098947c381d4312de1
 SHA512:
-  metadata.gz: e605f030766166d80c779828eb1c75546f213309720b1ee3d88eb1740cca16a31f7011dfcd57e53961891ff8f6a5cdb611533ff64cdb95fb541c813bdd722873
-  data.tar.gz: 73f06c5c63db7e878f9c3a6a286a026d42e098c79a41d721d82bafa0783e3a925636293caad04410946ef7963fbb016bdea51740973d3589fa1ff592a066d0b0
+  metadata.gz: 135adb95e2c213b911405e10412eb8484009605555433109a12f954aa96376818c74ef94af18868fd7fe309956d6a6457341c5621aeb76ff743f57192a4f8e2b
+  data.tar.gz: c5a3165e77c71faf9f62bba531b8b5091da2f9224693052c27899fee2ba15bd4f5a79e1fb2e5bc1e1407d5927362819ce226b6e6688f3e2a749a11c097a23dd8

data/lib/jmespath.rb

@@ -13,6 +13,7 @@ module JMESPath
   autoload :Runtime, 'jmespath/runtime'
   autoload :Token, 'jmespath/token'
   autoload :TokenStream, 'jmespath/token_stream'
+  autoload :Util, 'jmespath/util'
   autoload :VERSION, 'jmespath/version'
 
   class << self
@@ -23,14 +24,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

data/lib/jmespath/lexer.rb

@@ -1,3 +1,5 @@
+gem('json', '>= 1.8.1') # fix for Ruby 1.9.3
+
 require 'json'
 require 'set'
 
@@ -24,6 +26,8 @@ module JMESPath
     T_UNKNOWN = :unknown
     T_PIPE = :pipe
     T_OR = :or
+    T_AND = :and
+    T_NOT = :not
     T_FILTER = :filter
     T_LITERAL = :literal
     T_EOF = :eof
@@ -42,6 +46,7 @@ module JMESPath
     STATE_GT = 10
     STATE_EQ = 11
     STATE_NOT = 12
+    STATE_AND = 13
 
     TRANSLATION_TABLE = {
       '<'  => STATE_LT,
@@ -50,6 +55,7 @@ module JMESPath
       '!'  => STATE_NOT,
       '['  => STATE_LBRACKET,
       '|'  => STATE_PIPE,
+      '&'  => STATE_AND,
       '`'  => STATE_JSON_LITERAL,
       '"'  => STATE_QUOTED_STRING,
       "'"  => STATE_STRING_LITERAL,
@@ -74,7 +80,6 @@ module JMESPath
       ','  => STATE_SINGLE_CHAR,
       ':'  => STATE_SINGLE_CHAR,
       '@'  => STATE_SINGLE_CHAR,
-      '&'  => STATE_SINGLE_CHAR,
       '('  => STATE_SINGLE_CHAR,
       ')'  => STATE_SINGLE_CHAR,
       '{'  => STATE_SINGLE_CHAR,
@@ -149,7 +154,6 @@ module JMESPath
       ',' => T_COMMA,
       ':' => T_COLON,
       '@' => T_CURRENT,
-      '&' => T_EXPREF,
       '(' => T_LPAREN,
       ')' => T_RPAREN,
       '{' => T_LBRACE,
@@ -210,7 +214,9 @@ module JMESPath
           end
         when STATE_STRING_LITERAL
           # consume raw string literals
-          tokens << inside(chars, "'", T_LITERAL)
+          t = inside(chars, "'", T_LITERAL)
+          t.value = t.value.gsub("\\'", "'")
+          tokens << t
         when STATE_PIPE
           # consume pipe and OR
           tokens << match_or(chars, '|', '|', T_OR, T_PIPE)
@@ -245,9 +251,11 @@ module JMESPath
         when STATE_EQ
           # consume equals
           tokens << match_or(chars, '=', '=', T_COMPARATOR, T_UNKNOWN)
+        when STATE_AND
+          tokens << match_or(chars, '&', '&', T_AND, T_EXPREF)
         when STATE_NOT
           # consume not equals
-          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_UNKNOWN)
+          tokens << match_or(chars, '!', '=', T_COMPARATOR, T_NOT);
         else
           # either '<' or '>'
           # consume less than and greater than

data/lib/jmespath/nodes.rb

@@ -18,6 +18,7 @@ module JMESPath
       end
     end
 
+    autoload :And, 'jmespath/nodes/and'
     autoload :Comparator, 'jmespath/nodes/comparator'
     autoload :Comparators, 'jmespath/nodes/comparator'
     autoload :Condition, 'jmespath/nodes/condition'
@@ -30,6 +31,7 @@ module JMESPath
     autoload :Literal, 'jmespath/nodes/literal'
     autoload :MultiSelectHash, 'jmespath/nodes/multi_select_hash'
     autoload :MultiSelectList, 'jmespath/nodes/multi_select_list'
+    autoload :Not, 'jmespath/nodes/not'
     autoload :Or, 'jmespath/nodes/or'
     autoload :Pipe, 'jmespath/nodes/pipe'
     autoload :Projection, 'jmespath/nodes/projection'

data/lib/jmespath/nodes/and.rb

@@ -0,0 +1,25 @@
+module JMESPath
+  module Nodes
+    class And < Node
+
+      def initialize(left, right)
+        @left = left
+        @right = right
+      end
+
+      def visit(value)
+        result = @left.visit(value)
+        if JMESPath::Util.falsey?(result)
+          result
+        else
+          @right.visit(value)
+        end
+      end
+
+      def optimize
+        self.class.new(@left.optimize, @right.optimize)
+      end
+
+    end
+  end
+end

data/lib/jmespath/nodes/condition.rb

@@ -8,10 +8,10 @@ module JMESPath
       end
 
       def visit(value)
-        if @test.visit(value)
-          @child.visit(value)
-        else
+        if JMESPath::Util.falsey?(@test.visit(value))
           nil
+        else
+          @child.visit(value)
         end
       end
 

data/lib/jmespath/nodes/field.rb

@@ -46,8 +46,8 @@ module JMESPath
         end
       end
 
-      def visit(value)
-        @keys.reduce(value) do |value, key|
+      def visit(obj)
+        @keys.reduce(obj) do |value, key|
           if value.is_a?(Array) && key.is_a?(Integer)
             value[key]
           elsif value.is_a?(Hash)
@@ -68,7 +68,10 @@ module JMESPath
 
       private
 
-      attr_reader :keys
+      def keys
+        @keys
+      end
+
     end
   end
 end

data/lib/jmespath/nodes/function.rb

@@ -5,13 +5,15 @@ module JMESPath
 
       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
@@ -22,7 +24,7 @@ module JMESPath
       end
 
       def optimize
-        self.class.new(@children.map(&:optimize))
+        self.class.new(@children.map(&:optimize), @options)
       end
 
       class FunctionName
@@ -35,6 +37,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
@@ -79,12 +87,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
@@ -96,18 +104,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
@@ -119,12 +127,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
@@ -139,10 +147,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
@@ -154,12 +162,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
@@ -171,15 +179,38 @@ 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
 
+    class Map < Function
+
+      FUNCTIONS['map'] = self
+
+      def call(args)
+        if args.count != 2
+          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"
+        end
+        if Array === args[1]
+          list = args[1]
+        else
+          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
       include TypeChecker
 
@@ -189,7 +220,7 @@ 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
           return nil if values.empty?
@@ -197,7 +228,7 @@ module JMESPath
           first_type = get_type(first)
           unless first_type == NUMBER_TYPE || first_type == STRING_TYPE
             msg = "function max() expects numeric or string values"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           values.inject([first, first_type]) do |(max, max_type), v|
             v_type = get_type(v)
@@ -206,11 +237,11 @@ module JMESPath
             else
               msg = "function max() encountered a type mismatch in sequence: "
               msg << "#{max_type}, #{v_type}"
-              raise Errors::InvalidTypeError, msg
+              return maybe_raise Errors::InvalidTypeError, msg
             end
           end.first
         else
-          raise Errors::InvalidTypeError, "function max() expects an array"
+          return maybe_raise Errors::InvalidTypeError, "function max() expects an array"
         end
       end
     end
@@ -224,7 +255,7 @@ 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
           return nil if values.empty?
@@ -232,7 +263,7 @@ module JMESPath
           first_type = get_type(first)
           unless first_type == NUMBER_TYPE || first_type == STRING_TYPE
             msg = "function min() expects numeric or string values"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           values.inject([first, first_type]) do |(min, min_type), v|
             v_type = get_type(v)
@@ -241,11 +272,11 @@ module JMESPath
             else
               msg = "function min() encountered a type mismatch in sequence: "
               msg << "#{min_type}, #{v_type}"
-              raise Errors::InvalidTypeError, msg
+              return maybe_raise Errors::InvalidTypeError, msg
             end
           end.first
         else
-          raise Errors::InvalidTypeError, "function min() expects an array"
+          return maybe_raise Errors::InvalidTypeError, "function min() expects an array"
         end
       end
     end
@@ -259,7 +290,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
@@ -277,10 +308,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
@@ -296,10 +327,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
@@ -312,14 +343,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
@@ -332,7 +363,7 @@ module JMESPath
           value = args.first
           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
@@ -349,7 +380,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
@@ -363,11 +394,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
@@ -379,7 +410,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
@@ -399,14 +430,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
@@ -429,14 +460,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
@@ -452,7 +483,7 @@ module JMESPath
             type = get_type(expression.eval(values.first))
             if type != NUMBER_TYPE && type != STRING_TYPE
               msg = "function #{mode}() expects values to be strings or numbers"
-              raise Errors::InvalidTypeError, msg
+              return maybe_raise Errors::InvalidTypeError, msg
             end
             values.send(mode) do |entry|
               value = expression.eval(entry)
@@ -460,17 +491,17 @@ module JMESPath
               if value_type != type
                 msg = "function #{mode}() encountered a type mismatch in "
                 msg << "sequence: #{type}, #{value_type}"
-                raise Errors::InvalidTypeError, msg
+                return maybe_raise Errors::InvalidTypeError, msg
               end
               value
             end
           else
             msg = "function #{mode}() expects an array and an expression"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
         else
           msg = "function #{mode}() expects two arguments"
-          raise Errors::InvalidArityError, msg
+          return maybe_raise Errors::InvalidArityError, msg
         end
       end
     end
@@ -507,16 +538,16 @@ module JMESPath
           suffix_type = get_type(suffix)
           if search_type != STRING_TYPE
             msg = "function ends_with() expects first argument to be a string"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           if suffix_type != STRING_TYPE
             msg = "function ends_with() expects second argument to be a string"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           search.end_with?(suffix)
         else
           msg = "function ends_with() expects two arguments"
-          raise Errors::InvalidArityError, msg
+          return maybe_raise Errors::InvalidArityError, msg
         end
       end
     end
@@ -533,16 +564,16 @@ module JMESPath
           prefix_type = get_type(prefix)
           if search_type != STRING_TYPE
             msg = "function starts_with() expects first argument to be a string"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           if prefix_type != STRING_TYPE
             msg = "function starts_with() expects second argument to be a string"
-            raise Errors::InvalidTypeError, msg
+            return maybe_raise Errors::InvalidTypeError, msg
           end
           search.start_with?(prefix)
         else
           msg = "function starts_with() expects two arguments"
-          raise Errors::InvalidArityError, msg
+          return maybe_raise Errors::InvalidArityError, msg
         end
       end
     end
@@ -553,7 +584,7 @@ module JMESPath
       def call(args)
         if args.count == 0
           msg = "function merge() expects 1 or more arguments"
-          raise Errors::InvalidArityError, msg
+          return maybe_raise Errors::InvalidArityError, msg
         end
         args.inject({}) do |h, v|
           h.merge(v)
@@ -567,14 +598,14 @@ module JMESPath
       def call(args)
         if args.count == 0
           msg = "function reverse() expects 1 or more arguments"
-          raise Errors::InvalidArityError, msg
+          return maybe_raise Errors::InvalidArityError, msg
         end
         value = args.first
         if Array === value || String === value
           value.reverse
         else
           msg = "function reverse() expects an array or string"
-          raise Errors::InvalidTypeError, msg
+          return maybe_raise Errors::InvalidTypeError, msg
         end
       end
     end

data/lib/jmespath/nodes/not.rb

@@ -0,0 +1,19 @@
+module JMESPath
+  module Nodes
+    class Not < Node
+
+      def initialize(expression)
+        @expression = expression
+      end
+
+      def visit(value)
+        JMESPath::Util.falsey?(@expression.visit(value))
+      end
+
+      def optimize
+        self.class.new(@expression.optimize)
+      end
+
+    end
+  end
+end

data/lib/jmespath/nodes/or.rb

@@ -9,7 +9,7 @@ module JMESPath
 
       def visit(value)
         result = @left.visit(value)
-        if result == false || result.nil? || result.empty?
+        if JMESPath::Util.falsey?(result)
           @right.visit(value)
         else
           result

data/lib/jmespath/nodes/slice.rb

@@ -6,6 +6,7 @@ module JMESPath
         @start = start
         @stop = stop
         @step = step
+        raise Errors::InvalidValueError.new('slice step cannot be 0') if @step == 0
       end
 
       def visit(value)
@@ -44,8 +45,6 @@ module JMESPath
       def adjust_slice(length, start, stop, step)
         if step.nil?
           step = 1
-        elsif step == 0
-          raise Errors::InvalidValueError, 'slice step cannot be 0'
         end
 
         if start.nil?

data/lib/jmespath/parser.rb

@@ -29,6 +29,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
@@ -71,7 +72,22 @@ module JMESPath
 
     def nud_expref(stream)
       stream.next
-      Nodes::Expression.new(expr(stream, 2))
+      Nodes::Expression.new(expr(stream, Token::BINDING_POWER[:expref]))
+    end
+
+    def nud_not(stream)
+      stream.next
+      Nodes::Not.new(expr(stream, Token::BINDING_POWER[:not]))
+    end
+
+    def nud_lparen(stream)
+      stream.next
+      result = expr(stream, 0)
+      if stream.token.type != Lexer::T_RPAREN
+        raise Errors::SyntaxError, 'Unclosed `(`'
+      end
+      stream.next
+      result
     end
 
     def nud_filter(stream)
@@ -142,7 +158,7 @@ module JMESPath
     def led_comparator(stream, left)
       token = stream.token
       stream.next
-      right = expr(stream)
+      right = expr(stream, Token::BINDING_POWER[:comparator])
       Nodes::Comparator.create(token.value, left, right)
     end
 
@@ -189,7 +205,11 @@ module JMESPath
 
     def led_lparen(stream, left)
       args = []
-      name = left.name
+      if Nodes::Function::FunctionName === left
+        name = left.name
+      else
+        raise Errors::SyntaxError, 'invalid function invocation'
+      end
       stream.next
       while stream.token.type != :rparen
         args << expr(stream, 0)
@@ -198,7 +218,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)
@@ -207,6 +227,12 @@ module JMESPath
       Nodes::Or.new(left, right)
     end
 
+    def led_and(stream, left)
+      stream.next
+      right = expr(stream, Token::BINDING_POWER[:or])
+      Nodes::And.new(left, right)
+    end
+
     def led_pipe(stream, left)
       stream.next
       right = expr(stream, Token::BINDING_POWER[:pipe])

data/lib/jmespath/runtime.rb

@@ -3,7 +3,7 @@ module JMESPath
   class Runtime
 
     # @api private
-    DEFAULT_PARSER = CachingParser.new
+    DEFAULT_PARSER = CachingParser
 
     # Constructs a new runtime object for evaluating JMESPath expressions.
     #
@@ -35,6 +35,11 @@ module JMESPath
     #   caching parser will be used. When `true`, a shared instance of
     #   {CachingParser} is used.  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,CachingParser] :parser
     #
     def initialize(options = {})
@@ -58,7 +63,7 @@ module JMESPath
       if options[:cache_expressions] == false
         Parser.new(options)
       else
-        DEFAULT_PARSER
+        DEFAULT_PARSER.new(options)
       end
     end
 

data/lib/jmespath/token.rb

@@ -18,12 +18,14 @@ module JMESPath
       Lexer::T_EXPREF            => 0,
       Lexer::T_COLON             => 0,
       Lexer::T_PIPE              => 1,
-      Lexer::T_COMPARATOR        => 2,
-      Lexer::T_OR                => 5,
-      Lexer::T_FLATTEN           => 6,
+      Lexer::T_OR                => 2,
+      Lexer::T_AND               => 3,
+      Lexer::T_COMPARATOR        => 5,
+      Lexer::T_FLATTEN           => 9,
       Lexer::T_STAR              => 20,
       Lexer::T_FILTER            => 21,
       Lexer::T_DOT               => 40,
+      Lexer::T_NOT               => 45,
       Lexer::T_LBRACE            => 50,
       Lexer::T_LBRACKET          => 55,
       Lexer::T_LPAREN            => 60,

data/lib/jmespath/util.rb

@@ -0,0 +1,22 @@
+module JMESPath
+  # @api private
+  module Util
+    class << self
+
+      # Determines if a value is false as defined by JMESPath:
+      #
+      #   https://github.com/jmespath/jmespath.site/blob/master/docs/proposals/improved-filters.rst#and-expressions-1
+      #
+      def falsey?(value)
+        value.nil? ||
+        value === false ||
+        value == '' ||
+        value == {} ||
+        value == [] ||
+        (value.respond_to?(:entries) && value.entries.compact.empty?)
+        # final case necessary to support Enumerable and Struct
+      end
+
+    end
+  end
+end

data/lib/jmespath/version.rb

@@ -1,3 +1,3 @@
 module JMESPath
-  VERSION = '1.1.3'
+  VERSION = '1.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: '1.2'
 platform: ruby
 authors:
 - Trevor Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
-dependencies: []
+date: 2016-03-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: Implements JMESPath for Ruby
 email: trevorrowe@gmail.com
 executables: []
@@ -22,6 +36,7 @@ files:
 - lib/jmespath/errors.rb
 - lib/jmespath/lexer.rb
 - lib/jmespath/nodes.rb
+- lib/jmespath/nodes/and.rb
 - lib/jmespath/nodes/comparator.rb
 - lib/jmespath/nodes/condition.rb
 - lib/jmespath/nodes/current.rb
@@ -33,6 +48,7 @@ files:
 - lib/jmespath/nodes/literal.rb
 - lib/jmespath/nodes/multi_select_hash.rb
 - lib/jmespath/nodes/multi_select_list.rb
+- lib/jmespath/nodes/not.rb
 - lib/jmespath/nodes/or.rb
 - lib/jmespath/nodes/pipe.rb
 - lib/jmespath/nodes/projection.rb
@@ -42,6 +58,7 @@ files:
 - lib/jmespath/runtime.rb
 - lib/jmespath/token.rb
 - lib/jmespath/token_stream.rb
+- lib/jmespath/util.rb
 - lib/jmespath/version.rb
 homepage: http://github.com/trevorrowe/jmespath.rb
 licenses: