delete_paranoid 1.0.1 → 1.0.2

data/lib/delete_paranoid.rb

@@ -5,8 +5,11 @@ module ActiveRecord
   class Relation
     alias_method :delete_all!, :delete_all
     def delete_all(conditions = nil)
-      delete_all!(conditions) unless @klass.paranoid?
-      update_all({:deleted_at => Time.now.utc}, conditions)
+      if @klass.paranoid?
+        update_all({:deleted_at => Time.now.utc}, conditions)
+      else
+        delete_all!(conditions)
+      end
     end
   end
 end

data/lib/delete_paranoid/version.rb

@@ -1,3 +1,3 @@
 module DeleteParanoid
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/database_setup.rb

@@ -14,5 +14,30 @@ ActiveRecord::Schema.define(:version => 2) do
     t.column :text, :string
     t.column :deleted_at, :timestamp
   end
+  create_table :links, :force => true do |t|
+    t.column :blog_id, :integer
+    t.column :name, :string
+  end
+end
+
+class Blog < ActiveRecord::Base
+  has_many :comments, :dependent => :destroy
+  has_many :links, :dependent => :destroy
+  acts_as_paranoid
+  attr_accessible :title
+  include CallbackMatcher::ActiveRecordHooks
+end
+
+class Comment < ActiveRecord::Base
+  acts_as_paranoid
+  attr_accessible :text
+  belongs_to :blog
+  include CallbackMatcher::ActiveRecordHooks
+end
+
+class Link < ActiveRecord::Base
+  belongs_to :blog
+  attr_accessible :name
+  include CallbackMatcher::ActiveRecordHooks
 end
 

data/test/helper.rb

@@ -16,130 +16,12 @@ require 'timecop'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'delete_paranoid'
+require 'matchers/destroy_matcher'
+require 'matchers/callback_matcher'
 require 'database_setup'
 
 class Test::Unit::TestCase
-  
-  def self.should_soft_destroy(subject)
-    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 find #{subject} normally" do
-      destroyed_subject = instance_variable_get(:"@#{subject}")
-      assert_raises ActiveRecord::RecordNotFound do
-        destroyed_subject.class.find destroyed_subject.id
-      end
-    end
-    should "find #{subject} when in with_deleted block" do
-      destroyed_subject = instance_variable_get(:"@#{subject}")
-      destroyed_subject.class.with_deleted do
-        assert_nothing_raised ActiveRecord::RecordNotFound do
-          assert_not_nil destroyed_subject.class.find destroyed_subject.id
-        end
-      end
-    end
-  end
-  
-  def self.should_hard_destroy(subject)
-    should "not find #{subject} normally" do
-      destroyed_subject = instance_variable_get(:"@#{subject}")
-      assert_raises ActiveRecord::RecordNotFound do
-        destroyed_subject.class.find destroyed_subject.id
-      end
-    end
-    should "not find #{subject} 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
-
+  extend DestroyMatcher::MatcherMethods
+  extend CallbackMatcher::MatcherMethods
 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/matchers/callback_matcher.rb

@@ -0,0 +1,90 @@
+
+class CallbackMatcher
+  CALLBACK_EVENTS = [:before, :after, :after_commit_on]
+  CALLBACK_TYPES = [:create, :update, :destroy, :save]
+  
+  module MatcherMethods
+    
+    def trigger_callbacks_for(callback_types)
+      CallbackMatcher.new Array.wrap(callback_types)
+    end
+    
+  end
+  
+  module ActiveRecordHooks
+    
+    def self.included(base)
+      base.class_eval do
+        class << self
+          attr_accessor :callback_tester_attrs
+        end
+        @callback_tester_attrs = []
+        CALLBACK_EVENTS.each do |ce|
+          CALLBACK_TYPES.each do |ct|
+            callback_name = :"#{ce}_#{ct}"
+            callback_attr = :"called_#{callback_name}"
+            callback_method, has_on_option = (ce.to_s =~ /_on/ ? [ce.to_s.gsub('_on',''), true] : [callback_name, false]) 
+            @callback_tester_attrs << callback_attr
+            attr_accessor callback_attr
+            send( callback_method, (has_on_option ? {:on => ct} : {})) {
+              instance_variable_set(:"@#{callback_attr}", true)
+            }
+          
+            define_method :"#{callback_attr}?" do
+              instance_variable_get(:"@#{callback_attr}")
+            end
+          end
+        end
+        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!
+      self.class.callback_tester_attrs.each do |attr|
+        send("#{attr}=", false)
+      end
+    end
+
+  end
+  
+  def initialize(callback_types)
+    @callback_types = callback_types
+  end
+  
+  def failure_message
+    "Expected #{@subject} #{expectation}:"
+  end
+  
+  def negative_failure_message
+    "Did not expect #{@subject} #{expectation}:"
+  end
+  
+  def description
+    "check that #{@callback_types.join(', ')} callbacks were called"
+  end
+  
+  def expectation
+    @expectations.join("\n")
+  end
+  
+  def matches?(subject)
+    @subject = subject
+    @expectations = []
+    result = true
+    @callback_types.each do |ct|
+      CALLBACK_EVENTS.each do |ce|
+        called = @subject.send(:"called_#{ce}_#{ct}?")
+        result &&= called
+        @expectations << "#{ce}_#{ct} callbacks to be triggered"
+      end
+    end
+    result
+  end
+  
+end
+

