soft_deletion 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca056615af191c4edb5663f3b1c56067930777172ec9a02fe2b58180b7319ae
-  data.tar.gz: 214ea720e110dbde3fe8bd0e86c9a3a970abd48ae1e0001b339b8fbf2a06e408
+  metadata.gz: 44ac482ab1a340cb83ad7befa59d3dea2f5dbb4b885b33430f8c15358e6c15ba
+  data.tar.gz: 5da6e4c535f801c1e74f64e04bf3c49d35afe11accebd1e35539ee8b29cb61bf
 SHA512:
-  metadata.gz: 0152d17ffb4687a319e95de937f0205baf0fd310af7eb42d881f38654d64217b1fb6fd82c4a5a6b4b9a5a6c84c0e0d7f96bf1aae85d7d71385459ed40f63fc12
-  data.tar.gz: f1f871ef34ce9f46819ee2c02ca3333a8525d0ac90678fb7dd8069458b146e1a64bda07a43ce9b4cf537c7dbf21e86a443dea3bed263f86bde335d0f1060ff8a
+  metadata.gz: 796131148c73d9e07411797cff502315fcff73fa5fc35f30c39c158419b35f6f744950c06053d52c4b224f695d858f381c9b09dcad6467d179496d2d0f98b253
+  data.tar.gz: 3939b72e5a2a94c5ccae64ccb32b115f32986f0d169fbdd772c6bed3daf208d423330ae3759b7a9572f48c09ec836ac8d3933c3d4bd3f4729c7aa2ebd8ba94e2

data/lib/soft_deletion/core.rb

@@ -45,7 +45,7 @@ module SoftDeletion
           where(:id => ids).update_all(mark_as_soft_deleted_sql)
 
           models.each do |model|
-            model.soft_delete_dependencies.each { |dep| dep.execute_soft_delete(:soft_delete!, []) }
+            model.soft_delete_dependencies.each { |dep| dep.execute_soft_delete(:soft_delete!) }
             model.run_callbacks :soft_delete
           end
         end
@@ -64,12 +64,12 @@ module SoftDeletion
       self.deleted_at = nil
     end
 
-    def soft_delete!(*args)
-      _run_soft_delete(:soft_delete!, args) { save!(*args) } || soft_delete_hook_failed(:before_soft_delete)
+    def soft_delete!(*args, **kwargs)
+      _run_soft_delete(:soft_delete!, *args, **kwargs) { save!(*args, **kwargs) } || soft_delete_hook_failed(:before_soft_delete)
     end
 
-    def soft_delete(*args)
-      _run_soft_delete(:soft_delete, args) { save(*args) }
+    def soft_delete(*args, **kwargs)
+      _run_soft_delete(:soft_delete, *args, **kwargs) { save(*args, **kwargs) }
     end
 
     def soft_undelete
@@ -96,12 +96,12 @@ module SoftDeletion
       end
     end
 
-    def _run_soft_delete(method, args, &block)
+    def _run_soft_delete(method, *args, **kwargs, &block)
       result = false
       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) }
+          raise ActiveRecord::Rollback unless soft_delete_dependencies.all? { |dep| dep.execute_soft_delete(method, *args, **kwargs) }
           result = block.call
           raise ActiveRecord::Rollback unless result
           update_soft_delete_counter_caches(-1)

data/lib/soft_deletion/dependency.rb

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

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '1.6.0'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -144,7 +144,7 @@ homepage: https://github.com/grosser/soft_deletion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,15 +152,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.
 test_files: []