jsonpath 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '048116fe74d7b281fbcf58d8f5d1aa44c359267bf179e58376527032e58c0094'
-  data.tar.gz: 4d91c8953e2750322d486f372b165507c4f383a42c11d07987cc49630abea5b6
+SHA1:
+  metadata.gz: e2473ca28bed27ee404a8ad46a73e4752f848f29
+  data.tar.gz: 647e15073ba118cd82ebae0d21a4d7fb056600f8
 SHA512:
-  metadata.gz: fb899c515175b16b0f9c1001ae7525f14d086b4bf844779cef819c9e634511445c0ee1aa033c7e51c9419aa1de1e22ae8e4670e7fbaa162b27d5c819ebef0846
-  data.tar.gz: d303bb0188617e52133250571c43c0262b02cd1f586edb2d05683f30e6e26e17dfaeb81a3a62e40c4b838374e9b9354fbf012d03591fa7fb465549ff9148ddd8
+  metadata.gz: ce6cde76b1d9ccb25bbd83d08d28ff8be128555cde22c1cb64a36d5f296d3dd9b6196ea0fd359f7f6ca94b11ddde46728291752c6a733123677dae128fdd694e
+  data.tar.gz: 88052cdd548064d68e4cc6a384214dc1712b8661ae509782b2f38b9cbda61b37753938db50b055022629d77821a0669f5e39759138409da61c544fb365be22b2

data/lib/jsonpath.rb

@@ -10,7 +10,7 @@ require 'jsonpath/parser'
 # JsonPath: initializes the class with a given JsonPath and parses that path
 # into a token array.
 class JsonPath
-  PATH_ALL = '$..*'
+  PATH_ALL = '$..*'.freeze
 
   attr_accessor :path
 

data/lib/jsonpath/enumerable.rb

@@ -77,8 +77,6 @@ class JsonPath
       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
@@ -104,6 +102,8 @@ class JsonPath
       when :delete
         if key
           key.is_a?(Integer) ? context.delete_at(key) : context.delete(key)
+        else
+          context.replace({})
         end
       when :substitute
         if key

data/lib/jsonpath/proxy.rb

@@ -46,9 +46,19 @@ class JsonPath
 
     def _delete(obj, path)
       JsonPath.new(path)[obj, :delete].each
+      obj = _remove(obj)
       Proxy.new(obj)
     end
 
+    def _remove(obj)
+      obj.each do |o|
+        if o.is_a?(Hash) || o.is_a?(Array)
+          _remove(o)
+          o.delete({})
+        end
+      end
+    end
+
     def _compact(obj, path)
       JsonPath.new(path)[obj, :compact].each
       Proxy.new(obj)

data/lib/jsonpath/version.rb

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

data/test/test_jsonpath.rb

@@ -173,6 +173,89 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal({ 'you' => nil }, h)
   end
 
+  def test_delete_2
+    json = { 'store' => {
+      'book' => [
+        { 'category' => 'reference',
+          'author' => 'Nigel Rees',
+          'title' => 'Sayings of the Century',
+          'price' => 9,
+          'tags' => %w[asdf asdf2] },
+        { 'category' => 'fiction',
+          'author' => 'Evelyn Waugh',
+          'title' => 'Sword of Honour',
+          'price' => 13 },
+        { 'category' => 'fiction',
+          'author' => 'Aasdf',
+          'title' => 'Aaasdf2',
+          'price' => 1 }
+      ]
+    } }
+    json_deleted = { 'store' => {
+      'book' => [
+        { 'category' => 'fiction',
+          'author' => 'Evelyn Waugh',
+          'title' => 'Sword of Honour',
+          'price' => 13 },
+        { 'category' => 'fiction',
+          'author' => 'Aasdf',
+          'title' => 'Aaasdf2',
+          'price' => 1 }
+      ]
+    } }
+    assert_equal(json_deleted, JsonPath.for(json).delete("$..store.book[?(@.category == 'reference')]").obj)
+  end
+
+  def test_delete_3
+    json = { 'store' => {
+      'book' => [
+        { 'category' => 'reference',
+          'author' => 'Nigel Rees',
+          'title' => 'Sayings of the Century',
+          'price' => 9,
+          'tags' => %w[asdf asdf2],
+          'this' => {
+            'delete_me' => [
+              'no' => 'do not'
+            ]
+          }
+        },
+        { 'category' => 'fiction',
+          'author' => 'Evelyn Waugh',
+          'title' => 'Sword of Honour',
+          'price' => 13
+        },
+        { 'category' => 'fiction',
+          'author' => 'Aasdf',
+          'title' => 'Aaasdf2',
+          'price' => 1
+        }
+      ]
+    } }
+    json_deleted = { 'store' => {
+      'book' => [
+        { 'category' => 'reference',
+          'author' => 'Nigel Rees',
+          'title' => 'Sayings of the Century',
+          'price' => 9,
+          'tags' => %w[asdf asdf2],
+          'this' => {}
+        },
+        { 'category' => 'fiction',
+          'author' => 'Evelyn Waugh',
+          'title' => 'Sword of Honour',
+          'price' => 13
+        },
+        { 'category' => 'fiction',
+          'author' => 'Aasdf',
+          'title' => 'Aaasdf2',
+          'price' => 1
+        }
+      ]
+    } }
+    assert_equal(json_deleted, JsonPath.for(json).delete('$..store.book..delete_me').obj)
+  end
+
   def test_delete_for_array
     before = JsonPath.on(@object, '$..store.book[1]')
     JsonPath.for(@object).delete!('$..store.book[0]')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jsonpath
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of http://goessner.net/articles/JsonPath/