jsonpath 0.3.3 → 0.4.0

data/README.md

@@ -47,4 +47,10 @@ As well, you can include it as a library.
     # => 8.95
 ~~~~~
 
-You can optionally prevent eval from being called on sub-expressions by passing in :allow_eval => false to the constructor.
+You can optionally prevent eval from being called on sub-expressions by passing in :allow_eval => false to the constructor.
+
+If you'd like to do substitution in a json object, do this:
+    JsonPath.for({'test' => 'time'}).gsub('$..test') {|v| v << v}
+
+The result will be
+    {'test' => 'timetime'}

data/bin/jsonpath

@@ -1,7 +1,7 @@
 #!/usr/local/env ruby
 
 require 'jsonpath'
-require 'json'
+require 'yajl'
 
 def usage
   puts "jsonpath [expression] (file|string)
@@ -17,8 +17,8 @@ jsonpath = JsonPath.new(ARGV[0])
 case ARGV[1]
 when nil #stdin
   until STDIN.eof?
-    puts jsonpath.on(JSON.parse(STDIN.readline)).to_a.to_json
+    puts Yajl::Encoder.encode(jsonpath.on(Yajl::Parser.parse(STDIN.readline)))
   end
 when String
-  puts jsonpath.on(JSON.parse(File.exist?(ARGV[1]) ? File.read(ARGV[1]) : ARGV[1])).to_a.to_json
+  puts Yajl::Encoder.encode(jsonpath.on(Yajl::Parser.parse(File.exist?(ARGV[1]) ? File.read(ARGV[1]) : ARGV[1])))
 end

data/jsonpath.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   # dependencies
-  s.add_runtime_dependency 'json'
+  s.add_runtime_dependency 'yajl-ruby'
   s.add_development_dependency 'code_stats'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest', '~> 2.2.0'

data/lib/jsonpath.rb

@@ -1,4 +1,5 @@
 require 'strscan'
+require 'jsonpath/proxy'
 require 'jsonpath/enumerable'
 require 'jsonpath/version'
 
@@ -61,4 +62,7 @@ class JsonPath
     self.new(path, opts).on(object)
   end
 
+  def self.for(obj)
+    Proxy.new(obj)
+  end
 end

data/lib/jsonpath/enumerable.rb

@@ -1,32 +1,37 @@
 class JsonPath
   class Enumerable
     include ::Enumerable
+    attr_reader :allow_eval
+    alias_method :allow_eval?, :allow_eval
 
     def initialize(path, object, options = nil)
       @path, @object, @options = path.path, object, options
+      @allow_eval = @options && @options.key?(:allow_eval) ? @options[:allow_eval] : true
+      @mode = @options && @options[:mode]
     end
 
-    def each(node = @object, pos = 0, &blk)
-      return blk.call(node) if pos == @path.size
+    def each(context = @object, key = nil, pos = 0, &blk)
+      node = key ? context[key] : context
+      return yield_value(blk, context, key) if pos == @path.size
       case expr = @path[pos]
       when '*', '..'
-        each(node, pos + 1, &blk)
+        each(context, key, pos + 1, &blk)
       when '$'
-        each(node, pos + 1, &blk) if node == @object
+        each(context, key, pos + 1, &blk) if node == @object
       when '@'
-        each(node, pos + 1, &blk)
+        each(context, key, 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)
+              k = sub_path[1,sub_path.size - 2]
+              each(node, k, pos + 1, &blk) if node.key?(k)
             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}
+              each(node, e, pos + 1, &blk) if subenum.any?{|n| true}
             end
           else
             if node.is_a?(Array)
@@ -40,25 +45,41 @@ class JsonPath
               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)}
+              (start_idx..end_idx).step(step) {|i| each(node, i, pos + 1, &blk)}
             end
           end
         end
       else
-        blk.call(node) if pos == (@path.size - 1) && node && allow_eval? && eval("node #{@path[pos]}")
+        if pos == (@path.size - 1) && node && allow_eval?
+          if eval("node #{@path[pos]}")
+            yield_value(blk, context, key)
+          end
+        end
       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) }
+        when Hash  then node.each {|k, v| each(node, k, pos, &blk) }
+        when Array then node.each_with_index {|n, i| each(node, i, pos, &blk) }
         end
       end
     end
 
     private
+    def yield_value(blk, context, key)
+      @substitute_with = nil 
+      case @mode
+      when nil
+        blk.call(key ? context[key] : context)
+      when :substitute
+        if key
+          context[key] = blk.call(context[key])
+        else
+          context.replace(blk.call(context[key]))
+        end
+      end
+    end
+
     def process_function_or_literal(exp, default)
       if exp.nil?
         default
@@ -70,9 +91,5 @@ class JsonPath
         Integer(exp)
       end
     end
-
-    def allow_eval?
-      @options.nil? || @options[:allow_eval] != false
-    end
   end
 end

data/lib/jsonpath/proxy.rb

@@ -0,0 +1,25 @@
+class JsonPath
+  class Proxy
+    def initialize(obj)
+      @obj = obj
+    end
+
+    def gsub(path, replacement = nil, &replacement_block)
+      _gsub(deep_copy, path, replacement ? proc{replacement} : replacement_block)
+    end
+
+    def gsub!(path, replacement = nil, &replacement_block)
+      _gsub(@obj, path, replacement ? proc{replacement} : replacement_block)
+    end
+
+    private
+    def deep_copy
+      Marshal::load(Marshal::dump(@obj))
+    end
+
+    def _gsub(obj, path, replacement)
+      JsonPath.new(path, :mode => :substitute).enum_on(obj).each(&replacement)
+      obj
+    end
+  end
+end

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.3.3'
+  VERSION = '0.4.0' unless const_defined?(:VERSION)
 end

data/test/test_jsonpath.rb

@@ -1,40 +1,12 @@
 class TestJsonpath < MiniTest::Unit::TestCase
 
   def setup
-    @object = { "store"=> {
-      "book" => [
-        { "category"=> "reference",
-          "author"=> "Nigel Rees",
-          "title"=> "Sayings of the Century",
-          "price"=> 8.95
-        },
-        { "category"=> "fiction",
-          "author"=> "Evelyn Waugh",
-          "title"=> "Sword of Honour",
-          "price"=> 12.99
-        },
-        { "category"=> "fiction",
-          "author"=> "Herman Melville",
-          "title"=> "Moby Dick",
-          "isbn"=> "0-553-21311-3",
-          "price"=> 8.99
-        },
-        { "category"=> "fiction",
-          "author"=> "J. R. R. Tolkien",
-          "title"=> "The Lord of the Rings",
-          "isbn"=> "0-395-19395-8",
-          "price"=> 22.99
-        }
-      ],
-    "bicycle"=> {
-      "color"=> "red",
-      "price"=> 19.95,
-      "catalogue_number" => 12345 }
-    } }
+    @object = example_object
+    @object2 = example_object
   end
 
   def test_lookup_direct_path
-    assert_equal 4, JsonPath.new('$.store.*').on(@object).to_a.first['book'].size
+    assert_equal 4, JsonPath.new('$.store.*').on(@object).first['book'].size
   end
 
   def test_retrieve_all_authors
@@ -103,4 +75,61 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal JsonPath.new('$..author').on(@object), JsonPath.on(@object, '$..author')
   end
 
+  def test_gsub
+    @object2['store']['bicycle']['price'] += 10
+    @object2['store']['book'][0]['price'] += 10
+    @object2['store']['book'][1]['price'] += 10
+    @object2['store']['book'][2]['price'] += 10
+    @object2['store']['book'][3]['price'] += 10
+    assert_equal @object2, JsonPath.for(@object).gsub('$..price') { |p| p + 10 }
+  end
+
+  def test_gsub!
+    JsonPath.for(@object).gsub!('$..price') { |p| p + 10 }
+    assert_equal 30, @object['store']['bicycle']['price']
+    assert_equal 19, @object['store']['book'][0]['price']
+    assert_equal 23, @object['store']['book'][1]['price']
+    assert_equal 19, @object['store']['book'][2]['price']
+    assert_equal 33, @object['store']['book'][3]['price']
+  end
+
+  def test_weird_gsub!
+    h = {'hi' => 'there'}
+    JsonPath.for(@object).gsub!('$.*') { |n| h }
+    assert_equal h, @object
+  end
+
+  def example_object
+    { "store"=> {
+      "book" => [
+        { "category"=> "reference",
+          "author"=> "Nigel Rees",
+          "title"=> "Sayings of the Century",
+          "price"=> 9
+        },
+        { "category"=> "fiction",
+          "author"=> "Evelyn Waugh",
+          "title"=> "Sword of Honour",
+          "price"=> 13
+        },
+        { "category"=> "fiction",
+          "author"=> "Herman Melville",
+          "title"=> "Moby Dick",
+          "isbn"=> "0-553-21311-3",
+          "price"=> 9
+        },
+        { "category"=> "fiction",
+          "author"=> "J. R. R. Tolkien",
+          "title"=> "The Lord of the Rings",
+          "isbn"=> "0-395-19395-8",
+          "price"=> 23
+        }
+      ],
+    "bicycle"=> {
+      "color"=> "red",
+      "price"=> 20,
+      "catalogue_number" => 12345 }
+    } }
+  end
+
 end

data/test/test_jsonpath_bin.rb

@@ -0,0 +1,21 @@
+class TestJsonpathBin < MiniTest::Unit::TestCase
+  def setup
+    @runner = "ruby -Ilib bin/jsonpath"
+    @original_dir = Dir.pwd
+    Dir.chdir(File.join(File.dirname(__FILE__), '..'))
+  end
+
+  def teardown
+    Dir.chdir(@original_dir)
+    `rm /tmp/test.json`
+  end
+
+  def test_stdin
+    assert_equal '["time"]', `echo '{"test": "time"}' | #{@runner} '$.test'`.strip
+  end
+
+  def test_stdin
+    File.open('/tmp/test.json', 'w'){|f| f << '{"test": "time"}'}
+    assert_equal '["time"]', `#{@runner} '$.test' /tmp/test.json`.strip
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonpath
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -07:00
+date: 2011-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -125,8 +125,10 @@ files:
 - jsonpath.gemspec
 - lib/jsonpath.rb
 - lib/jsonpath/enumerable.rb
+- lib/jsonpath/proxy.rb
 - lib/jsonpath/version.rb
 - test/test_jsonpath.rb
+- test/test_jsonpath_bin.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/jsonpath
 licenses: []