data/test/matchers/destroy_matcher.rb

@@ -0,0 +1,80 @@
+module DeleteParanoid
+  class DestroyMatcher
+    def softly
+      @softly = true
+      self
+    end
+    def and_freeze
+      @frozen = true
+      self
+    end
+    def and_mark_as_destroyed
+      @destroyed = true
+      self
+    end
+    def description
+      "destroy the subject"
+    end
+    def matches?(subject)
+      @subject = subject
+      errors.empty?
+    end
+    def failure_message
+      "Expected #{@subject.inspect} to be destroyed: #{errors.join("\n")}"
+    end
+    def errors
+      return @errors if @errors
+      @errors = []
+      @errors << "was found in database" if subject_found?
+      @errors << "was not found with_deleted in database" if softly? && !subject_found_with_deleted?
+      @errors << "did not populate deleted_at timestamp" if softly? && !subject_deleted_at?
+      @errors << "did not freeze instance" if frozen? && !@subject.frozen?
+      @errors << "did not destroy instance" if destroyed? && !@subject.destroyed?
+      @errors
+    end
+    def softly?
+      !!@softly
+    end
+    def frozen?
+      !!@frozen
+    end
+    def destroyed?
+      !!@destroyed
+    end
+    def subject_found?
+      !!@subject.class.find(@subject.id)
+    rescue ActiveRecord::RecordNotFound
+      false
+    end
+    def subject_found_with_deleted?
+      @subject.class.with_deleted do
+        !!@subject.class.find(@subject.id)
+      end
+    rescue ActiveRecord::RecordNotFound
+      false
+    end
+    def subject_deleted_at?
+      @subject.class.with_deleted do
+        @subject.class.find(@subject.id).deleted_at
+      end
+    rescue ActiveRecord::RecordNotFound
+      false
+    end
+
+  end
+end
+
+class DestroyMatcher
+  module MatcherMethods
+    def soft_destroy
+      DestroyMatcher.new :soft
+    end
+    def hard_destroy
+      DestroyMatcher.new :hard
+    end
+    def destroy_subject
+      DeleteParanoid::DestroyMatcher.new
+    end
+  end
+end
+

data/test/test_delete_paranoid.rb

@@ -1,125 +1,119 @@
 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_accessible :title
-    include CallbackTester
-  end
-
-  class Comment < ActiveRecord::Base
-    acts_as_paranoid
-    attr_accessible :text
-    belongs_to :blog
-    include CallbackTester
-  end
-
-  class User < ActiveRecord::Base
-  end
   context 'with non-paranoid activerecord class' do
     should 'not be paranoid' do
-      assert !User.paranoid?
+      assert !Link.paranoid?
     end
   end
+
   context 'with paranoid activerecord class' do
     should 'be paranoid' do
       assert Blog.paranoid?
     end
   end
+
   context 'with instance of paranoid class' do
     setup do
       @blog = Blog.create! :title => 'foo'
     end
     context 'when destroying instance with instance.destroy' do
-      setup do
-        @now = Time.now.utc
-        Timecop.travel @now do
-          @blog.destroy
-        end
+      subject do
+        @blog.destroy
+        @blog
       end
       
