jchupp-is_paranoid 0.0.1 → 0.0.2

data/README.textile

@@ -37,10 +37,10 @@ Now our automobiles are now soft-deleteable.
 
   that_large_automobile.destroy
   Automobile.count # => 0
-  Automobile.count_with_deleted # => 1
+  Automobile.count_with_destroyed # => 1
 
   # where is that large automobile?
-  that_large_automobile = Automobile.find_with_deleted(:all).first
+  that_large_automobile = Automobile.find_with_destroyed(:all).first
   that_large_automobile.restore
   Automobile.count # => 1
 </pre>
@@ -50,11 +50,11 @@ One thing to note, destroying is always undo-able, but deleting is not.
 <pre>
   Automobile.destroy_all
   Automobile.count # => 0
-  Automobile.count_with_deleted # => 1
+  Automobile.count_with_destroyed # => 1
   
   Automobile.delete_all
-  Automobile.count_with_deleted # => 0
-  # And you may tell yourself, "My god!  What have I done?"
+  Automobile.count_with_destroyed # => 0
+  # And you may say to yourself, "My god!  What have I done?"
 </pre>
 
 h3. and you may ask yourself, where does that highway go to?

data/lib/is_paranoid.rb

@@ -17,8 +17,8 @@ module IsParanoid
       class_eval do
         # This is the real magic.  All calls made to this model will append
         # the conditions deleted_at => nil.  Exceptions require using
-        # exclusive_scope (see self.delete_all, self.count_with_deleted,
-        # and self.find_with_deleted )
+        # exclusive_scope (see self.delete_all, self.count_with_destroyed,
+        # and self.find_with_destroyed )
         default_scope :conditions => {:deleted_at => nil}
 
         # Actually delete the model, bypassing the safety net.  Because
@@ -32,13 +32,13 @@ module IsParanoid
         end
 
         # Return a count that includes the soft-deleted models.
-        def self.count_with_deleted *args
+        def self.count_with_destroyed *args
           self.with_exclusive_scope { count(*args) }
         end
 
         # Return instances of all models matching the query regardless
         # of whether or not they have been soft-deleted.
-        def self.find_with_deleted *args
+        def self.find_with_destroyed *args
           self.with_exclusive_scope { find(*args) }
         end
 

data/spec/android_spec.rb

@@ -19,16 +19,16 @@ describe Android do
   end
 
   it "should delete normally" do
-    Android.count_with_deleted.should == 2
+    Android.count_with_destroyed.should == 2
     Android.delete_all
-    Android.count_with_deleted.should == 0
+    Android.count_with_destroyed.should == 0
   end
 
   it "should handle Model.destroy_all properly" do
     lambda{
       Android.destroy_all("owner_id = #{@luke.id}")
     }.should change(Android, :count).from(2).to(0)
-    Android.count_with_deleted.should == 2
+    Android.count_with_destroyed.should == 2
   end
 
   it "should handle Model.destroy(id) properly" do
@@ -36,7 +36,7 @@ describe Android do
       Android.destroy(@r2d2.id)
     }.should change(Android, :count).from(2).to(1)
 
-    Android.count_with_deleted.should == 2
+    Android.count_with_destroyed.should == 2
   end
 
   it "should be not show up in the relationship to the owner once deleted" do
@@ -47,24 +47,24 @@ describe Android do
     Android.first(:conditions => {:name => 'R2D2'}).should be_blank
   end
 
-  it "should be able to find deleted items via find_with_deleted" do
+  it "should be able to find deleted items via find_with_destroyed" do
     @r2d2.destroy
     Android.find(:first, :conditions => {:name => 'R2D2'}).should be_blank
-    Android.find_with_deleted(:first, :conditions => {:name => 'R2D2'}).should_not be_blank
+    Android.find_with_destroyed(:first, :conditions => {:name => 'R2D2'}).should_not be_blank
   end
 
   it "should have a proper count inclusively and exclusively of deleted items" do
     @r2d2.destroy
     @c3p0.destroy
     Android.count.should == 0
-    Android.count_with_deleted.should == 2
+    Android.count_with_destroyed.should == 2
   end
 
   it "should mark deleted on dependent destroys" do
     lambda{
       @luke.destroy
     }.should change(Android, :count).from(2).to(0)
-    Android.count_with_deleted.should == 2
+    Android.count_with_destroyed.should == 2
   end
 
   it "should allow restoring" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchupp-is_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jeffrey Chupp