jchupp-is_paranoid 0.6.0 → 0.7.0

data/VERSION.yml

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

data/lib/is_paranoid.rb

@@ -56,20 +56,38 @@ module IsParanoid
         end
 
         # Use update_all with an exclusive scope to restore undo the soft-delete.
-        # This bypasses update-related callbacks
-        def self.restore(id)
+        # This bypasses update-related callbacks.
+        #
+        # By default, restores cascade through associations that are
+        # :dependent => :destroy and under is_paranoid.  You can prevent restoration
+        # of associated models by passing :include_destroyed_dependents => false,
+        # for example:
+        #    Android.restore(:include_destroyed_dependents => false)
+        def self.restore(id, options = {})
+          options.reverse_merge!({:include_destroyed_dependents => true})
           with_exclusive_scope do
             update_all(
               "#{destroyed_field} = #{connection.quote(field_not_destroyed)}",
               "id = #{id}"
             )
           end
+          if options[:include_destroyed_dependents]
+            self.reflect_on_all_associations.each do |association|
+              if association.options[:dependent] == :destroy and association.klass.respond_to?(:restore)
+                association.klass.find_destroyed_only(:all,
+                  :conditions => ["#{association.primary_key_name} = ?", id]
+                ).each do |model|
+                  model.restore
+                end
+              end
+            end
+          end
         end
 
         # Set deleted_at flag on a model to field_not_destroyed, effectively
         # undoing the soft-deletion.
-        def restore
-          self.class.restore(id)
+        def restore(options = {})
+          self.class.restore(id, options)
         end
 
         # find_with_destroyed and other blah_with_destroyed and

data/spec/is_paranoid_spec.rb

@@ -1,12 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class Person < ActiveRecord::Base
+class Person < ActiveRecord::Base #:nodoc:
   validates_uniqueness_of :name
   has_many :androids, :foreign_key => :owner_id, :dependent => :destroy
 end
 
-class Android < ActiveRecord::Base
+class Android < ActiveRecord::Base #:nodoc:
   validates_uniqueness_of :name
+  has_many :components, :dependent => :destroy
 
   is_paranoid
 
@@ -16,7 +17,11 @@ class Android < ActiveRecord::Base
   end
 end
 
-class AndroidWithScopedUniqueness < ActiveRecord::Base
+class Component < ActiveRecord::Base #:nodoc:
+  is_paranoid
+end
+
+class AndroidWithScopedUniqueness < ActiveRecord::Base #:nodoc:
   set_table_name :androids
   validates_uniqueness_of :name, :scope => :deleted_at
   is_paranoid
@@ -26,10 +31,12 @@ describe Android do
   before(:each) do
     Android.delete_all
     Person.delete_all
+    Component.delete_all
 
     @luke = Person.create(:name => 'Luke Skywalker')
     @r2d2 = Android.create(:name => 'R2D2', :owner_id => @luke.id)
     @c3p0 = Android.create(:name => 'C3P0', :owner_id => @luke.id)
+    @r2d2.components.create(:name => 'Rotors')
   end
 
   it "should delete normally" do
@@ -94,6 +101,20 @@ describe Android do
     }.should change(Android, :count).from(1).to(2)
   end
 
+  it "should restore dependent models when being restored" do
+    @r2d2.destroy
+    lambda{
+      @r2d2.restore
+    }.should change(Component, :count).from(0).to(1)
+  end
+
+  it "should allow the option to not restore dependent models when being restored" do
+    @r2d2.destroy
+    lambda{
+      @r2d2.restore(:include_destroyed_dependents => false)
+    }.should_not change(Component, :count)
+  end
+
   it "should respond to various calculations" do
     @r2d2.destroy
     Android.sum('id').should == @c3p0.id
@@ -119,21 +140,21 @@ describe Android do
   end
 end
 
-class Ninja < ActiveRecord::Base
+class Ninja < ActiveRecord::Base #:nodoc:
   validates_uniqueness_of :name, :scope => :visible
   is_paranoid :field => [:visible, false, true]
 end
 
-class Pirate < ActiveRecord::Base
+class Pirate < ActiveRecord::Base #:nodoc:
   is_paranoid :field => [:alive, false, true]
 end
 
-class DeadPirate < ActiveRecord::Base
+class DeadPirate < ActiveRecord::Base #:nodoc:
   set_table_name :pirates
   is_paranoid :field => [:alive, true, false]
 end
 
-class RandomPirate < ActiveRecord::Base
+class RandomPirate < ActiveRecord::Base #:nodoc:
   set_table_name :pirates
 
   def after_destroy
@@ -141,7 +162,7 @@ class RandomPirate < ActiveRecord::Base
   end
 end
 
-class UndestroyablePirate < ActiveRecord::Base
+class UndestroyablePirate < ActiveRecord::Base #:nodoc:
   set_table_name :pirates
   is_paranoid :field => [:alive, false, true]
 

data/spec/schema.rb

@@ -13,6 +13,14 @@ ActiveRecord::Schema.define(:version => 20090317164830) do
     t.datetime "updated_at"
   end
 
+  create_table "components", :force => true do |t|
+    t.string   "name"
+    t.integer  "android_id"
+    t.datetime "deleted_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "ninjas", :force => true do |t|
     t.string   "name"
     t.boolean  "visible", :default => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchupp-is_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jeffrey Chupp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,7 +55,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ActiveRecord 2.3 compatible gem "allowing you to hide and restore records without actually deleting them."  Yes, like acts_as_paranoid, only with less code and less complexity.
 test_files: []