soft_deletion 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a883342b62d3d6cac6e36c1f35f35be2afc8ee3
-  data.tar.gz: 70d6426a71b9cfef3381785825912dcf816c2af3
+SHA256:
+  metadata.gz: 33929145814e0bfca2a2ae9fe549f6e333e298ceae93eab756f2590e32ea9879
+  data.tar.gz: 32f843e02d0d918e7ad6c15c609babba2832b04e1e8cf4c32d88eb75e5bd489b
 SHA512:
-  metadata.gz: 4f102e7785e14d602d78d95f5b380ab5094e5038acf69120974f5d0b827b5112f1fd6595b08324cd7ee5b68310ccd6294b7daaaa6191753948b9efa7f1e16208
-  data.tar.gz: 191eeb73ace4df8d2e3392b09052a0ce72b5742adfdd6018cd33c5185d754a5bf35e5a511bc6d5d37fb16acff75d4962f1a8efe0c29b07575c5e0086736b1ab1
+  metadata.gz: 634ed1c15d3cd31744dbfa75f0df013decb6e1e27157a59224c3ffdf5bfc2f1b75db2643639b92b8099c96dc6e71be98543765e3640e1c933314ad3f59704ced
+  data.tar.gz: a02f8debc86470ef9793e833e1900dedd8d3374c10db8b0808ca38abe04a30f0919de5d5b45d5543d0c9d47fa011b7025ab1288e09f74bfe75b104906f0ef4e3

data/Readme.md

@@ -26,7 +26,7 @@ end
 # soft delete them including all soft-deletable dependencies that are marked as :destroy, :delete_all, :nullify
 user = User.first
 user.products.count == 10
-user.soft_delete!
+user.soft_delete!(validate: false)
 user.deleted? # true
 
 # use special with_deleted scope to find them ...

data/lib/soft_deletion/core.rb

@@ -53,7 +53,7 @@ module SoftDeletion
           end
 
           models.each do |model|
-            model.soft_delete_dependencies.each(&:soft_delete!)
+            model.soft_delete_dependencies.each { |dep| dep.execute_soft_delete(:soft_delete!, []) }
             model.run_callbacks :soft_delete
           end
         end
@@ -73,11 +73,11 @@ module SoftDeletion
     end
 
     def soft_delete!(*args)
-      _run_soft_delete { save!(*args) } || soft_delete_hook_failed(:before_soft_delete)
+      _run_soft_delete(:soft_delete!, args) { save!(*args) } || soft_delete_hook_failed(:before_soft_delete)
     end
 
     def soft_delete(*args)
-      _run_soft_delete{ save(*args) }
+      _run_soft_delete(:soft_delete, args) { save(*args) }
     end
 
     def soft_undelete
@@ -111,19 +111,21 @@ module SoftDeletion
       end
     end
 
-    def _run_soft_delete(&block)
+    def _run_soft_delete(method, args, &block)
       result = false
-      internal = lambda do
-        mark_as_deleted
-        soft_delete_dependencies.each(&:soft_delete!)
-        result = block.call
-        update_soft_delete_counter_caches(-1)
-      end
-
       self.class.transaction do
+        internal = lambda do
+          mark_as_deleted
+          raise ActiveRecord::Rollback unless soft_delete_dependencies.all? { |dep| dep.execute_soft_delete(method, args) }
+          result = block.call
+          raise ActiveRecord::Rollback unless result
+          update_soft_delete_counter_caches(-1)
+        end
+
         run_callbacks :soft_delete, &internal
-      end
 
+        result
+      end
       result
     end
 
@@ -134,7 +136,7 @@ module SoftDeletion
       limit = deleted_at - 1.hour
       internal = lambda do
         mark_as_undeleted
-        soft_delete_dependencies.each { |m| m.soft_undelete!(limit)}
+        soft_delete_dependencies.each { |m| m.soft_undelete!(limit) }
         result = block.call
         update_soft_delete_counter_caches(1)
       end

data/lib/soft_deletion/dependency.rb

@@ -7,14 +7,15 @@ module SoftDeletion
       @association_name = association_name
     end
 
-    def soft_delete!
+    def execute_soft_delete(method, args)
       case association.options[:dependent]
       when :nullify
         nullify_dependencies
       when :delete_all
         dependency.update_all(dependency.mark_as_soft_deleted_sql)
+        true
       else
-        dependencies.each(&:soft_delete!)
+        dependencies.all? { |dep| dep.send(method, *args) }
       end
     end
 

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.