soft_deleter 0.1.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 128f9591b3e2fa2005aa7bb7722c83291a341af111d2f208bdba0bd5bcd050dd
-  data.tar.gz: 6e2cd7dea9ebfdee761cbad7a615920da78a378394ed51c9a8f67b48571af08b
+  metadata.gz: 1075ffd8808a9f4fd6ccb64b965ffe966a4a8a3708ac128a8005a88522b10f5b
+  data.tar.gz: f3897475f6af066ac4539c4ef3d8ba9f6a6e097075b9053bbc47532077c4b6b4
 SHA512:
-  metadata.gz: a99e22f07eda44d726c803aa9f0a2c95f831a1f2af52788663c32b4eb577eadda9fec044a822f03c161e8533fee514e6de18faa9de7b411d9f866d92bce4c757
-  data.tar.gz: f4b7c19000066067279b95a79e85895a78a1db457f769a5801e6adb3f5c4b213f5a479d791ab17c91dc6ab548c50b2c5341cfd14fbff6883caaf901d428e8159
+  metadata.gz: 1f609a071a3ce88e348e4f82101411d4b6dbf9bbaaa88dd088c3543bc4ddf257c07aac5224b26d34c3e22ba18261e3c4bfc9a4d873fa5b47231ee9cb63d56b7b
+  data.tar.gz: 8fcc88756079ff57e9af970b4a3fa2cf37f0938f38fd8789735a157749a08504436da792c8e23daa9124da22523f169d4eb2471ed7976529a9a8317d7c5390e6

data/README.md

@@ -66,8 +66,9 @@ deleted_users = User.deleted.all
 ```ruby
 user = User.enabled.first
 user.soft_delete                 # soft delete
-user.soft_delete!                # soft delete or raise if fail to soft delete
+user.soft_delete!                # soft delete or raise when fail occurs
 user.restore                     # restore soft deleted user
+user.restore!                    # restore soft deleted user or raise when fail occurs
 ```
 If your app have some models other than user, like `Admin` model,<br />
 and you need to record to that Admin user did soft delete.<br />

data/lib/soft_deleter/version.rb

@@ -1,3 +1,3 @@
 module SoftDeleter
-  VERSION = "0.1.1"
+  VERSION = "0.3.1"
 end

data/lib/soft_deleter.rb

@@ -16,7 +16,7 @@ module SoftDeleter
 
         i.options[:class_name]&.underscore&.pluralize&.to_sym || i.name
       end.compact
-      result
+      result - [:"active_storage/attachments"]
     end
   end
 
@@ -33,6 +33,16 @@ module SoftDeleter
       with_associations(:soft_delete_witout_associations, deleter)
     end
 
+    true
+  rescue ActiveRecord::RecordInvalid
+    false
+  end
+
+  def restore!
+    ActiveRecord::Base.transaction do
+      with_associations(:restore_without_associations!)
+    end
+
     true
   end
 
@@ -40,6 +50,10 @@ module SoftDeleter
     ActiveRecord::Base.transaction do
       with_associations(:restore_without_associations)
     end
+
+    true
+  rescue ActiveRecord::RecordInvalid
+    false
   end
 
   def deleter_type
@@ -75,6 +89,8 @@ module SoftDeleter
   private
 
   def soft_delete_witout_associations!(deleter)
+    raise ActiveRecord::RecordInvalid, self if invalid?
+
     update!(
       deleter_type: deleter.class.to_s,
       deleter_id: deleter.id,
@@ -83,6 +99,8 @@ module SoftDeleter
   end
 
   def soft_delete_witout_associations(deleter)
+    raise ActiveRecord::RecordInvalid if invalid?
+
     update(
       deleter_type: deleter.class.to_s,
       deleter_id: deleter.id,
@@ -90,7 +108,19 @@ module SoftDeleter
     )
   end
 
+  def restore_without_associations!
+    raise ActiveRecord::RecordInvalid, self if invalid?
+
+    update(
+      deleter_type: nil,
+      deleter_id: nil,
+      deleted_at: nil
+    )
+  end
+
   def restore_without_associations
+    raise ActiveRecord::RecordInvalid if invalid?
+
     update(
       deleter_type: nil,
       deleter_id: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deleter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.1
 platform: ruby
 authors:
 - testCodeV01
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2024-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails