jchupp-is_paranoid 0.5.0 → 0.6.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 5
+:minor: 6
 :patch: 0

data/lib/is_paranoid.rb

@@ -21,7 +21,8 @@ module IsParanoid
     def self.included(base)
       base.class_eval do
         # This is the real magic.  All calls made to this model will append
-        # the conditions deleted_at => nil.  Exceptions require using
+        # the conditions deleted_at => nil (or whatever your destroyed_field
+        # and field_not_destroyed are).  All exceptions require using
         # exclusive_scope (see self.delete_all, self.count_with_destroyed,
         # and self.find_with_destroyed )
         default_scope :conditions => {destroyed_field => field_not_destroyed}
@@ -36,7 +37,10 @@ module IsParanoid
 
         # Mark the model deleted_at as now.
         def destroy_without_callbacks
-          self.update_attribute(destroyed_field, ( field_destroyed.respond_to?(:call) ? field_destroyed.call : field_destroyed))
+          self.class.update_all(
+            "#{destroyed_field} = #{self.class.connection.quote(( field_destroyed.respond_to?(:call) ? field_destroyed.call : field_destroyed))}",
+            "id = #{self.id}"
+          )
         end
 
         # Override the default destroy to allow us to flag deleted_at.
@@ -51,10 +55,21 @@ module IsParanoid
           result
         end
 
-        # Set deleted_at flag on a model to nil, effectively undoing the
-        # soft-deletion.
+        # Use update_all with an exclusive scope to restore undo the soft-delete.
+        # This bypasses update-related callbacks
+        def self.restore(id)
+          with_exclusive_scope do
+            update_all(
+              "#{destroyed_field} = #{connection.quote(field_not_destroyed)}",
+              "id = #{id}"
+            )
+          end
+        end
+
+        # Set deleted_at flag on a model to field_not_destroyed, effectively
+        # undoing the soft-deletion.
         def restore
-          self.update_attribute(destroyed_field, field_not_destroyed)
+          self.class.restore(id)
         end
 
         # find_with_destroyed and other blah_with_destroyed and

data/spec/is_paranoid_spec.rb

@@ -7,7 +7,13 @@ end
 
 class Android < ActiveRecord::Base
   validates_uniqueness_of :name
+
   is_paranoid
+
+  before_update :raise_hell
+  def raise_hell
+    raise "hell"
+  end
 end
 
 class AndroidWithScopedUniqueness < ActiveRecord::Base
@@ -16,24 +22,6 @@ class AndroidWithScopedUniqueness < ActiveRecord::Base
   is_paranoid
 end
 
-class NoCalculation < ActiveRecord::Base
-  is_paranoid
-end
-
-class Ninja < ActiveRecord::Base
-  validates_uniqueness_of :name, :scope => :visible
-  is_paranoid :field => [:visible, false, true]
-end
-
-class Pirate < ActiveRecord::Base
-  is_paranoid :field => [:alive, false, true]
-end
-
-class DeadPirate < ActiveRecord::Base
-  set_table_name :pirates
-  is_paranoid :field => [:alive, true, false]
-end
-
 describe Android do
   before(:each) do
     Android.delete_all
@@ -57,7 +45,7 @@ describe Android do
     Android.count_with_destroyed.should == 2
   end
 
-  it "should handle Model.destroy(id) properly" do
+  it "should handle Model.destroy(id) properly without hitting update/save related callbacks" do
     lambda{
       Android.destroy(@r2d2.id)
     }.should change(Android, :count).from(2).to(1)
@@ -99,7 +87,7 @@ describe Android do
     Android.count_with_destroyed.should == 2
   end
 
-  it "should allow restoring" do
+  it "should allow restoring without hitting update/save related callbacks" do
     @r2d2.destroy
     lambda{
       @r2d2.restore
@@ -129,13 +117,46 @@ describe Android do
       another_r2d2.destroy
     }.should_not raise_error
   end
-  
+end
+
+class Ninja < ActiveRecord::Base
+  validates_uniqueness_of :name, :scope => :visible
+  is_paranoid :field => [:visible, false, true]
+end
+
+class Pirate < ActiveRecord::Base
+  is_paranoid :field => [:alive, false, true]
+end
+
+class DeadPirate < ActiveRecord::Base
+  set_table_name :pirates
+  is_paranoid :field => [:alive, true, false]
+end
+
+class RandomPirate < ActiveRecord::Base
+  set_table_name :pirates
+
+  def after_destroy
+    raise 'after_destroy works'
+  end
+end
+
+class UndestroyablePirate < ActiveRecord::Base
+  set_table_name :pirates
+  is_paranoid :field => [:alive, false, true]
+
+  def before_destroy
+    false
+  end
+end
+
+describe 'Ninjas and Pirates' do
   it "should allow specifying alternate fields and field values" do
     ninja = Ninja.create(:name => 'Esteban')
     ninja.destroy
     Ninja.first.should be_blank
     Ninja.find_with_destroyed(:first).should == ninja
-    
+
     pirate = Pirate.create(:name => 'Reginald')
     pirate.destroy
     Pirate.first.should be_blank
@@ -146,4 +167,20 @@ describe Android do
       DeadPirate.first.destroy
     }.should change(Pirate, :count).from(0).to(1)
   end
+
+  it "should handle before_destroy and after_destroy callbacks properly" do
+    edward = UndestroyablePirate.create(:name => 'Edward')
+    lambda{
+      edward.destroy
+    }.should_not change(UndestroyablePirate, :count)
+
+    raul = RandomPirate.create(:name => 'Raul')
+    lambda{
+      begin
+        edward.destroy
+      rescue => ex
+        ex.message.should == 'after_destroy works'
+      end
+    }.should_not change(RandomPirate, :count)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchupp-is_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeffrey Chupp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: []