jsonpath 0.3.2 → 0.3.3

data/README.md

@@ -45,4 +45,6 @@ As well, you can include it as a library.
       break price if price < 15.0
     end
     # => 8.95
-~~~~~
+~~~~~
+
+You can optionally prevent eval from being called on sub-expressions by passing in :allow_eval => false to the constructor.

data/lib/jsonpath.rb

@@ -6,7 +6,8 @@ class JsonPath
 
   attr_reader :path
 
-  def initialize(path)
+  def initialize(path, opts = nil)
+    @opts = opts
     scanner = StringScanner.new(path)
     @path = []
     bracket_count = 0
@@ -53,11 +54,11 @@ class JsonPath
   end
 
   def enum_on(object)
-    JsonPath::Enumerable.new(self, object)
+    JsonPath::Enumerable.new(self, object, @opts)
   end
 
-  def self.on(object, path)
-    self.new(path).on(object)
+  def self.on(object, path, opts = nil)
+    self.new(path, opts).on(object)
   end
 
 end

data/lib/jsonpath/enumerable.rb

@@ -2,58 +2,77 @@ class JsonPath
   class Enumerable
     include ::Enumerable
 
-    def initialize(path, object)
-      @path, @object = path.path, object
+    def initialize(path, object, options = nil)
+      @path, @object, @options = path.path, object, options
     end
 
     def each(node = @object, pos = 0, &blk)
-      if pos == @path.size
-        return blk.call(node)
-      else
-        case expr = @path[pos]
-        when '*', '..'
-          each(node, pos + 1, &blk)
-        when '$'
-          each(node, pos + 1, &blk) if node == @object
-        when '@'
-          each(node, pos + 1, &blk)
-        when /^\[(.*)\]$/
-          expr[1,expr.size - 2].split(',').each do |sub_path|
-            case sub_path[0]
-            when ?', ?"
-              if node.is_a?(Hash)
-                key = sub_path[1,sub_path.size - 2]
-                each(node[key], pos + 1, &blk) if node.key?(key)
-              end
-            when ??
-              (node.is_a?(Hash) ? node.keys : (0..node.size)).each do |e|
-                subenum = ::JsonPath.new(sub_path[2,sub_path.size - 3]).on(node[e])
-                each(node[e], pos + 1, &blk) if subenum.any?{|n| true}
-              end
-            else
-              if node.is_a?(Array)
-                @obj = node
-                array_args = sub_path.gsub('@','@obj').split(':')
-                start_idx = (array_args[0] && eval(array_args[0]) || 0) % node.size
-                end_idx = (array_args[1] && eval(array_args[1]) || (sub_path.count(':') == 0 ? start_idx : -1)) % node.size
-                step = array_args[2] && eval(array_args[2]) || 1
-                (start_idx..end_idx).step(step) {|i| each(node[i], pos + 1, &blk)}
-              end
+      return blk.call(node) if pos == @path.size
+      case expr = @path[pos]
+      when '*', '..'
+        each(node, pos + 1, &blk)
+      when '$'
+        each(node, pos + 1, &blk) if node == @object
+      when '@'
+        each(node, pos + 1, &blk)
+      when /^\[(.*)\]$/
+        expr[1,expr.size - 2].split(',').each do |sub_path|
+          case sub_path[0]
+          when ?', ?"
+            if node.is_a?(Hash)
+              key = sub_path[1,sub_path.size - 2]
+              each(node[key], pos + 1, &blk) if node.key?(key)
+            end
+          when ??
+            (node.is_a?(Hash) ? node.keys : (0..node.size)).each do |e|
+              subenum = ::JsonPath.new(sub_path[2, sub_path.size - 3]).on(node[e])
+              each(node[e], pos + 1, &blk) if subenum.any?{|n| true}
+            end
+          else
+            if node.is_a?(Array)
+              @obj = node
+              array_args = sub_path.gsub('@','@obj').split(':')
+              start_idx = process_function_or_literal(array_args[0], 0)
+              next unless start_idx
+              start_idx %= node.size
+              end_idx = (array_args[1] && process_function_or_literal(array_args[1], -1) || (sub_path.count(':') == 0 ? start_idx : -1))
+              next unless end_idx
+              end_idx %= node.size
+              step = process_function_or_literal(array_args[2], 1)
+              next unless step
+              (start_idx..end_idx).step(step) {|i| each(node[i], pos + 1, &blk)}
             end
           end
-        else
-          blk.call(node) if pos == (@path.size - 1) && node && eval("node #{@path[pos]}")
         end
+      else
+        blk.call(node) if pos == (@path.size - 1) && node && allow_eval? && eval("node #{@path[pos]}")
+      end
 
-        if pos > 0 && @path[pos-1] == '..'
-          case node
-          when Hash
-            node.values.each {|n| each(n, pos, &blk) }
-          when Array
-            node.each {|n| each(n, pos, &blk) }
-          end
+      if pos > 0 && @path[pos-1] == '..'
+        case node
+        when Hash
+          node.values.each {|n| each(n, pos, &blk) }
+        when Array
+          node.each {|n| each(n, pos, &blk) }
         end
       end
     end
+
+    private
+    def process_function_or_literal(exp, default)
+      if exp.nil?
+        default
+      elsif exp[0] == ?(
+        allow_eval? ? eval(exp) : nil
+      elsif exp.empty?
+        default
+      else
+        Integer(exp)
+      end
+    end
+
+    def allow_eval?
+      @options.nil? || @options[:allow_eval] != false
+    end
   end
 end

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/test/test_jsonpath.rb

@@ -29,8 +29,8 @@ class TestJsonpath < MiniTest::Unit::TestCase
     "bicycle"=> {
       "color"=> "red",
       "price"=> 19.95,
-      "catalogue_number" => 12345,
-    } } }
+      "catalogue_number" => 12345 }
+    } }
   end
 
   def test_lookup_direct_path
@@ -72,6 +72,11 @@ class TestJsonpath < MiniTest::Unit::TestCase
   def test_recognize_filters
     assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new("$..book[?(@['isbn'])]").on(@object)
     assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] < 10)]").on(@object)
+    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new("$..book[?(@.isbn)]").on(@object)
+  end
+
+  def test_no_eval
+    assert_equal [], JsonPath.new('$..book[(@.length-2)]', :allow_eval => false).on(@object)
   end
   
   def test_paths_with_underscores

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonpath
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -07:00
+date: 2011-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency