0
@@ -1,4 +1,3 @@
0
-require 'active_record'
0
 module PermanentRecords
0
 
0
   def self.included(base)
0
@@ -51,7 +50,7 @@ module PermanentRecords
0
     end
0
     
0
     def revive
0
-      return self if is_permanent?
0
+      return self unless is_permanent?
0
       record = self.class.find(id)
0
       record.update_attribute(:deleted_at, nil)
0
       record

0
@@ -7,9 +7,9 @@ class PermanentRecordsTest < Test::Unit::TestCase
0
   def setup
0
     super
0
     Muskrat.delete_all
0
-    @wakko = Muskrat.create!(:name => 'Wakko')
0
-    @yakko = Muskrat.create!(:name => 'Yakko', :deleted_at => 4.days.ago)
0
-    @dot   = Muskrat.create!(:name => 'Dot')
0
+    @active = Muskrat.create!(:name => 'Wakko')
0
+    @deleted = Muskrat.create!(:name => 'Yakko', :deleted_at => 4.days.ago)
0
+    @the_girl   = Muskrat.create!(:name => 'Dot')
0
     Kitty.delete_all
0
     @kitty = Kitty.create!(:name => 'Meow Meow')
0
   end
0
@@ -19,48 +19,48 @@ class PermanentRecordsTest < Test::Unit::TestCase
0
   end
0
   
0
   def test_destroy_should_return_the_record
0
-    muskrat = @yakko
0
+    muskrat = @deleted
0
     assert_equal muskrat, muskrat.destroy
0
   end
0
 
0
   def test_destroy_should_set_deleted_at_attribute
0
-    assert @yakko.destroy.deleted_at
0
+    assert @active.destroy.deleted_at
0
   end
0
   
0
   def test_destroy_should_save_deleted_at_attribute
0
-    assert Muskrat.find(@yakko.destroy.id).deleted_at
0
+    assert Muskrat.find(@active.destroy.id).deleted_at
0
   end
0
   
0
   def test_destroy_should_freeze_record
0
-    assert @yakko.destroy.frozen?
0
+    assert @active.destroy.frozen?
0
   end
0
   
0
   def test_destroy_should_not_really_remove_the_record
0
-    assert Muskrat.find(@yakko.destroy.id)
0
+    assert Muskrat.find(@active.destroy.id)
0
   end
0
   
0
   def test_destroy_should_recognize_a_force_parameter
0
-    assert_raises(ActiveRecord::RecordNotFound) { @yakko.destroy(:force).reload }
0
+    assert_raises(ActiveRecord::RecordNotFound) { @active.destroy(:force).reload }
0
   end
0
   
0
   def test_destroy_should_ignore_other_parameters
0
-    assert Muskrat.find(@yakko.destroy(:hula_dancer).id)
0
+    assert Muskrat.find(@active.destroy(:hula_dancer).id)
0
   end
0
   
0
   def test_revive_should_unfreeze_record
0
-    assert !@wakko.revive.frozen?
0
+    assert !@deleted.revive.frozen?
0
   end
0
   
0
   def test_revive_should_unset_deleted_at
0
-    assert !@wakko.revive.deleted_at
0
+    assert !@deleted.revive.deleted_at
0
   end
0
   
0
   def test_revive_should_make_deleted_return_false
0
-    assert !@wakko.revive.deleted?
0
+    assert !@deleted.revive.deleted?
0
   end
0
   
0
   def test_deleted_returns_true_for_deleted_records
0
-    assert @yakko.deleted?
0
+    assert @deleted.deleted?
0
   end
0
   
0
   def test_with_deleted_limits_scope_to_deleted_records