jsonpath 0.8.12 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9338212edfe2ba8589ef826b3443fb7dcfdc3112
-  data.tar.gz: b5e09641428a77416aa455ec0450f0730abe86b4
+  metadata.gz: 02b522c0db894285a626b8e1d6d44a95140d5a03
+  data.tar.gz: 1f4176316390136b0d229627bf3965f4b4ae1c44
 SHA512:
-  metadata.gz: ce08bd8da4e3240d613d589400d32219563c76afb376e46967258afb6000e00a924e8480ee2f934da4696ef2b34eb52f1409a5b8ecc0b80ed523d6f44dc990b5
-  data.tar.gz: ccbbce4a9e02ad37c2f70ffa16a40a6667d3df00a57be835493589b3c0903efd0d8105e9e56032b2d232235b6d59955dff6281e02f718ffd528abeb8871a8b1c
+  metadata.gz: 7f4e322af2377394c35ca7fa5fb03f3f3df63ed815eb064d33c6a4e96064ad872a3fc58a3462ecffa4f733d7444d484abb4a454e4b0bb75dbea1cce0f3ad57be
+  data.tar.gz: 72110c129177b94eb9572bc4dd288dfe6bd8025f00db6c71ef4b384b0122f9ba6d373c7305fce7c6e477b50a524fc2b921c33bd95eb01877c752758a074d7378

data/lib/jsonpath/enumerable.rb

@@ -36,13 +36,14 @@ class JsonPath
       expr[1, expr.size - 2].split(',').each do |sub_path|
         case sub_path[0]
         when '\'', '"'
-          next unless node.is_a?(Hash)
-          k = sub_path[1, sub_path.size - 2]
-          each(node, k, pos + 1, &blk) if node.key?(k)
+          if node.is_a?(Hash)
+            k = sub_path[1, sub_path.size - 2]
+            each(node, k, pos + 1, &blk) if node.key?(k)
+          end
         when '?'
           handle_question_mark(sub_path, node, pos, &blk)
         else
-          next unless node.is_a?(Array) && !node.empty?
+          next if node.is_a?(Array) && node.empty?
           array_args = sub_path.split(':')
           if array_args[0] == '*'
             start_idx = 0
@@ -65,19 +66,13 @@ class JsonPath
 
     def handle_question_mark(sub_path, node, pos, &blk)
       case node
-      when Array
-        node.size.times do |index|
-          @_current_node = node[index]
-          # exps = sub_path[1, sub_path.size - 1]
-          # if @_current_node.send("[#{exps.gsub(/@/, '@_current_node')}]")
+      when Hash, Array
+        (node.is_a?(Hash) ? node.keys : (0..node.size)).each do |e|
+          @_current_node = node[e]
           if process_function_or_literal(sub_path[1, sub_path.size - 1])
             each(@_current_node, nil, pos + 1, &blk)
           end
         end
-      when Hash
-        if process_function_or_literal(sub_path[1, sub_path.size - 1])
-          each(@_current_node, nil, pos + 1, &blk)
-        end
       else
         yield node if process_function_or_literal(sub_path[1, sub_path.size - 1])
       end
@@ -111,7 +106,7 @@ class JsonPath
       return nil unless @_current_node
 
       identifiers = /@?((?<!\d)\.(?!\d)(\w+))+/.match(exp)
-      unless identifiers.nil? || @_current_node.methods.include?(identifiers[2].to_sym)
+      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 do |el|
           el == '@' ? '@' : "['#{el}']"

data/lib/jsonpath/parser.rb

@@ -46,14 +46,17 @@ class JsonPath
         end
       end
 
-      el = dig(elements, @_current_node)
+      if elements.empty?
+        el = @_current_node
+      else
+        el = dig(elements, @_current_node)
+      end
       return false if el.nil?
       return true if operator.nil? && el
 
       el = Float(el) rescue el
       operand = Float(operand) rescue operand
       operand = false if operand == 'false' && el == false
-
       el.send(operator.strip, operand)
     end
 
@@ -61,7 +64,7 @@ class JsonPath
 
     # @TODO: Remove this once JsonPath no longer supports ruby versions below 2.3
     def dig(keys, hash)
-      return hash unless hash.is_a? Hash
+      return nil unless hash.is_a? Hash
       return nil unless hash.key?(keys.first)
       return hash.fetch(keys.first) if keys.size == 1
       prev = keys.shift

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.8.12'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/test/test_jsonpath.rb

@@ -245,8 +245,8 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'id' => '123'
       }
     }
-    assert_equal [{ 'type' => 'users', 'id' => '123' }], JsonPath.new("$.data[?(@.type == 'users')]").on(data)
-    assert_equal [], JsonPath.new("$.data[?(@.type == 'admins')]").on(data)
+    assert_equal [{ 'type' => 'users', 'id' => '123' }], JsonPath.new("$.[?(@.type == 'users')]").on(data)
+    assert_equal [], JsonPath.new("$.[?(@.type == 'admins')]").on(data)
   end
 
   def test_support_at_sign_in_member_names
@@ -270,9 +270,11 @@ class TestJsonpath < MiniTest::Unit::TestCase
 
   def test_slash_in_value
     data = {
-      'data' => {
-        'type' => 'mps/awesome'
-      }
+      'data' => [{
+        'type' => 'mps/awesome',
+      },{
+        'type' => 'not',
+      }]
     }
     assert_equal [{ 'type' => 'mps/awesome' }], JsonPath.new("$.data[?(@.type == \"mps/awesome\")]").on(data)
   end
@@ -283,7 +285,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'type' => 0.00001
       }
     }
-    assert_equal [{"type"=>0.00001}], JsonPath.new("$.data[?(@.type == 0.00001)]").on(data)
+    assert_equal [{"type"=>0.00001}], JsonPath.new("$.[?(@.type == 0.00001)]").on(data)
   end
 
   def test_digits_only_string
@@ -293,6 +295,19 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'id' => '123'
       }
     }
+    assert_equal([{"type"=>"users", "id"=>"123"}], JsonPath.new("$.[?(@.id == '123')]").on(data))
+  end
+
+  def test_digits_only_string_in_array
+    data = {
+      'foo' => [{
+        'type' => 'users',
+        'id' => '123'
+      },{
+        'type' => 'users',
+        'id' => '321'
+      }]
+    }
     assert_equal([{"type"=>"users", "id"=>"123"}], JsonPath.new("$.foo[?(@.id == '123')]").on(data))
   end
 
@@ -366,7 +381,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'number' => '(492) 080-3961'
       }
     }
-    assert_equal [{'number'=>'(492) 080-3961'}], JsonPath.new("$.data[?(@.number == '(492) 080-3961')]").on(data)
+    assert_equal [{'number'=>'(492) 080-3961'}], JsonPath.new("$.[?(@.number == '(492) 080-3961')]").on(data)
   end
 
 
@@ -452,6 +467,26 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal 'C09C598QL', JsonPath.on(json, "$..channels[?(@.is_archived)].id")[0]
   end
 
+  def test_regression_4
+    json = {
+      ok: true,
+      channels: [
+        {
+          id: 'C09C5GYHF',
+          name: 'general',
+          is_archived: false
+        },
+        {
+          id: 'C09C598QL',
+          name: 'random',
+          is_archived: true
+        }
+      ]
+    }.to_json
+
+    assert_equal ['C09C5GYHF'], JsonPath.on(json, "$..[?(@.name == 'general')].id")
+  end
+
   def test_regression_5
     json = {
       ok: true,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.0
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json