soft_deletion 1.12.0 → 1.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 24466acf8a31d8d66e69516ff6714f32cd10b3e8c3c093007d93e3f4bb5974eb
4
- data.tar.gz: 57b97455f434d22a9a6c1bb751299a17d0d7e3258f26dcf42fc23e3fbf127137
3
+ metadata.gz: be5a857dd49c9d30a402c6d241e4b3c16c474c797c8bfefb42d97210dc16deaa
4
+ data.tar.gz: d3c386ce8a0604e556239b6f924b3c623c1e493958364b5eccf99c985f8611d6
5
5
  SHA512:
6
- metadata.gz: d2f0cefd7031edd4bf235b1026a5cb5cd0585b3cb2db4d22dc83102a3869c1eee8cd3921df2769ca94f49c596881920c311992550795374105c731d2e7ba8ea8
7
- data.tar.gz: 82f93c985c8db9b69749a78e65c55e30f5857f338d62685501a8bc9a7c9c034e8724c8b3a455d7612fb98d98c15fcde51d9eb529930f203df56567cd4eb2aee9
6
+ metadata.gz: bacaea7cdb75414da79d3002ec07406c210ba63a0eb05b305c808aa410ae4235f34c883cc3ce2bcf39d9002253f689a35ca7c9306c5d68d755a6b79bbc011216
7
+ data.tar.gz: 928bf5bd616e71bea0ca5624ab07332fc3a2c09a3713718e8ce197c32f18cb5864fa222aa1bcdbdfe3556e765a2abf7107a56d6f1839c39458668aaf6d606e9a
data/Readme.md CHANGED
@@ -66,6 +66,17 @@ class AddDeletedAtToUsers < ActiveRecord::Migration[6.0]
66
66
  end
67
67
  ```
68
68
 
69
+ By default `soft_deletion` does not change the `updated_at` value in the record. If you need this feature, you can use the `update_timestamp` option, passing the name of the column holding the timestamp to be updated, like, for example, `updated_at`:
70
+
71
+ ```Ruby
72
+ require 'soft_deletion'
73
+
74
+ class User < ActiveRecord::Base
75
+ has_soft_deletion update_timestamp: :updated_at
76
+ end
77
+ ```
78
+
79
+
69
80
  TODO
70
81
  ====
71
82
  - has_many :through should delete join associations on soft_delete
@@ -9,6 +9,7 @@ module SoftDeletion
9
9
  base.define_model_callbacks :soft_delete
10
10
  base.define_model_callbacks :soft_undelete
11
11
  base.cattr_accessor :soft_delete_default_scope
12
+ base.cattr_accessor :soft_deletion_update_timestamp
12
13
  end
13
14
 
14
15
  module ClassMethods
@@ -31,7 +32,11 @@ module SoftDeletion
31
32
  end
32
33
 
33
34
  def mark_as_soft_deleted_sql
34
- { deleted_at: Time.now }
35
+ t = Time.now
36
+
37
+ {deleted_at: t}.tap do |h|
38
+ h[self.soft_deletion_update_timestamp] = t if self.soft_deletion_update_timestamp
39
+ end
35
40
  end
36
41
 
37
42
  def soft_delete_all!(ids_or_models)
@@ -62,6 +67,11 @@ module SoftDeletion
62
67
 
63
68
  def mark_as_deleted
64
69
  self.deleted_at ||= Time.now
70
+ if self.class.soft_deletion_update_timestamp
71
+ new_timestamp = [self.deleted_at, send(self.class.soft_deletion_update_timestamp)].compact.max
72
+
73
+ send("#{self.class.soft_deletion_update_timestamp}=", new_timestamp)
74
+ end
65
75
  end
66
76
 
67
77
  def mark_as_undeleted
@@ -27,6 +27,8 @@ module SoftDeletion
27
27
  end
28
28
  end
29
29
  end
30
+
31
+ self.soft_deletion_update_timestamp = options[:update_timestamp]
30
32
  end
31
33
  end
32
34
  end
@@ -1,3 +1,3 @@
1
1
  module SoftDeletion
2
- VERSION = '1.12.0'
2
+ VERSION = '1.13.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: soft_deletion
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.12.0
4
+ version: 1.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Grosser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-11-25 00:00:00.000000000 Z
11
+ date: 2025-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord