jsonpath 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b522c0db894285a626b8e1d6d44a95140d5a03
-  data.tar.gz: 1f4176316390136b0d229627bf3965f4b4ae1c44
+  metadata.gz: aa8657a28248b15d9ae03ef56bbfa2a436fec517
+  data.tar.gz: 41e9c32a10b1e26423b7833cb547f2d475798225
 SHA512:
-  metadata.gz: 7f4e322af2377394c35ca7fa5fb03f3f3df63ed815eb064d33c6a4e96064ad872a3fc58a3462ecffa4f733d7444d484abb4a454e4b0bb75dbea1cce0f3ad57be
-  data.tar.gz: 72110c129177b94eb9572bc4dd288dfe6bd8025f00db6c71ef4b384b0122f9ba6d373c7305fce7c6e477b50a524fc2b921c33bd95eb01877c752758a074d7378
+  metadata.gz: b505037a9c8d5d7cf2be89838edb95a7f2ac31f097b8ff81c9c16b7b6205ce49cf19c4e297cb4a83be48b1dbcc026c85ae875c9bd93b7b40a888c09714e58a2b
+  data.tar.gz: 65a6f59db06dac30434fbf113f12476ef7c944b47589cceee468e4984566ce8157d7730d91e43d1d6d3d639995337eae3065ef715ec2a8e362e260f71c8c5a41

data/lib/jsonpath.rb

@@ -14,7 +14,7 @@ class JsonPath
 
   def initialize(path, opts = nil)
     @opts = opts
-    scanner = StringScanner.new(path)
+    scanner = StringScanner.new(path.strip)
     @path = []
     until scanner.eos?
       if token = scanner.scan(/\$\B|@\B|\*|\.\./)

data/lib/jsonpath/enumerable.rb

@@ -66,14 +66,20 @@ class JsonPath
 
     def handle_question_mark(sub_path, node, pos, &blk)
       case node
-      when Hash, Array
-        (node.is_a?(Hash) ? node.keys : (0..node.size)).each do |e|
-          @_current_node = node[e]
+        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')}]")
+              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
-        end
-      else
+          else
         yield node if process_function_or_literal(sub_path[1, sub_path.size - 1])
       end
     end

data/lib/jsonpath/version.rb

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

data/test/test_jsonpath.rb

@@ -245,7 +245,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'id' => '123'
       }
     }
-    assert_equal [{ 'type' => 'users', 'id' => '123' }], JsonPath.new("$.[?(@.type == 'users')]").on(data)
+    assert_equal [{ 'type' => 'users', 'id' => '123' }], JsonPath.new("$.data[?(@.type == 'users')]").on(data)
     assert_equal [], JsonPath.new("$.[?(@.type == 'admins')]").on(data)
   end
 
@@ -285,7 +285,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'type' => 0.00001
       }
     }
-    assert_equal [{"type"=>0.00001}], JsonPath.new("$.[?(@.type == 0.00001)]").on(data)
+    assert_equal [{"type"=>0.00001}], JsonPath.new("$.data[?(@.type == 0.00001)]").on(data)
   end
 
   def test_digits_only_string
@@ -295,7 +295,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'id' => '123'
       }
     }
-    assert_equal([{"type"=>"users", "id"=>"123"}], JsonPath.new("$.[?(@.id == '123')]").on(data))
+    assert_equal([{"type"=>"users", "id"=>"123"}], JsonPath.new("$.foo[?(@.id == '123')]").on(data))
   end
 
   def test_digits_only_string_in_array
@@ -381,7 +381,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'number' => '(492) 080-3961'
       }
     }
-    assert_equal [{'number'=>'(492) 080-3961'}], JsonPath.new("$.[?(@.number == '(492) 080-3961')]").on(data)
+    assert_equal [{'number'=>'(492) 080-3961'}], JsonPath.new("$.data[?(@.number == '(492) 080-3961')]").on(data)
   end
 
 
@@ -484,7 +484,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
       ]
     }.to_json
 
-    assert_equal ['C09C5GYHF'], JsonPath.on(json, "$..[?(@.name == 'general')].id")
+    assert_equal ['C09C5GYHF'], JsonPath.on(json, "$..channels[?(@.name == 'general')].id")
   end
 
   def test_regression_5
@@ -507,6 +507,52 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal 'C09C5GYHF', JsonPath.on(json, "$..channels[?(@.is_archived == 'false')].id")[0]
   end
 
+  def test_changed
+    json =
+    {
+      "snapshot"=> {
+        "objects"=> {
+          "whatever"=> [
+            {
+              "column"=> {
+                "name"=> "ASSOCIATE_FLAG",
+                "nullable"=> true
+              }
+            },
+            {
+              "column"=> {
+                "name"=> "AUTHOR",
+                "nullable"=> false
+              }
+            }
+          ]
+        }
+      }
+    }
+    assert_equal true, JsonPath.on(json, "$..column[?(@.name == 'ASSOCIATE_FLAG')].nullable")[0]
+  end
+
+  def test_another
+    json = {
+      initial: true,
+      not: true
+    }.to_json
+    assert_equal [true], JsonPath.on(json, "$.initial[?(@)]")
+    json = {
+      initial: false,
+      not: true
+    }.to_json
+    assert_equal [], JsonPath.on(json, "$.initial[?(@)]")
+  end
+
+  def test_hanging
+    json = { initial: true }.to_json
+    success_path = "$.initial"
+    assert_equal [true], JsonPath.on(json, success_path)
+    broken_path = "$.initial\n"
+    assert_equal [true], JsonPath.on(json, broken_path)
+  end
+
   def example_object
     { 'store' => {
       'book' => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jsonpath
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of http://goessner.net/articles/JsonPath/