soft_deletion 1.2.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a883342b62d3d6cac6e36c1f35f35be2afc8ee3
-  data.tar.gz: 70d6426a71b9cfef3381785825912dcf816c2af3
+SHA256:
+  metadata.gz: 5ca056615af191c4edb5663f3b1c56067930777172ec9a02fe2b58180b7319ae
+  data.tar.gz: 214ea720e110dbde3fe8bd0e86c9a3a970abd48ae1e0001b339b8fbf2a06e408
 SHA512:
-  metadata.gz: 4f102e7785e14d602d78d95f5b380ab5094e5038acf69120974f5d0b827b5112f1fd6595b08324cd7ee5b68310ccd6294b7daaaa6191753948b9efa7f1e16208
-  data.tar.gz: 191eeb73ace4df8d2e3392b09052a0ce72b5742adfdd6018cd33c5185d754a5bf35e5a511bc6d5d37fb16acff75d4962f1a8efe0c29b07575c5e0086736b1ab1
+  metadata.gz: 0152d17ffb4687a319e95de937f0205baf0fd310af7eb42d881f38654d64217b1fb6fd82c4a5a6b4b9a5a6c84c0e0d7f96bf1aae85d7d71385459ed40f63fc12
+  data.tar.gz: f1f871ef34ce9f46819ee2c02ca3333a8525d0ac90678fb7dd8069458b146e1a64bda07a43ce9b4cf537c7dbf21e86a443dea3bed263f86bde335d0f1060ff8a

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 ...
@@ -48,7 +48,6 @@ User.soft_delete_all!(1,2,3,4)
 
 TODO
 ====
- - nullify should use update_all on has_many on soft_delete (performance)
  - has_many :through should delete join associations on soft_delete
  - cascading soft_deletes should use the same timestamp for easy reverts
 
@@ -62,8 +61,9 @@ Authors
  - [Noel Dellofano](https://github.com/pinkvelociraptor)
  - [Oliver Nightingale](https://github.com/olivernn)
  - [Kumar Pandya](https://github.com/kpandya91)
+ - [Alex Pauly](https://github.com/apauly)
 
 [Zendesk](http://zendesk.com)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://travis-ci.org/grosser/soft_deletion.png)](https://travis-ci.org/grosser/soft_deletion)
+![CI](https://github.com/grosser/soft_deletion/workflows/CI/badge.svg)

data/lib/soft_deletion/core.rb

@@ -38,22 +38,14 @@ module SoftDeletion
           models = ids_or_models
         else
           ids = ids_or_models
-          models = if ActiveRecord::VERSION::MAJOR >= 4
-            where(:id => ids)
-          else
-            all(:conditions => { :id => ids })
-          end
+          models = where(:id => ids)
         end
 
         transaction do
-          if ActiveRecord::VERSION::MAJOR >= 4
-            where(:id => ids).update_all(mark_as_soft_deleted_sql)
-          else
-            update_all(mark_as_soft_deleted_sql, :id => ids)
-          end
+          where(:id => ids).update_all(mark_as_soft_deleted_sql)
 
           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 +65,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
@@ -94,16 +86,9 @@ module SoftDeletion
 
     protected
 
-    if ActiveRecord::VERSION::MAJOR < 4
-      def each_counter_cached_associations
-        reflections.each do |name, reflection|
-          yield association(name.to_sym) if reflection.belongs_to? && reflection.counter_cache_column
-        end
-      end
-    end
-
     def update_soft_delete_counter_caches(value)
       each_counter_cached_associations do |association|
+        association.load_target unless association.loaded?
         if association.target
           target = association.target
           target.class.update_counters(target.id, association.reflection.counter_cache_column => value)
@@ -111,19 +96,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 +121,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
+        dependency.update_all(association.foreign_key => nil)
       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
 
@@ -26,12 +27,6 @@ module SoftDeletion
 
     protected
 
-    def nullify_dependencies
-      dependencies.each do |dependency|
-        dependency.update_column(association.foreign_key, nil)
-      end
-    end
-
     def klass
       association.klass
     end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '1.2.1'
+  VERSION = '1.6.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.6.0
 platform: ruby
 authors:
-- Zendesk
+- Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: single_cov
   requirement: !ruby/object:Gem::Requirement
@@ -166,15 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.