-      should_soft_destroy :blog
-      should_trigger_destroy_callbacks :blog
-      should_not_trigger_update_callbacks :blog
-      should 'save deleted_at timestamp on database record' do
-        blog = Blog.find_by_sql(['SELECT deleted_at FROM blogs WHERE id = ?', @blog.id]).first
-        assert_not_nil blog
-        assert_not_nil blog.deleted_at
-        assert_equal @now.to_i, blog.deleted_at.to_i
-      end
+      should destroy_subject.softly.and_freeze.and_mark_as_destroyed
+      should trigger_callbacks_for :destroy
+      should_not trigger_callbacks_for :update
     end
     context 'when destroying instance with Class.destroy_all' do
-      setup do
+      subject do
         Blog.destroy_all :id => @blog.id
+        @blog
       end
-      should "not find instance normally" do
-        assert_raises ActiveRecord::RecordNotFound do
-          Blog.find @blog.id
-        end
-      end
-      should "find instance when in with_deleted block" do
-        Blog.with_deleted do
-          assert_nothing_raised ActiveRecord::RecordNotFound do
-            Blog.find @blog.id
-          end
-        end
-      end
+      should destroy_subject.softly
     end
     context "when destroying instance with Class.delete_all!" do
-      setup do
+      subject do
         Blog.where({:id => @blog.id}).delete_all!
+        @blog
       end
-      should_hard_destroy :blog
+      should destroy_subject
     end
     context "when destroying instance with Class.delete!" do
-      setup do
+      subject do
         Blog.delete! @blog.id
+        @blog
       end
-      should_hard_destroy :blog
+      should destroy_subject
     end
     context 'when destroying instance with instance.destroy!' do
-      setup do
+      subject do
         @blog.destroy!
+        @blog
       end
-      should_hard_destroy :blog
-      should_trigger_destroy_callbacks :blog
+      should destroy_subject
+      should trigger_callbacks_for :destroy
+      should_not trigger_callbacks_for :update
     end
     context 'when destroying instance with instance.delete!' do
-      setup do
+      subject do
         @blog.delete!
+        @blog
       end
-      should_hard_destroy :blog
+      should destroy_subject
     end
   end
 
-  context 'with paranoid instance that has dependents' do
+  context 'with paranoid instance that has belongs to paranoid instance' do
     setup do
       @blog = Blog.create!(:title => 'foo')
       @comment = @blog.comments.create! :text => 'bar'
     end
-    context 'when destroying paranoid instance' do
-      setup do
+    context 'when destroying parent paranoid instance with destroy' do
+      subject do
         @blog.destroy
+        @comment
       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 destroy_subject.softly.and_freeze.and_mark_as_destroyed
+      should trigger_callbacks_for :destroy
+      #should_not trigger_callbacks_for :update
     end
-    context 'when destroying paranoid instance with delete_all!' do
-       setup do
+    context 'when destroying parent paranoid instance with delete_all!' do
+       subject do
          Blog.where({:id => @blog.id}).delete_all!
+         @comment
        end
 
-       should_hard_destroy :blog
-       should 'not destroy associated comment' do
-         assert_not_nil @comment.reload
-         assert_nil @comment.blog
+       should_not destroy_subject
+     end
+  end
+
+  context 'with non-paranoid instance that has belongs to paranoid instance' do
+    setup do
+      @blog = Blog.create!(:title => 'foo')
+      @link = @blog.links.create! :name => 'bar'
+    end
+    context 'when destroying parent paranoid instance with destroy' do
+      subject do
+        @blog.destroy
+        @link
+      end
+
+      should destroy_subject.and_freeze.and_mark_as_destroyed
+      should trigger_callbacks_for :destroy
+      #should_not trigger_callbacks_for :update
+    end
+    context 'when destroying parent paranoid instance with delete_all!' do
+       subject do
+         Blog.where({:id => @blog.id}).delete_all!
+         @link
        end
+
+       should_not destroy_subject
      end
   end
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delete_paranoid
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -141,6 +141,8 @@ files:
 - test/database.yml
 - test/database_setup.rb
 - test/helper.rb
+- test/matchers/callback_matcher.rb
+- test/matchers/destroy_matcher.rb
 - test/test_delete_paranoid.rb
 has_rdoc: true
 homepage: http://github.com/wireframe/delete_paranoid
@@ -180,4 +182,6 @@ test_files:
 - test/database.yml
 - test/database_setup.rb
 - test/helper.rb
+- test/matchers/callback_matcher.rb
+- test/matchers/destroy_matcher.rb
 - test/test_delete_paranoid.rb