jsonpath 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc2dc97587acd71d6ac7b1d5a2cb178f1ee9938823ef924c12e2213adafea1a
-  data.tar.gz: bc9b02cbc4c0a68329c9a682ed344b544028e27ba3f63f5079824cd536192792
+  metadata.gz: 762aacec760a67a4097f47df701a1cec0f3f524ae016a2b724873c625c25672d
+  data.tar.gz: a3076196bc9d30f4cad3ee9c0ab3d58f9bedef4b7d17d7934e7e930c351ee1c0
 SHA512:
-  metadata.gz: a8834f4fdcd9d1a3ba41f9431297ce87b3cf8da93ef33c0f9cd69f4c3649d1948aa32de0184f00dd157497a5ef5ec459fcfdd6be8987480b337384fcbeb4bd16
-  data.tar.gz: 3e2370e1114d041f108804e33b409e21884d2ebf21d2745fd94b81ce054646538e2f5c4d5889109f166ce8fed1d2f522e02298608bc9e766cce163b690f88f23
+  metadata.gz: 7894391f0693b7ebb3f3d8bca20dcf2eeb54af85e6ca268ff75fe120c64ae5e8ff09fa9a7b82cacbb8a5776d03dfa0f9bcc1f4716eea63988910cbb501d64236
+  data.tar.gz: c0f5c57d5c527a432a1c02fa728e32f8f8a7009efd0a31778b2766d97eba1e752ec1779e2d725fc233731f64541be72c9e896a511f312f8b5e3a4a1ed3e31a8d

data/.gitignore

@@ -3,3 +3,5 @@ Gemfile.lock
 coverage/*
 doc/*
 .yardoc
+.DS_Store
+.idea

data/lib/jsonpath/parser.rb

@@ -46,18 +46,29 @@ class JsonPath
       end
     end
 
-    #  using a scanner break down the individual expressions and determine if
+    # Using a scanner break down the individual expressions and determine if
     # there is a match in the JSON for it or not.
     def parse_exp(exp)
       exp = exp.sub(/@/, '').gsub(/^\(/, '').gsub(/\)$/, '').tr('"', '\'').strip
+      exp.scan(/^\[(\d+)\]/) do |i|
+        next if i.empty?
+
+        index = Integer(i[0])
+        raise ArgumentError, 'Node does not appear to be an array.' unless @_current_node.is_a?(Array)
+        raise ArgumentError, "Index out of bounds for nested array. Index: #{index}" if @_current_node.size < index
+
+        @_current_node = @_current_node[index]
+        # Remove the extra '' and the index.
+        exp = exp.gsub(/^\[\d+\]|\[''\]/, '')
+      end
       scanner = StringScanner.new(exp)
       elements = []
       until scanner.eos?
-        if t = scanner.scan(/\['[a-zA-Z@&\*\/\$%\^\?_]+'\]|\.[a-zA-Z0-9_]+[?!]?/)
+        if (t = scanner.scan(/\['[a-zA-Z@&*\/$%^?_]+'\]|\.[a-zA-Z0-9_]+[?!]?/))
           elements << t.gsub(/[\[\]'\.]|\s+/, '')
-        elsif t = scanner.scan(/(\s+)?[<>=!\-+][=~]?(\s+)?/)
+        elsif (t = scanner.scan(/(\s+)?[<>=!\-+][=~]?(\s+)?/))
           operator = t
-        elsif t = scanner.scan(/(\s+)?'?.*'?(\s+)?/)
+        elsif (t = scanner.scan(/(\s+)?'?.*'?(\s+)?/))
           # If we encounter a node which does not contain `'` it means
           #  that we are dealing with a boolean type.
           operand = if t == 'true'
@@ -67,8 +78,8 @@ class JsonPath
                     else
                       operator.to_s.strip == '=~' ? t.to_regexp : t.gsub(%r{^'|'$}, '').strip
                     end
-        elsif t = scanner.scan(/\/\w+\//)
-        elsif t = scanner.scan(/.*/)
+        elsif (t = scanner.scan(/\/\w+\//))
+        elsif (t = scanner.scan(/.*/))
           raise "Could not process symbol: #{t}"
         end
       end
@@ -78,9 +89,7 @@ class JsonPath
            elsif @_current_node.is_a?(Hash)
              @_current_node.dig(*elements)
            else
-             elements.inject(@_current_node) do |agg, key|
-               agg.__send__(key)
-             end
+             elements.inject(@_current_node, &:__send__)
            end
 
       return (el ? true : false) if el.nil? || operator.nil?
@@ -117,10 +126,9 @@ class JsonPath
       top = top.map(&:strip)
       res = bool_or_exp(top.shift)
       top.each_with_index do |item, index|
-        case item
-        when '&&'
+        if item == '&&'
           res &&= top[index + 1]
-        when '||'
+        elsif item == '||'
           res ||= top[index + 1]
         end
       end
@@ -129,9 +137,9 @@ class JsonPath
       # and the closing index will be the last index. To avoid
       # off-by-one errors we simply return the result at that point.
       if closing_index + 1 >= str.length && opening_index == 0
-        return res.to_s
+        res.to_s
       else
-        return "#{str[0..opening_index - 1]}#{res}#{str[closing_index + 1..str.length]}"
+        "#{str[0..opening_index - 1]}#{res}#{str[closing_index + 1..str.length]}"
       end
     end
 

data/lib/jsonpath/proxy.rb

@@ -10,11 +10,11 @@ class JsonPath
     end
 
     def gsub(path, replacement = nil, &replacement_block)
-      _gsub(_deep_copy, path, replacement ? proc { replacement } : replacement_block)
+      _gsub(_deep_copy, path, replacement ? proc(&method(:replacement)) : replacement_block)
     end
 
     def gsub!(path, replacement = nil, &replacement_block)
-      _gsub(@obj, path, replacement ? proc { replacement } : replacement_block)
+      _gsub(@obj, path, replacement ? proc(&method(:replacement)) : replacement_block)
     end
 
     def delete(path = JsonPath::PATH_ALL)

data/lib/jsonpath/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class JsonPath
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/test/test_jsonpath.rb

@@ -804,6 +804,35 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal expected, JsonPath.for(a.to_json).delete('$.itemList[1:6:2]').to_hash
   end
 
+  def test_nested_values
+    json = '
+    {
+      "phoneNumbers": [
+        [{
+          "type"  : "iPhone",
+          "number": "0123-4567-8888"
+        }],
+        [{
+          "type"  : "home",
+          "number": "0123-4567-8910"
+        }]
+      ]
+    }
+    '.to_json
+    assert_equal [[{ 'type' => 'home', 'number' => '0123-4567-8910' }]], JsonPath.on(json, "$.phoneNumbers[?(@[0].type == 'home')]")
+    assert_equal [], JsonPath.on(json, "$.phoneNumbers[?(@[2].type == 'home')]")
+    json = '
+    {
+      "phoneNumbers":
+        {
+          "type"  : "iPhone",
+          "number": "0123-4567-8888"
+        }
+    }
+    '.to_json
+    assert_equal [], JsonPath.on(json, "$.phoneNumbers[?(@[0].type == 'home')]")
+  end
+
   def example_object
     { 'store' => {
       'book' => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of http://goessner.net/articles/JsonPath/