Add persisted? check to destroy!

goncalossilva · Feb 28, 2013 · 734775e · 734775e
1 parent 899c187
commit 734775e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/acts_as_paranoid/core.rb b/lib/acts_as_paranoid/core.rb
@@ -94,7 +94,7 @@ def destroy!
         run_callbacks :destroy do
           destroy_dependent_associations!
           # Handle composite keys, otherwise we would just use `self.class.primary_key.to_sym => self.id`.
-          self.class.delete_all!(Hash[[Array(self.class.primary_key), Array(self.id)].transpose])
+          self.class.delete_all!(Hash[[Array(self.class.primary_key), Array(self.id)].transpose]) if persisted?
           self.paranoid_value = self.class.delete_now_value
           freeze
         end

diff --git a/test/test_core.rb b/test/test_core.rb
@@ -68,8 +68,18 @@ def test_real_removal
     assert_empty ParanoidTime.with_deleted.all
   end
 
-  def test_removal_not_persisted
-    assert ParanoidTime.new.destroy
+  def test_non_persisted_destroy
+    pt = ParanoidTime.new
+    assert_nil pt.paranoid_value
+    pt.destroy
+    assert_not_nil pt.paranoid_value
+  end
+
+  def test_non_persisted_destroy!
+    pt = ParanoidTime.new
+    assert_nil pt.paranoid_value
+    pt.destroy!
+    assert_not_nil pt.paranoid_value
   end
 
   def test_recovery