soft_deletion 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c38ff4e3d7bdbc70186a1c89328478f1c1ddb45
-  data.tar.gz: ae7ca5ac0261da84b8f6be925a906b5e75f5bc6e
+  metadata.gz: 242f3f52d3bb58d98d9b58a668d8a876732c7acc
+  data.tar.gz: 7ec068a7d632b58b886a24249bb763ce410fe650
 SHA512:
-  metadata.gz: 143ddcf36fd45613db6588d50f81e76c4fac780dd6bcc65180a2b550c60497b80ea56dc0941d0e5e5759093fdd6b60e68e14624889a5afe58d95bf2ac17bfd29
-  data.tar.gz: 7bbf2ba8a4671a149a55123986bad969cefc29b2d43c23bc544b5b44383e7ed0cbede5c3dc24a29b6cc7c8181a3bf188c5a6c6f92256978eda8a895e882ced1d
+  metadata.gz: 674ffbe315ab1e2b25422711cba3e37f6fad43866fa5c7ffabf99fbdca215fdc23fc51780764995e59d557babb2131c60151a40502aa09b743171a649d119e78
+  data.tar.gz: 0ac228265266ab92dc0e4965191ac7432013f0f2d21c1f8abbd26d2d5aabc8b0c2b605f20de19092905eef427283614d3f1843a7458260feca48c262982fd102

data/lib/soft_deletion/core.rb

@@ -73,15 +73,19 @@ module SoftDeletion
     end
 
     def soft_delete!
-      _run_soft_delete { save! }
+      _run_soft_delete { save! } || soft_delete_hook_failed(:before_soft_delete)
     end
 
     def soft_delete(*args)
       _run_soft_delete{ save(*args) }
     end
 
+    def soft_undelete
+      _run_soft_undelete{ save }
+    end
+
     def soft_undelete!
-      _run_soft_undelete{ save! }
+      _run_soft_undelete{ save! } || soft_delete_hook_failed(:before_soft_undelete)
     end
 
     def soft_delete_dependencies
@@ -122,5 +126,12 @@ module SoftDeletion
 
       result
     end
+
+    def soft_delete_hook_failed(hook)
+      error = (errors.full_messages.presence || ["None"]).join(", ")
+      message = "#{hook} hook failed, errors: #{error}"
+      # not passing record (self) as 2nd argument to be rails 3/4.1 compatible
+      raise ActiveRecord::RecordNotSaved.new(message)
+    end
   end
 end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord