jmespath 0.2.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dbe0a2b46b3a401846035f1c310a6d9e3e90aeb
-  data.tar.gz: c25be88050e43b57d065b976cce0fd6b6eebcff0
+  metadata.gz: cd9b114d1de9308e2c28037ebf5664841fa60524
+  data.tar.gz: 2169a15d13d0ece59efe976b9e1d2da0f5d34aa5
 SHA512:
-  metadata.gz: bea4a7c9e7d4013eefb09b186e30c8012d44ebf56fed7611cb5df19ee533e0a0b9b183bc031268e224d36b7c2afb96a4ff092cc8db22ba5d4e295169ee8afe7c
-  data.tar.gz: f94c1a2a49ee75d6f86a345d0ac2f31d799c407e376697302ed29814d5733b3612ba822b1151b2f19bba9814eb95e9f175e7b75ba399a5ba629d3d5af5eb35d7
+  metadata.gz: 7bfe1d21d8aa9c7e05ba61e600b0f9fce2af250d61058807599bff87ee196ecd62343c288eae5926eb57b6f4456d8916a45adc9c55bf8b25b562c9b0b74909bf
+  data.tar.gz: 1396c1b380fc0a5fca6130bc2fb2b4b092c2d789948e015d642cbc884b665acd5906e362073c5cd680704ce14645ab0546f0f8f1d83a66539f13890d59374c27

data/lib/jmespath.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module JMESPath
 
   autoload :Errors, 'jmespath/errors'
@@ -12,12 +14,26 @@ module JMESPath
 
   class << self
 
-    # @param [String<JMESPath>] expression
+
+    # @param [String] expression A valid
+    #   [JMESPath](https://github.com/boto/jmespath) expression.
     # @param [Hash] data
-    # @return [Mixed,nil]
+    # @return [Mixed,nil] Returns the matched values. Returns `nil` if the
+    #   expression does not resolve inside `data`.
     def search(expression, data)
+      data = case data
+        when Hash, Struct then data # check for most common case first
+        when Pathname then load_json(data)
+        when IO, StringIO then MultiJson.load(data.read)
+        else data
+        end
       Runtime.new.search(expression, data)
     end
 
+    # @api private
+    def load_json(path)
+      MultiJson.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
+    end
+
   end
 end

data/lib/jmespath/lexer.rb

@@ -1,5 +1,3 @@
-require 'multi_json'
-
 module JMESPath
   # @api private
   class Lexer

data/lib/jmespath/parser.rb

@@ -25,7 +25,6 @@ module JMESPath
     # @param [String<JMESPath>] expression
     def parse(expression)
       stream = TokenStream.new(expression, @lexer.tokenize(expression))
-      #puts "\n" + stream.inspect + "\n\n"
       result = expr(stream)
       if stream.token.type != :eof
         raise Errors::SyntaxError, "expected :eof got #{stream.token.type}"
@@ -48,10 +47,8 @@ module JMESPath
     # @param [TokenStream] stream
     # @param [Integer] rbp Right binding power
     def expr(stream, rbp = 0)
-      #puts "nud_#{stream.token.type}"
       left = send("nud_#{stream.token.type}", stream)
       while rbp < stream.token.binding_power
-      #puts "#{rbp} #{stream.token.binding_power} led_#{stream.token.type}"
         left = send("led_#{stream.token.type}", stream, left)
       end
       left

data/lib/jmespath/runtime.rb

@@ -1,7 +1,14 @@
+require 'thread'
+
 module JMESPath
   # @api private
   class Runtime
 
+    # @api private
+    CACHE = {}
+
+    MUTEX = Mutex.new
+
     # @option options [Parser] :parser
     # @option options [Interpreter] :interpreter
     def initialize(options = {})
@@ -13,7 +20,26 @@ module JMESPath
     # @param [Hash] data
     # @return [Mixed,nil]
     def search(expression, data)
-      @interpreter.visit(@parser.parse(expression), data)
+      @interpreter.visit(parse(expression), data)
+    end
+
+    private
+
+    def parse(expression)
+      if CACHE[expression]
+        CACHE[expression]
+      else
+        MUTEX.synchronize { CACHE[expression] = @parser.parse(expression) }
+      end
+    end
+
+    class << self
+
+      # @api private
+      def clear_cache
+        MUTEX.synchronize { CACHE.clear }
+      end
+
     end
 
   end

data/lib/jmespath/tree_interpreter.rb

@@ -21,17 +21,18 @@ module JMESPath
       case node[:type]
 
       when :field
-        if hash_like?(value)
-          value[node[:key]]
-        else
-          nil
+        key = node[:key]
+        case value
+        when Hash then value.key?(key) ? value[key] : value[key.to_sym]
+        when Struct then value[key]
+        else nil
         end
 
       when :subexpression
         dispatch(node[:children][1], dispatch(node[:children][0], value))
 
       when :index
-        if array_like?(value)
+        if Array === value
           value[node[:index]]
         else
           nil
@@ -46,7 +47,7 @@ module JMESPath
           projection(left.values, node)
         elsif node[:from] == :object && left == []
           projection(left, node)
-        elsif node[:from] == :array && array_like?(left)
+        elsif node[:from] == :array && Array === left
           projection(left, node)
         else
           nil
@@ -54,9 +55,9 @@ module JMESPath
 
       when :flatten
         value = dispatch(node[:children][0], value)
-        if array_like?(value)
+        if Array === value
           value.inject([]) do |values, v|
-            values + (array_like?(v) ? v : [v])
+            values + (Array === v ? v : [v])
           end
         else
           nil
@@ -132,10 +133,6 @@ module JMESPath
       Hash === value || Struct === value
     end
 
-    def array_like?(value)
-      Array === value
-    end
-
     def projection(values, node)
       values.inject([]) do |list, v|
         list << dispatch(node[:children][1], v)
@@ -292,7 +289,7 @@ module JMESPath
         value = args.first
         if hash_like?(value)
           value.values
-        elsif array_like?(value)
+        elsif Array === value
           value
         else
           raise Errors::InvalidTypeError, "function values() expects an array or a hash"
@@ -308,7 +305,7 @@ module JMESPath
         values = args[1]
         if !(String === glue)
           raise Errors::InvalidTypeError, "function join() expects the first argument to be a string"
-        elsif array_like?(values) && values.all? { |v| String === v }
+        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"
@@ -341,7 +338,7 @@ module JMESPath
     end
 
     def function_sum(*args)
-      if args.count == 1 && array_like?(args.first)
+      if args.count == 1 && Array === args.first
         args.first.inject(0) do |sum,n|
           if Numeric === n
             sum + n
@@ -365,7 +362,7 @@ module JMESPath
     def function_sort(*args)
       if args.count == 1
         value = args.first
-        if array_like?(value)
+        if Array === value
           value.sort do |a, b|
             a_type = get_type(a)
             b_type = get_type(b)
@@ -437,7 +434,7 @@ module JMESPath
     end
 
     def function_slice(values, *args)
-      if String === values || array_like?(values)
+      if String === values || Array === values
         _slice(values, *args)
       else
         nil
@@ -514,7 +511,7 @@ module JMESPath
       when ExprNode === value then 'expression'
       when String === value then 'string'
       when hash_like?(value) then 'object'
-      when array_like?(value) then 'array'
+      when Array === value then 'array'
       when [true, false].include?(value) then 'boolean'
       when value.nil? then 'null'
       when Numeric === value then 'number'

data/lib/jmespath/version.rb

@@ -1,3 +1,3 @@
 module JMESPath
-  VERSION = '0.2.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmespath
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Trevor Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json