jsonpath 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45aa52a5d4a9500f243abaa6ff69131a7e5a8653ffacd1ff0787946774d12f3
-  data.tar.gz: bd0903ab08210ac2e5a44a56f548104c1924f2d9a9db9d5006a51db86aafc648
+  metadata.gz: 7dc2dc97587acd71d6ac7b1d5a2cb178f1ee9938823ef924c12e2213adafea1a
+  data.tar.gz: bc9b02cbc4c0a68329c9a682ed344b544028e27ba3f63f5079824cd536192792
 SHA512:
-  metadata.gz: 96a161911383f2c7870bd5450020aaaaceb1ea4305672f5a08493016e4fdcc5fb346001b3e8a377c16588c7bcd5adf9b0be1ef51d18b483404619324600501bb
-  data.tar.gz: 2c824f8916a742f0e5a9201c858c683bf2df7e9c7d5e38f7b7206fc8f511f69741afb3378993f3ed7e8f396148a14596ce7b9e78f0a739d2aeafc15591a0b585
+  metadata.gz: a8834f4fdcd9d1a3ba41f9431297ce87b3cf8da93ef33c0f9cd69f4c3649d1948aa32de0184f00dd157497a5ef5ec459fcfdd6be8987480b337384fcbeb4bd16
+  data.tar.gz: 3e2370e1114d041f108804e33b409e21884d2ebf21d2745fd94b81ce054646538e2f5c4d5889109f166ce8fed1d2f522e02298608bc9e766cce163b690f88f23

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 2.1.6
-  - 2.3.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
   - jruby-head
 

data/lib/jsonpath/enumerable.rb

@@ -12,7 +12,12 @@ class JsonPath
     end
 
     def each(context = @object, key = nil, pos = 0, &blk)
-      node = key ? context[key] : context
+      node =
+        if key
+          context.is_a?(Hash) || context.is_a?(Array) ? context[key] : context.__send__(key)
+        else
+          context
+        end
       @_current_node = node
       return yield_value(blk, context, key) if pos == @path.size
 
@@ -39,10 +44,12 @@ class JsonPath
       expr[1, expr.size - 2].split(',').each do |sub_path|
         case sub_path[0]
         when '\'', '"'
+          k = sub_path[1, sub_path.size - 2]
           if node.is_a?(Hash)
-            k = sub_path[1, sub_path.size - 2]
             node[k] ||= nil if @options[:default_path_leaf_to_null]
             each(node, k, pos + 1, &blk) if node.key?(k)
+          elsif node.respond_to?(k.to_s)
+            each(node, k, pos + 1, &blk)
           end
         when '?'
           handle_question_mark(sub_path, node, pos, &blk)

data/lib/jsonpath/parser.rb

@@ -53,15 +53,9 @@ class JsonPath
       scanner = StringScanner.new(exp)
       elements = []
       until scanner.eos?
-        if scanner.scan(/\./)
-          sym = scanner.scan(/\w+/)
-          op = scanner.scan(/./)
-          num = scanner.scan(/\d+/)
-          return @_current_node.send(sym.to_sym).send(op.to_sym, num.to_i)
-        end
-        if t = scanner.scan(/\['[a-zA-Z@&\*\/\$%\^\?_]+'\]+/)
-          elements << t.gsub(/\[|\]|'|\s+/, '')
-        elsif t = scanner.scan(/(\s+)?[<>=][=~]?(\s+)?/)
+        if t = scanner.scan(/\['[a-zA-Z@&\*\/\$%\^\?_]+'\]|\.[a-zA-Z0-9_]+[?!]?/)
+          elements << t.gsub(/[\[\]'\.]|\s+/, '')
+        elsif t = scanner.scan(/(\s+)?[<>=!\-+][=~]?(\s+)?/)
           operator = t
         elsif t = scanner.scan(/(\s+)?'?.*'?(\s+)?/)
           # If we encounter a node which does not contain `'` it means
@@ -81,11 +75,15 @@ class JsonPath
 
       el = if elements.empty?
              @_current_node
+           elsif @_current_node.is_a?(Hash)
+             @_current_node.dig(*elements)
            else
-             dig(elements, @_current_node)
+             elements.inject(@_current_node) do |agg, key|
+               agg.__send__(key)
+             end
            end
-      return false if el.nil?
-      return true if operator.nil? && el
+
+      return (el ? true : false) if el.nil? || operator.nil?
 
       el = Float(el) rescue el
       operand = Float(operand) rescue operand
@@ -95,16 +93,6 @@ class JsonPath
 
     private
 
-    # @TODO: Remove this once JsonPath no longer supports ruby versions below 2.3
-    def dig(keys, 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
-      dig(keys, hash.fetch(prev))
-    end
-
     #  This will break down a parenthesis from the left to the right
     #  and replace the given expression with it's returned value.
     # It does this in order to make it easy to eliminate groups

data/lib/jsonpath/version.rb

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

data/test/test_jsonpath.rb

@@ -70,6 +70,12 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] < 10)]").on(@object)
     assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] == 9)]").on(@object)
     assert_equal [@object['store']['book'][3]], JsonPath.new("$..book[?(@['price'] > 20)]").on(@object)
+    assert_equal [
+      @object['store']['book'][0],
+      @object['store']['book'][4],
+      @object['store']['book'][5],
+      @object['store']['book'][6]
+    ], JsonPath.new("$..book[?(@['category'] != 'fiction')]").on(@object)
   end
 
   def test_or_operator
@@ -113,6 +119,25 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [@object['store']['bicycle']['2seater']], JsonPath.new('$.store.bicycle.2seater').on(@object)
   end
 
+  def test_recognized_dot_notation_in_filters
+    assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new('$..book[?(@.isbn)]').on(@object)
+  end
+
+  def test_works_on_non_hash
+    klass = Struct.new(:a, :b)
+    object = klass.new('some', 'value')
+
+    assert_equal ['value'], JsonPath.new('$.b').on(object)
+  end
+
+  def test_works_on_non_hash_with_filters
+    klass = Struct.new(:a, :b)
+    first_object = klass.new('some', 'value')
+    second_object = klass.new('next', 'other value')
+
+    assert_equal ['other value'], JsonPath.new('$[?(@.a == "next")].b').on([first_object, second_object])
+  end
+
   def test_recognize_array_with_evald_index
     assert_equal [@object['store']['book'][2]], JsonPath.new('$..book[(@.length-5)]').on(@object)
   end

metadata

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