jsonpath 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 127831bc4a7219000b806933626b26c2b9b80bc6
-  data.tar.gz: bd1962f8d0359b92bef9d0cf907c313ff0178089
+  metadata.gz: 0605409a770fbb28dd1352fa92753e7707d0df96
+  data.tar.gz: ed5e1e0c2fc22721d9d9a71ca5ec97f15e07bfe5
 SHA512:
-  metadata.gz: ff10144fa37514160843c0e62f4a0775795cf18705805cc0beff2ea6b24178d80e22cbd4b486deda1c6d65a4afa1027c1c501797a6bb3f8cd56e5ff34b547d3d
-  data.tar.gz: d1fe3eda2c940d8f047322cec32dcb0a0777a2fe6c90257c6ff07b4fbeba89181cdbf39b2cd169dc9e6aa60c510884d04d4c0ef05b3629884db7d695494573a8
+  metadata.gz: d3471d1c6ffdd79d987edf7772c945b2c5c74cd614086cc49e57588d47c6135310fd9ca6660c0e5e711521c9863b189de1067c8656165d46bf266eb2522a9491
+  data.tar.gz: 091adbef8dc29e30172d0016cf67e6035af094426fd405a45fff52e0292b45340f1aab1804b5291f918b0916fe2f02b252cb8fa2d97e2ee13dcd330645ac9cf8

data/lib/jsonpath/enumerable.rb

@@ -104,19 +104,27 @@ class JsonPath
         default
       elsif exp[0] == ?(
         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)
-          exp_to_eval = exp.gsub(/@/, '@_current_node').gsub(/@_current_node.#{identifier}/,"@_current_node['#{identifier}']")
+        identifiers = /@?(\.(\w+))+/.match(exp)
+
+        if !identifiers.nil? && !@_current_node.methods.include?(identifiers[2].to_sym)
+          exp_to_eval = exp.dup
+          exp_to_eval[identifiers[0]] = identifiers[0].split('.').map{|el| el == '@' ? '@_current_node' : "['#{el}']"}.join
           begin
             return eval(exp_to_eval)
           rescue StandardError # if eval failed because of bad arguments or missing methods
             return default
           end
         end
+
         # otherwise eval as is
-        eval(exp.gsub(/@/, '@_current_node'))
+        # TODO: this eval is wrong, because hash accessor could be nil and nil cannot be compared with anything,
+        # for instance, @_current_node['price'] - we can't be sure that 'price' are in every node, but it's only in several nodes
+        # I wrapped this eval into rescue returning false when error, but this eval should be refactored.
+        begin
+          eval(exp.gsub(/@/, '@_current_node'))
+        rescue
+          false
+        end
       elsif exp.empty?
         default
       else

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

data/test/test_jsonpath.rb

@@ -15,7 +15,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_lookup_direct_path
-    assert_equal 4, JsonPath.new('$.store.*').on(@object).first['book'].size
+    assert_equal 7, JsonPath.new('$.store.*').on(@object).first['book'].size
   end
 
   def test_lookup_missing_element
@@ -27,7 +27,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
       @object['store']['book'][0]['author'],
       @object['store']['book'][1]['author'],
       @object['store']['book'][2]['author'],
-      @object['store']['book'][3]['author']
+      @object['store']['book'][3]['author'],
+      @object['store']['book'][4]['author'],
+      @object['store']['book'][5]['author'],
+      @object['store']['book'][6]['author']
     ], JsonPath.new('$..author').on(@object)
   end
 
@@ -43,15 +46,15 @@ class TestJsonpath < MiniTest::Unit::TestCase
 
   def test_recognize_array_splices
     assert_equal [@object['store']['book'][0], @object['store']['book'][1]], JsonPath.new('$..book[0:1:1]').on(@object)
-    assert_equal [@object['store']['book'][1], @object['store']['book'][3]], JsonPath.new('$..book[1::2]').on(@object)
-    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new('$..book[::2]').on(@object)
-    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new('$..book[:-2:2]').on(@object)
-    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new('$..book[2::]').on(@object)
+    assert_equal [@object['store']['book'][1], @object['store']['book'][3], @object['store']['book'][5]], JsonPath.new('$..book[1::2]').on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2], @object['store']['book'][4], @object['store']['book'][6]], JsonPath.new('$..book[::2]').on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new('$..book[:-5:2]').on(@object)
+    assert_equal [@object['store']['book'][5], @object['store']['book'][6]], JsonPath.new('$..book[5::]').on(@object)
   end
 
   def test_recognize_array_comma
     assert_equal [@object['store']['book'][0], @object['store']['book'][1]], JsonPath.new('$..book[0,1]').on(@object)
-    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new('$..book[2,-1::]').on(@object)
+    assert_equal [@object['store']['book'][2], @object['store']['book'][6]], JsonPath.new('$..book[2,-1::]').on(@object)
   end
 
   def test_recognize_filters
@@ -84,15 +87,15 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_recognize_array_with_evald_index
-    assert_equal [@object['store']['book'][2]], JsonPath.new('$..book[(@.length-2)]').on(@object)
+    assert_equal [@object['store']['book'][2]], JsonPath.new('$..book[(@.length-5)]').on(@object)
   end
 
   def test_use_first
-    assert_equal @object['store']['book'][2], JsonPath.new('$..book[(@.length-2)]').first(@object)
+    assert_equal @object['store']['book'][2], JsonPath.new('$..book[(@.length-5)]').first(@object)
   end
 
   def test_counting
-    assert_equal 31, JsonPath.new('$..*').on(@object).to_a.size
+    assert_equal 49, JsonPath.new('$..*').on(@object).to_a.size
   end
 
   def test_space_in_path
@@ -144,7 +147,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_wildcard
-    assert_equal @object['store']['book'].collect{|e| e['price']}, JsonPath.on(@object, '$..book[*].price')
+    assert_equal @object['store']['book'].collect{|e| e['price']}.compact, JsonPath.on(@object, '$..book[*].price')
   end
 
   def test_wildcard_empty_array
@@ -165,6 +168,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [23], JsonPath.new("$..book[?(@.price > 20)].price").on(@object)
   end
 
+  def test_support_filter_by_childnode_value_over_childnode_and_select_child_key
+    assert_equal ["Osennie Vizity"], JsonPath.new("$..book[?(@.written.year == 1996)].title").on(@object)
+  end
+  
   def example_object
     { "store"=> {
       "book" => [
@@ -189,6 +196,27 @@ class TestJsonpath < MiniTest::Unit::TestCase
           "title"=> "The Lord of the Rings",
           "isbn"=> "0-395-19395-8",
           "price"=> 23
+        },
+        { "category"=> "russian_fiction",
+          "author"=> "Lukyanenko",
+          "title"=> "Imperatory Illuziy",
+          "written" => {
+              "year" => 1995
+          }
+        },
+        { "category"=> "russian_fiction",
+          "author"=> "Lukyanenko",
+          "title"=> "Osennie Vizity",
+          "written" => {
+              "year" => 1996
+          }
+        },
+        { "category"=> "russian_fiction",
+          "author"=> "Lukyanenko",
+          "title"=> "Ne vremya dlya drakonov",
+          "written" => {
+              "year" => 1997
+          }
         }
       ],
     "bicycle"=> {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json