0
@@ -50,20 +50,24 @@
0
     end
0
     
0
     def revive
0
+      set_deleted_at nil
0
+    end
0
+    
0
+    def set_deleted_at(value)
0
       return self unless is_permanent?
0
       record = self.class.find(id)
0
-      record.update_attribute(:deleted_at, nil)
0
-      record
0
+      record.update_attribute(:deleted_at, value)
0
+      @attributes, @attributes_cache = record.attributes, record.attributes
0
+      self
0
     end
0
     
0
     def destroy_with_permanent_record(force = nil)
0
-      if :force == force || !is_permanent?
0
-        destroy_without_permanent_record
0
-      else
0
-        update_attribute(:deleted_at, Time.now)
0
+      return destroy_without_permanent_record if :force == force || !is_permanent?
0
+      unless deleted?
0
+        set_deleted_at Time.now
0
         freeze
0
-        self
0
       end
0
+      self
0
     end
0
   end
0
 end

0
@@ -19,6 +19,11 @@
0
   end
0
   
0
   def test_destroy_should_return_the_record
0
+    muskrat = @active
0
+    assert_equal muskrat, muskrat.destroy
0
+  end
0
+  
0
+  def test_revive_should_return_the_record
0
     muskrat = @deleted
0
     assert_equal muskrat, muskrat.destroy
0
   end
0
@@ -61,6 +66,15 @@
0
   
0
   def test_deleted_returns_true_for_deleted_records
0
     assert @deleted.deleted?
0
+  end
0
+  
0
+  def test_destroy_returns_record_with_modified_attributes
0
+    assert @active.destroy.deleted?
0
+  end
0
+  
0
+  def test_revive_and_destroy_should_be_chainable
0
+    assert @active.destroy.revive.destroy.destroy.revive.revive.destroy.deleted?
0
+    assert !@deleted.destroy.revive.revive.destroy.destroy.revive.deleted?
0
   end
0
   
0
   def test_with_deleted_limits_scope_to_deleted_records