jsonpath 0.5.1 → 0.5.2

data/bin/jsonpath

@@ -16,9 +16,7 @@ usage unless ARGV[0]
 jsonpath = JsonPath.new(ARGV[0])
 case ARGV[1]
 when nil #stdin
-  until STDIN.eof?
-    puts MultiJson.encode(jsonpath.on(MultiJson.decode(STDIN.readline)))
-  end
+  puts MultiJson.encode(jsonpath.on(MultiJson.decode(STDIN.read)))
 when String
   puts MultiJson.encode(jsonpath.on(MultiJson.decode(File.exist?(ARGV[1]) ? File.read(ARGV[1]) : ARGV[1])))
-end
+end

data/lib/jsonpath.rb

@@ -20,7 +20,7 @@ class JsonPath
         @path << token
       elsif token = scanner.scan(/@/)
         @path << token
-      elsif token = scanner.scan(/[a-zA-Z0-9_]+/)
+      elsif token = scanner.scan(/[a-zA-Z0-9_-]+/)
         @path << "['#{token}']"
       elsif token = scanner.scan(/'(.*?)'/)
         @path << "[#{token}]"

data/lib/jsonpath/enumerable.rb

@@ -99,10 +99,15 @@ class JsonPath
       if exp.nil?
         default
       elsif exp[0] == ?(
-        #p @_current_node
-        #p exp.gsub(/@/, '@_current_node')
-        #p eval(exp.gsub(/@/, '@_current_node'))
-        allow_eval? ? @_current_node && eval(exp.gsub(/@/, '@_current_node')) : nil
+        return nil unless allow_eval? && @_current_node
+        match_result = /@\.(\p{Word}+)/.match(exp) || []
+        identifier = match_result[1]
+        # if there's no such method - convert into hash subscript
+        if !identifier.nil? && !@_current_node.methods.include?(identifier.to_sym)
+          return eval(exp.gsub(/@/, '@_current_node').gsub(/.#{identifier}/,"['#{identifier}']"))
+        end
+        # otherwise eval as is
+        eval(exp.gsub(/@/, '@_current_node'))
       elsif exp.empty?
         default
       else

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/test/test_jsonpath.rb

@@ -62,6 +62,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [@object['store']['bicycle']['catalogue_number']], JsonPath.new('$.store.bicycle.catalogue_number').on(@object)
   end
 
+  def test_path_with_hyphens
+     assert_equal [@object['store']['bicycle']['single-speed']], JsonPath.new('$.store.bicycle.single-speed').on(@object)
+  end
+
   def test_paths_with_numbers
     assert_equal [@object['store']['bicycle']['2seater']], JsonPath.new('$.store.bicycle.2seater').on(@object)
   end
@@ -75,7 +79,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_counting
-    assert_equal 30, JsonPath.new('$..*').on(@object).to_a.size
+    assert_equal 31, JsonPath.new('$..*').on(@object).to_a.size
   end
 
   def test_space_in_path
@@ -126,6 +130,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal @object['store']['book'].collect{|e| e['price']}, JsonPath.on(@object, '$..book[*].price')
   end
 
+  def test_support_filter_by_childnode_value
+    assert_equal [@object['store']['book'][3]], JsonPath.new("$..book[?(@.price > 20)]").on(@object)
+  end
+
   def example_object
     { "store"=> {
       "book" => [
@@ -156,6 +164,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
       "color"=> "red",
       "price"=> 20,
       "catalogue_number" => 12345,
+      "single-speed" => "no",
       "2seater" => "yes"}
     } }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4414844720981211301
+      hash: 2086024960613292474
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: