delete_paranoid 0.0.2 → 0.0.3

data/lib/delete_paranoid/version.rb

@@ -1,3 +1,3 @@
 module DeleteParanoid
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/delete_paranoid.rb

@@ -4,29 +4,47 @@ module DeleteParanoid
   module ActiveRecordExtensions
     def acts_as_paranoid
       class << self
-        alias_method :destroy!, :destroy
+        alias_method :delete_all!, :delete_all
       end
+      alias_method :destroy!, :destroy
       default_scope where(:deleted_at => nil)
-      include DeleteParanoid::InstanceMethods
       extend DeleteParanoid::ClassMethods
+      include DeleteParanoid::InstanceMethods  
     end
   end
+  
   module ClassMethods
-    def with_deleted(&block)
+    def with_deleted
       self.unscoped do
         yield
       end
     end
+    
+    def delete_all(conditions = nil)
+      update_all ["deleted_at = ?", Time.now.utc], conditions
+    end
+
+    def destroy_all!(conditions = nil)
+      if conditions
+        where(conditions).destroy_all!
+      else
+        to_a.each {|object| object.destroy! }.tap { reset }
+      end
+    end
   end
+  
   module InstanceMethods
     def destroy
       if persisted?
         with_transaction_returning_status do
           _run_destroy_callbacks do
-            update_attributes(:deleted_at => Time.now.utc)
+            self.deleted_at = Time.now.utc
+            self.class.delete_all :id => self.id
             @destroyed = true
           end
         end
+      else
+        @destroyed = true
       end
       
       freeze

data/test/database_setup.rb

@@ -3,11 +3,16 @@ config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
 
-ActiveRecord::Schema.define(:version => 1) do
+ActiveRecord::Schema.define(:version => 2) do
   create_table :blogs, :force => true do |t|
     t.column :title, :string
     t.column :body, :string
     t.column :deleted_at, :timestamp
   end
+  create_table :comments, :force => true do |t|
+    t.column :blog_id, :integer
+    t.column :text, :string
+    t.column :deleted_at, :timestamp
+  end
 end
 

data/test/helper.rb

@@ -18,5 +18,130 @@ require 'delete_paranoid'
 require 'database_setup'
 
 class Test::Unit::TestCase
+  
+  def self.should_soft_destroy(subject)
+    should "assign deleted_at on #{subject}" do
+      assert_not_nil instance_variable_get(:"@#{subject}").deleted_at
+    end
+    should "set #{subject} to destroyed" do
+      assert instance_variable_get(:"@#{subject}").destroyed?
+    end
+    should "freeze #{subject}" do
+      assert instance_variable_get(:"@#{subject}").frozen?
+    end
+    should "not be found normally" do
+      destroyed_subject = instance_variable_get(:"@#{subject}")
+      assert_raises ActiveRecord::RecordNotFound do
+        destroyed_subject.class.find destroyed_subject.id
+      end
+    end
+    should "be found when in with_deleted block" do
+      destroyed_subject = instance_variable_get(:"@#{subject}")
+      destroyed_subject.class.with_deleted do
+        assert_nothing_raised ActiveRecord::RecordNotFound do
+          destroyed_subject.class.find destroyed_subject.id
+        end
+      end
+    end
+  end
+  
+  def self.should_hard_destroy(subject)
+    should "not be retrievable" do
+      destroyed_subject = instance_variable_get(:"@#{subject}")
+      assert_raises ActiveRecord::RecordNotFound do
+        destroyed_subject.class.find destroyed_subject.id
+      end
+    end
+    should "not be retrievable in with_deleted block" do
+      destroyed_subject = instance_variable_get(:"@#{subject}")
+      destroyed_subject.class.with_deleted do
+        assert_raises ActiveRecord::RecordNotFound do
+          destroyed_subject.class.find destroyed_subject.id
+        end
+      end
+    end
+  end
+  
+  def self.should_trigger_destroy_callbacks(subject)
+    should "call before_destroy callbacks on #{subject}" do
+      assert instance_variable_get(:"@#{subject}").called_before_destroy
+    end
+    should "call after_destroy callbacks on #{subject}" do
+      assert instance_variable_get(:"@#{subject}").called_after_destroy
+    end
+    should "call after_commit_on_destroy callbacks on #{subject}" do
+      assert instance_variable_get(:"@#{subject}").called_after_commit_on_destroy
+    end
+  end
+  
+  def self.should_not_trigger_update_callbacks(subject)
+    should "not call before_update callbacks on #{subject}" do
+      assert !instance_variable_get(:"@#{subject}").called_before_update
+    end
+    should "not call after_update callbacks on #{subject}" do
+      assert !instance_variable_get(:"@#{subject}").called_after_update
+    end
+    should "not call after_commit_on_update callbacks on #{subject}" do
+      assert !instance_variable_get(:"@#{subject}").called_after_commit_on_update
+    end
+  end
+
 end
 
+
+module CallbackTester
+  ATTRS = %w{ called_before_destroy called_after_destroy called_after_commit_on_destroy called_before_update called_after_update called_after_commit_on_update }
+  
+  def self.included(base)
+    base.class_eval do
+      attr_accessor *ATTRS
+  
+      before_update :call_me_before_update
+      after_update :call_me_after_update
+  
+      before_destroy :call_me_before_destroy
+      after_destroy :call_me_after_destroy
+
+      after_commit :call_me_after_commit_on_destroy, :on => :destroy
+      after_commit :call_me_after_commit_on_update, :on => :update
+  
+      alias_method_chain :initialize, :callback_init
+    end
+  end
+  
+  def initialize_with_callback_init(*args)
+    reset_callback_flags!
+    initialize_without_callback_init(*args)
+  end
+  
+  def reset_callback_flags!
+    ATTRS.each do |attr|
+      send("#{attr}=", false)
+    end
+  end
+
+  def call_me_before_destroy
+    @called_before_destroy = true
+  end
+
+  def call_me_after_destroy
+    @called_after_destroy = true
+  end
+
+  def call_me_after_commit_on_destroy
+    @called_after_commit_on_destroy = true
+  end
+  
+  def call_me_before_update
+    @called_before_update = true
+  end
+
+  def call_me_after_update
+    @called_after_update = true
+  end
+
+  def call_me_after_commit_on_update
+    @called_after_commit_on_update = true
+  end
+  
+end

data/test/test_delete_paranoid.rb

@@ -2,62 +2,87 @@ require File.join(File.dirname(__FILE__), 'helper')
 
 class TestDeleteParanoid < Test::Unit::TestCase
   class Blog < ActiveRecord::Base
+    has_many :comments, :dependent => :destroy
     acts_as_paranoid
-    
-    attr_accessor :called_before_destroy, :called_after_destroy, :called_after_commit_on_destroy
-
-    before_destroy :call_me_before_destroy
-    after_destroy :call_me_after_destroy
-
-    after_commit :call_me_after_commit_on_destroy, :on => :destroy
-
-    def initialize(*attrs)
-      @called_before_destroy = @called_after_destroy = @called_after_commit_on_destroy = false
-      super(*attrs)
-    end
-
-    def call_me_before_destroy
-      @called_before_destroy = true
-    end
+    attr_accessible :title
+    include CallbackTester
+  end
 
-    def call_me_after_destroy
-      @called_after_destroy = true
+  class Comment < ActiveRecord::Base
+    acts_as_paranoid
+    attr_accessible :text
+    include CallbackTester
+  end
+  
+  context 'with paranoid instance' do
+    setup do
+      @blog = Blog.new
     end
-
-    def call_me_after_commit_on_destroy
-      @called_after_commit_on_destroy = true
+    should 'have destroy! method' do
+      assert @blog.respond_to? :destroy!
     end
   end
-  
   context 'with paranoid class' do
-    should 'have destroy! method' do
-      assert Blog.respond_to? :destroy!
+    should 'have delete_all! method' do
+      assert Blog.respond_to? :delete_all!
     end
+
     context 'when on instance destroyed softly' do
       setup do
         @blog = Blog.create! :title => 'foo'
         @blog.destroy
       end
-      should 'not be included in all results' do
-        assert !Blog.all.include?(@blog)
-      end
-      should 'be included when wrapped in with_deleted block' do
-        Blog.with_deleted do
-          assert Blog.all.include?(@blog)
+      
+      should_soft_destroy :blog
+      should_trigger_destroy_callbacks :blog
+      should_not_trigger_update_callbacks :blog
+    end
+    
+    context 'when an instance with dependents is destroyed softly' do
+      setup do
+        @comment = Comment.create! :text => 'bar'
+        @blog = Blog.create!(:title => 'foo').tap do |blog|
+          blog.comments << @comment
         end
+        @blog.destroy
       end
-      should "call before_destroy callbacks" do
-        assert @blog.called_before_destroy
-      end
-      should "call after_destroy callbacks" do
-        assert @blog.called_after_destroy
-      end
-      should "call after_commit_on_destroy callbacks" do
-        assert @blog.called_after_commit_on_destroy
-      end
+
+      should_soft_destroy :blog
+      should_trigger_destroy_callbacks :blog
+      should_not_trigger_update_callbacks :blog
       
+      should_soft_destroy :comment
+      should_trigger_destroy_callbacks :comment
+      # should_not_trigger_update_callbacks :comment
     end
+    
+    context "when on instance destroyed hardly" do
+      setup do
+        @blog = Blog.create! :title => 'foo'
+        @blog.destroy!
+      end
 
-    should 'hard delete with destroy!'
+      should_hard_destroy :blog
+      should_trigger_destroy_callbacks :blog
+      should_not_trigger_update_callbacks :blog
+    end
+    
+    context 'when an instance with dependents is destroyed hardly' do
+       setup do
+         @comment = Comment.create! :text => 'bar'
+         @blog = Blog.create!(:title => 'foo').tap do |blog|
+           blog.comments << @comment
+         end
+         @blog.destroy!
+       end
+
+       should_hard_destroy :blog
+       should_trigger_destroy_callbacks :blog
+       should_not_trigger_update_callbacks :blog
+       # should_hard_destroy :comment
+       should_trigger_destroy_callbacks :comment
+       # should_not_trigger_update_callbacks :comment
+     end
+    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delete_paranoid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -05:00
+date: 2011-04-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency