delete_paranoid 0.0.1 → 0.0.2

data/lib/delete_paranoid.rb

@@ -24,11 +24,11 @@ module DeleteParanoid
         with_transaction_returning_status do
           _run_destroy_callbacks do
             update_attributes(:deleted_at => Time.now.utc)
+            @destroyed = true
           end
         end
       end
-
-      @destroyed = true
+      
       freeze
     end
   end

data/lib/delete_paranoid/version.rb

@@ -1,3 +1,3 @@
 module DeleteParanoid
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_delete_paranoid.rb

@@ -3,7 +3,32 @@ require File.join(File.dirname(__FILE__), 'helper')
 class TestDeleteParanoid < Test::Unit::TestCase
   class Blog < ActiveRecord::Base
     acts_as_paranoid
+    
+    attr_accessor :called_before_destroy, :called_after_destroy, :called_after_commit_on_destroy
+
+    before_destroy :call_me_before_destroy
+    after_destroy :call_me_after_destroy
+
+    after_commit :call_me_after_commit_on_destroy, :on => :destroy
+
+    def initialize(*attrs)
+      @called_before_destroy = @called_after_destroy = @called_after_commit_on_destroy = false
+      super(*attrs)
+    end
+
+    def call_me_before_destroy
+      @called_before_destroy = true
+    end
+
+    def call_me_after_destroy
+      @called_after_destroy = true
+    end
+
+    def call_me_after_commit_on_destroy
+      @called_after_commit_on_destroy = true
+    end
   end
+  
   context 'with paranoid class' do
     should 'have destroy! method' do
       assert Blog.respond_to? :destroy!
@@ -21,9 +46,18 @@ class TestDeleteParanoid < Test::Unit::TestCase
           assert Blog.all.include?(@blog)
         end
       end
+      should "call before_destroy callbacks" do
+        assert @blog.called_before_destroy
+      end
+      should "call after_destroy callbacks" do
+        assert @blog.called_after_destroy
+      end
+      should "call after_commit_on_destroy callbacks" do
+        assert @blog.called_after_commit_on_destroy
+      end
+      
     end
 
-    should 'fire destroy callbacks'
     should 'hard delete with destroy!'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delete_paranoid
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -05:00
+date: 2011-04-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency