after_commit 1.0.6 → 1.0.7

data/README.textile

@@ -4,7 +4,7 @@ An ActiveRecord/Rails library to add @before_commit@, @after_commit@, @before_ro
 
 h2. Installation
 
-<pre><code>gem install after_commit --source http://gemcutter.org</code></pre>
+<pre><code>gem install after_commit</code></pre>
 
 h2. Usage
 
@@ -35,6 +35,13 @@ You can use these just like you would any other callback:
   end
 end</code></pre>
 
+h2. In Tests
+
+Keep in mind that transactions are finicky at best in tests, and so there's a helper module to make @after_commit@ play nicely in your testing context. You'll need to add these two lines to your spec/test helper:
+
+<pre><code>ActiveRecord::Base.send(:include, AfterCommit::AfterSavepoint)
+ActiveRecord::Base.include_after_savepoint_extensions</code></pre>
+
 h2. Credits
 
 This code first appeared in a blog post "by Eli Miller":http://elimiller.blogspot.com/2007/06/proper-cache-expiry-with-aftercommit.html, and was then included in "Thinking Sphinx":http://ts.freelancing-gods.com by "Pat Allan":http://freelancing-gods.com, with modifications from Joost Hietbrink. The code was then "put on GitHub as a plugin":http://github.com/GUI/after_commit by Nick Muerdter, and many people forked and added their own contributions.
@@ -49,3 +56,7 @@ This version (maintained by Pat Allan) includes the following patches:
 * Scoping callbacks to specific connections ("Mat Brown":http://outofti.me/)
 * before_* callbacks ("Trotter Cashion":http://trottercashion.com/)
 * Gemspec and extended tests, works as a plugin, doesn't load ActiveRecord hooks twice, doesn't add Test environment hook automatically. ("David Yip":http://github.com/yipdw)
+* Exception propagation ("George Ogata":http://github.com/oggy/)
+* Keeping callbacks focused on the correct transactions ("Benjamin Stein":http://benjaminste.in/)
+* Using savepoints for test helper ("Lars Klevan":http://www.linkedin.com/in/larsklevan and "Joel Chippindale":http://blog.monkeysthumb.org/)
+* Only tracking objects from classes that have appropriate callbacks; Adding @after/before_commit_on_save@ to cover creates and updates but not destroys ("Jason Weathered":http://jasoncodes.com/)

data/lib/after_commit.rb

@@ -14,6 +14,11 @@ module AfterCommit
     add_to_collection  :committed_records_on_update, connection, record
   end
 
+  def self.record_saved(connection, record)
+    prepare_collection :committed_records_on_save, connection
+    add_to_collection  :committed_records_on_save, connection, record
+  end
+
   def self.record_destroyed(connection, record)
     prepare_collection :committed_records_on_destroy, connection
     add_to_collection  :committed_records_on_destroy, connection, record
@@ -31,6 +36,10 @@ module AfterCommit
     collection :committed_records_on_update, connection
   end
 
+  def self.saved_records(connection)
+    collection :committed_records_on_save, connection
+  end
+
   def self.destroyed_records(connection)
     collection :committed_records_on_destroy, connection
   end
@@ -40,6 +49,7 @@ module AfterCommit
       :committed_records,
       :committed_records_on_create,
       :committed_records_on_update,
+      :committed_records_on_save,
       :committed_records_on_destroy
     ].each do |collection|
       Thread.current[collection]                        ||= {}
@@ -62,9 +72,10 @@ module AfterCommit
   end
 end
 
+require 'after_commit/active_support_callbacks'
 require 'after_commit/active_record'
 require 'after_commit/connection_adapters'
-require 'after_commit/test_bypass'
+require 'after_commit/after_savepoint'
 
 ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
 ActiveRecord::Base.include_after_commit_extensions

data/lib/after_commit/active_record.rb

@@ -31,91 +31,55 @@ module AfterCommit
           end
         end
         
-        # The define_callbacks method was added post Rails 2.0.2 - if it
-        # doesn't exist, we define the callback manually
-        if respond_to?(:define_callbacks)
-          define_callbacks  :after_commit,
-                            :after_commit_on_create,
-                            :after_commit_on_update,
-                            :after_commit_on_destroy,
-                            :after_rollback,
-                            :before_commit,
-                            :before_commit_on_create,
-                            :before_commit_on_update,
-                            :before_commit_on_destroy,
-                            :before_rollback
-        else
-          class << self
-            # Handle after_commit callbacks - call all the registered callbacks.
-            def after_commit(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit, callbacks)
-            end
-            
-            def after_commit_on_create(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_create, callbacks)
-            end
-            
-            def after_commit_on_update(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_update, callbacks)
-            end
-            
-            def after_commit_on_destroy(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit_on_destroy, callbacks)
-            end
-
-            def after_rollback(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:after_commit, callbacks)
-            end
-
-            def before_commit(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:before_commit, callbacks)
-            end
-            
-            def before_commit_on_create(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:before_commit_on_create, callbacks)
-            end
-            
-            def before_commit_on_update(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:before_commit_on_update, callbacks)
-            end
-            
-            def before_commit_on_destroy(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:before_commit_on_destroy, callbacks)
-            end
-
-            def before_rollback(*callbacks, &block)
-              callbacks << block if block_given?
-              write_inheritable_array(:before_commit, callbacks)
-            end
-          end
-        end
-
+        define_callbacks  :after_commit,
+                          :after_commit_on_create,
+                          :after_commit_on_update,
+                          :after_commit_on_save,
+                          :after_commit_on_destroy,
+                          :after_rollback,
+                          :before_commit,
+                          :before_commit_on_create,
+                          :before_commit_on_update,
+                          :before_commit_on_save,
+                          :before_commit_on_destroy,
+                          :before_rollback
+        
         after_create  :add_committed_record_on_create
         after_update  :add_committed_record_on_update
+        after_save    :add_committed_record_on_save
         after_destroy :add_committed_record_on_destroy
         
+        def add_committed_record
+          if have_callback? :before_commit, :after_commit, :before_rollback, :after_rollback
+            AfterCommit.record(self.class.connection, self)
+          end
+        end
+        
         def add_committed_record_on_create
-          AfterCommit.record(self.class.connection, self)
-          AfterCommit.record_created(self.class.connection, self)
+          add_committed_record
+          if have_callback? :before_commit_on_create, :after_commit_on_create
+            AfterCommit.record_created(self.class.connection, self)
+          end
         end
         
         def add_committed_record_on_update
-          AfterCommit.record(self.class.connection, self)
-          AfterCommit.record_updated(self.class.connection, self)
+          add_committed_record
+          if have_callback? :before_commit_on_update, :after_commit_on_update
+            AfterCommit.record_updated(self.class.connection, self)
+          end
+        end
+        
+        def add_committed_record_on_save
+          if have_callback? :before_commit_on_save, :after_commit_on_save
+            AfterCommit.record_saved(self.class.connection, self)
+          end
         end
         
         def add_committed_record_on_destroy
-          AfterCommit.record(self.class.connection, self)
-          AfterCommit.record_destroyed(self.class.connection, self)
+          add_committed_record
+          if have_callback? :before_commit_on_destroy, :after_commit_on_destroy
+            AfterCommit.record_destroyed(self.class.connection, self)
+          end
         end
       end
     end

data/lib/after_commit/active_support_callbacks.rb

@@ -0,0 +1,59 @@
+if defined? ActiveSupport::Callbacks
+  
+  module AfterCommit
+    module ActiveSupportCallbacks
+      def self.included(base)
+        
+        base::Callback.class_eval do
+          def have_callback?
+            true
+          end
+        end
+        
+        base::CallbackChain.class_eval do
+          def have_callback?
+            any? &:have_callback?
+          end
+        end
+        
+        base.class_eval do
+          def have_callback?(*callbacks)
+            self.class.observers.size > 0 or
+            self.class.count_observers > 0 or
+            callbacks.any? do |callback|
+              self.class.send("#{callback}_callback_chain").have_callback?
+            end
+          end
+        end
+        
+      end
+    end
+  end
+  ActiveSupport::Callbacks.send(:include, AfterCommit::ActiveSupportCallbacks)
+  
+else
+  
+  class ActiveRecord::Base
+    
+    def self.define_callbacks(*names)
+      names.each do |name|
+        instance_eval <<-RUBY
+          def #{name}(*callbacks, &block)
+            callbacks << block if block_given?
+            write_inheritable_array(:#{name}, callbacks)
+          end
+        RUBY
+      end
+    end
+    
+    def have_callback?(*names)
+      self.class.observers.size > 0 or
+      self.class.count_observers > 0 or
+      names.any? do |name|
+        !self.class.read_inheritable_attribute(name).blank?
+      end
+    end
+    
+  end
+  
+end

data/lib/after_commit/after_savepoint.rb

@@ -0,0 +1,86 @@
+# Fix problems caused because tests all run in a single transaction.
+
+# The single transaction means that after_commit callback never happens in tests.  Instead use savepoints.
+
+module AfterCommit
+  module AfterSavepoint
+    def self.included(klass)
+      klass.class_eval do
+        class << self
+          def include_after_savepoint_extensions
+            base = ::ActiveRecord::ConnectionAdapters::AbstractAdapter
+            Object.subclasses_of(base).each do |klass|
+              include_after_savepoint_extension klass
+            end
+        
+            if defined?(JRUBY_VERSION) and defined?(JdbcSpec::MySQL)
+              include_after_savepoint_extension JdbcSpec::MySQL
+            end
+          end
+
+          private
+      
+          def include_after_savepoint_extension(adapter)
+            additions = AfterCommit::TestConnectionAdapters
+            unless adapter.included_modules.include?(additions)
+              adapter.send :include, additions
+            end
+          end
+        end
+      end
+    end
+  end
+  
+  module TestConnectionAdapters
+    def self.included(base)
+      base.class_eval do
+        def release_savepoint_with_callback
+          increment_transaction_pointer
+          committed = false
+          begin
+            trigger_before_commit_callbacks
+            trigger_before_commit_on_create_callbacks
+            trigger_before_commit_on_save_callbacks
+            trigger_before_commit_on_update_callbacks
+            trigger_before_commit_on_destroy_callbacks
+            
+            release_savepoint_without_callback
+            committed = true
+            
+            trigger_after_commit_callbacks
+            trigger_after_commit_on_create_callbacks
+            trigger_after_commit_on_save_callbacks
+            trigger_after_commit_on_update_callbacks
+            trigger_after_commit_on_destroy_callbacks
+          rescue
+            unless committed
+              decrement_transaction_pointer
+              rollback_to_savepoint
+              increment_transaction_pointer
+            end
+          ensure
+            AfterCommit.cleanup(self)
+            decrement_transaction_pointer
+          end
+        end 
+        alias_method_chain :release_savepoint, :callback
+
+        # In the event the transaction fails and rolls back, nothing inside
+        # should recieve the after_commit callback, but do fire the after_rollback
+        # callback for each record that failed to be committed.
+        def rollback_to_savepoint_with_callback
+          increment_transaction_pointer
+          begin
+            trigger_before_rollback_callbacks
+            rollback_to_savepoint_without_callback
+            trigger_after_rollback_callbacks
+          ensure
+            AfterCommit.cleanup(self)
+          end
+          decrement_transaction_pointer
+        end
+        alias_method_chain :rollback_to_savepoint, :callback
+      end
+    end
+  end
+end

data/lib/after_commit/connection_adapters.rb

@@ -2,6 +2,19 @@ module AfterCommit
   module ConnectionAdapters
     def self.included(base)
       base.class_eval do
+        def transaction_with_callback(*args, &block)
+          # @disable_rollback is set to false at the start of the
+          # outermost call to #transaction.  After committing, it is
+          # set to true to prevent exceptions causing a spurious
+          # rollback.
+          outermost_call = @disable_rollback.nil?
+          @disable_rollback = false if outermost_call
+          transaction_without_callback(*args, &block)
+        ensure
+          @disable_rollback = nil if outermost_call
+        end
+        alias_method_chain :transaction, :callback
+
         # The commit_db_transaction method gets called when the outermost
         # transaction finishes and everything inside commits. We want to
         # override it so that after this happens, any records that were saved
@@ -9,27 +22,36 @@ module AfterCommit
         # callback fired.
         def commit_db_transaction_with_callback
           increment_transaction_pointer
-          committed = false
           result    = nil
           begin
             trigger_before_commit_callbacks
             trigger_before_commit_on_create_callbacks
             trigger_before_commit_on_update_callbacks
+            trigger_before_commit_on_save_callbacks
             trigger_before_commit_on_destroy_callbacks
-            
+
             result = commit_db_transaction_without_callback
-            committed = true
-            
+            @disable_rollback = true
+
             trigger_after_commit_callbacks
             trigger_after_commit_on_create_callbacks
             trigger_after_commit_on_update_callbacks
+            trigger_after_commit_on_save_callbacks
             trigger_after_commit_on_destroy_callbacks
             result
           rescue
-            committed ? result : rollback_db_transaction
+            # Need to decrement the transaction pointer before calling
+            # rollback... to ensure it is not incremented twice
+            unless @disable_rollback
+              decrement_transaction_pointer
+              @already_decremented = true
+            end
+            
+            # We still want to raise the exception.
+            raise
           ensure
             AfterCommit.cleanup(self)
-            decrement_transaction_pointer
+            decrement_transaction_pointer unless @already_decremented
           end
         end 
         alias_method_chain :commit_db_transaction, :callback
@@ -38,6 +60,8 @@ module AfterCommit
         # should recieve the after_commit callback, but do fire the after_rollback
         # callback for each record that failed to be committed.
         def rollback_db_transaction_with_callback
+          return if @disable_rollback
+          increment_transaction_pointer
           begin
             result = nil
             trigger_before_rollback_callbacks
@@ -46,7 +70,9 @@ module AfterCommit
             result
           ensure
             AfterCommit.cleanup(self)
+            decrement_transaction_pointer
           end
+          decrement_transaction_pointer
         end
         alias_method_chain :rollback_db_transaction, :callback
         
@@ -78,6 +104,12 @@ module AfterCommit
           end 
         end
       
+        def trigger_before_commit_on_save_callbacks
+          AfterCommit.saved_records(self).each do |record|
+            record.send :callback, :before_commit_on_save
+          end
+        end
+        
         def trigger_before_commit_on_destroy_callbacks
           AfterCommit.destroyed_records(self).each do |record|
             record.send :callback, :before_commit_on_destroy
@@ -86,11 +118,7 @@ module AfterCommit
 
         def trigger_before_rollback_callbacks
           AfterCommit.records(self).each do |record|
-            begin
-              record.send :callback, :before_rollback
-            rescue
-              #
-            end
+            record.send :callback, :before_rollback
           end 
         end
 
@@ -98,23 +126,15 @@ module AfterCommit
           # Trigger the after_commit callback for each of the committed
           # records.
           AfterCommit.records(self).each do |record|
-            begin
-              record.send :callback, :after_commit
-            rescue
-              #
-            end
+            record.send :callback, :after_commit
           end
         end
-      
+            
         def trigger_after_commit_on_create_callbacks
           # Trigger the after_commit_on_create callback for each of the committed
           # records.
           AfterCommit.created_records(self).each do |record|
-            begin
-              record.send :callback, :after_commit_on_create
-            rescue
-              #
-            end
+            record.send :callback, :after_commit_on_create
           end
         end
       
@@ -122,23 +142,23 @@ module AfterCommit
           # Trigger the after_commit_on_update callback for each of the committed
           # records.
           AfterCommit.updated_records(self).each do |record|
-            begin
-              record.send :callback, :after_commit_on_update
-            rescue
-              #
-            end
+            record.send :callback, :after_commit_on_update
           end
         end
       
+        def trigger_after_commit_on_save_callbacks
+          # Trigger the after_commit_on_save callback for each of the committed
+          # records.
+          AfterCommit.saved_records(self).each do |record|
+            record.send :callback, :after_commit_on_save
+          end
+        end
+        
         def trigger_after_commit_on_destroy_callbacks
           # Trigger the after_commit_on_destroy callback for each of the committed
           # records.
           AfterCommit.destroyed_records(self).each do |record|
-            begin
-              record.send :callback, :after_commit_on_destroy
-            rescue
-              #
-            end
+            record.send :callback, :after_commit_on_destroy
           end
         end
 
@@ -146,10 +166,7 @@ module AfterCommit
           # Trigger the after_rollback callback for each of the committed
           # records.
           AfterCommit.records(self).each do |record|
-            begin
-              record.send :callback, :after_rollback
-            rescue
-            end
+            record.send :callback, :after_rollback
           end 
         end
         

data/test/after_commit_test.rb

@@ -1,41 +1,37 @@
 require 'test_helper'
 
 class MockRecord < ActiveRecord::Base
-  attr_accessor :before_commit_on_create_called
-  attr_accessor :before_commit_on_update_called
-  attr_accessor :before_commit_on_destroy_called
-  attr_accessor :after_commit_on_create_called
-  attr_accessor :after_commit_on_update_called
-  attr_accessor :after_commit_on_destroy_called
-
-  before_commit_on_create :do_before_create
-  def do_before_create
-    self.before_commit_on_create_called = true
-  end
-
-  before_commit_on_update :do_before_update
-  def do_before_update
-    self.before_commit_on_update_called = true
-  end
-
-  before_commit_on_create :do_before_destroy
-  def do_before_destroy
-    self.before_commit_on_destroy_called = true
+  
+  PHASES = %w(before after)
+  ACTIONS = %w(create update save destroy)
+  
+  PHASES.each do |phase|
+    ACTIONS.each do |action|
+      
+      class_eval <<-RUBY
+        
+        attr_accessor :#{phase}_commit_on_#{action}_called
+        
+        #{phase}_commit_on_#{action} :do_#{phase}_#{action}
+        def do_#{phase}_#{action}
+          self.#{phase}_commit_on_#{action}_called = true
+        end
+        
+      RUBY
+      
+    end
   end
+  
+end
 
+class CountingRecord < ActiveRecord::Base
+  attr_accessor :after_commit_on_create_called
+  cattr_accessor :counter
+  @@counter=0
+  
   after_commit_on_create :do_after_create
   def do_after_create
-    self.after_commit_on_create_called = true
-  end
-
-  after_commit_on_update :do_after_update
-  def do_after_update
-    self.after_commit_on_update_called = true
-  end
-
-  after_commit_on_create :do_after_destroy
-  def do_after_destroy
-    self.after_commit_on_destroy_called = true
+    @@counter+=1
   end
 end
 
@@ -60,7 +56,7 @@ class Bar < ActiveRecord::Base
 end
 
 class UnsavableRecord < ActiveRecord::Base
-  attr_accessor :after_commit_called
+  attr_accessor :after_commit_called, :after_rollback_called
 
   set_table_name 'mock_records'
 
@@ -75,10 +71,36 @@ class UnsavableRecord < ActiveRecord::Base
   end
 
   after_commit :after_commit
-
   def after_commit
     self.after_commit_called = true
   end
+
+  after_rollback :after_rollback
+  def after_rollback
+    self.after_rollback_called = true
+  end
+end
+
+class TrackCountRecord < ActiveRecord::Base
+  attr_accessor :total_count
+
+  set_table_name 'mock_records'
+
+  protected
+
+  after_commit :update_counts
+  after_rollback :update_counts
+
+  def update_counts
+    all_records =
+      AfterCommit.records(connection) +
+      AfterCommit.created_records(connection) +
+      AfterCommit.updated_records(connection) +
+      AfterCommit.saved_records(connection) +
+      AfterCommit.destroyed_records(connection)
+    all_records.uniq!
+    self.total_count = all_records.size
+  end
 end
 
 class AfterCommitTest < Test::Unit::TestCase
@@ -88,10 +110,26 @@ class AfterCommitTest < Test::Unit::TestCase
   
   def test_before_commit_on_update_is_called
     record = MockRecord.create!
+    record.before_commit_on_update_called = false
     record.save
     assert_equal true, record.before_commit_on_update_called
   end
   
+  def test_before_commit_on_update_is_not_called_for_create
+    assert_nil MockRecord.create!.before_commit_on_update_called
+  end
+  
+  def test_before_commit_on_save_is_called_for_create
+    assert_equal true, MockRecord.create!.before_commit_on_save_called
+  end
+  
+  def test_before_commit_on_save_is_called_for_update
+    record = MockRecord.create!
+    record.before_commit_on_save_called = false
+    record.save
+    assert_equal true, record.before_commit_on_save_called
+  end
+  
   def test_before_commit_on_destroy_is_called
     assert_equal true, MockRecord.create!.destroy.before_commit_on_destroy_called
   end
@@ -102,10 +140,26 @@ class AfterCommitTest < Test::Unit::TestCase
   
   def test_after_commit_on_update_is_called
     record = MockRecord.create!
+    record.after_commit_on_update_called = false
     record.save
     assert_equal true, record.after_commit_on_update_called
   end
   
+  def test_after_commit_on_update_is_not_called_for_create
+    assert_nil MockRecord.create!.after_commit_on_update_called
+  end
+  
+  def test_after_commit_on_save_is_called_for_create
+    assert_equal true, MockRecord.create!.after_commit_on_save_called
+  end
+  
+  def test_after_commit_on_save_is_called_for_update
+    record = MockRecord.create!
+    record.after_commit_on_save_called = false
+    record.save
+    assert_equal true, record.after_commit_on_save_called
+  end
+  
   def test_after_commit_on_destroy_is_called
     assert_equal true, MockRecord.create!.destroy.after_commit_on_destroy_called
   end
@@ -113,14 +167,116 @@ class AfterCommitTest < Test::Unit::TestCase
   def test_after_commit_does_not_trigger_when_transaction_rolls_back
     record = UnsavableRecord.new
     begin; record.save; rescue; end
-  
+
+    # Ensure that commit of another transaction doesn't then trigger the
+    # after_commit hook on previously rolled back record
+    another_record = MockRecord.create!
+    another_record.save
+
     assert_equal false, record.after_commit_called
   end
+
+  def test_after_commit_does_not_trigger_when_unrelated_transaction_commits
+    begin
+      CountingRecord.transaction do
+        CountingRecord.create!
+        raise "fail"
+      end
+    rescue
+    end
+    assert_equal 0, CountingRecord.counter
+    CountingRecord.create!
+    assert_equal 1, CountingRecord.counter
+  end
   
+  def test_after_rollback_triggered_when_transaction_rolls_back
+    record = UnsavableRecord.new
+    begin; record.save; rescue; end
+
+    assert record.after_rollback_called
+  end
+
   def test_two_transactions_are_separate
     Bar.delete_all
     foo = Foo.create
     
     assert_equal 1, foo.creating
   end
+  
+  def test_records_with_callbacks_are_tracked
+    record = nil
+    MockRecord.transaction do
+      record = TrackCountRecord.create!
+      5.times.each { MockRecord.create! }
+    end
+    assert_equal 6, record.total_count
+  end
+  
+  def test_records_without_callbacks_are_not_tracked
+    record = nil
+    MockRecord.transaction do
+      record = TrackCountRecord.create!
+      5.times.each { Bar.create! }
+    end
+    assert_equal 1, record.total_count
+  end
+
+  TestError = Class.new(StandardError)
+
+  def test_exceptions_in_before_commit_on_create_are_not_swallowed
+    record = MockRecord.new
+    def record.do_before_create
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.save!}
+  end
+
+  def test_exceptions_in_after_commit_on_create_are_not_swallowed
+    record = MockRecord.new
+    def record.do_after_create
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.save!}
+  end
+
+  def test_exceptions_in_before_commit_on_update_are_not_swallowed
+    record = MockRecord.create
+    def record.do_before_update
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.update_attributes({})}
+  end
+
+  def test_exceptions_in_after_commit_on_update_are_not_swallowed
+    record = MockRecord.create
+    def record.do_after_update
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.update_attributes({})}
+  end
+
+  def test_exceptions_in_before_commit_on_destroy_are_not_swallowed
+    record = MockRecord.create
+    def record.do_before_destroy
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.destroy}
+  end
+
+  def test_exceptions_in_after_commit_on_destroy_are_not_swallowed
+    record = MockRecord.create
+    def record.do_after_destroy
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.destroy}
+  end
+
+  def test_transactions_in_hooks_do_not_cause_spurious_rollbacks
+    record = MockRecord.create
+    def record.do_after_destroy
+      MockRecord.transaction{}
+      raise TestError, 'catch me!'
+    end
+    assert_raises(TestError){record.destroy}
+  end
 end

data/test/test_helper.rb

@@ -2,23 +2,20 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'test/unit'
 require 'rubygems'
 require 'active_record'
-
-begin
-  require 'sqlite3'
-rescue LoadError
-  gem 'sqlite3-ruby'
-  retry
-end
+require 'sqlite3'
 
 ActiveRecord::Base.establish_connection({"adapter" => "sqlite3", "database" => 'test.sqlite3'})
+tables = %w( mock_records counting_records foos bars )
+
 begin
-  ActiveRecord::Base.connection.execute("drop table mock_records");
-  ActiveRecord::Base.connection.execute("drop table foos");
-  ActiveRecord::Base.connection.execute("drop table bars");
+  tables.each do |table|
+    ActiveRecord::Base.connection.execute("drop table #{table}");
+  end
 rescue
 end
-ActiveRecord::Base.connection.execute("create table mock_records(id int)");
-ActiveRecord::Base.connection.execute("create table foos(id int)");
-ActiveRecord::Base.connection.execute("create table bars(id int)");
+
+tables.each do |table|
+  ActiveRecord::Base.connection.execute("create table #{table}(id int, name string)");
+end
 
 require 'after_commit'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: after_commit
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -11,29 +16,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +11:00
+date: 2010-05-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "\n    A Ruby on Rails plugin to add an after_commit callback. This can be used to trigger methods only after the entire transaction is complete.\n  "
 email: pat@freelancing-gods.com
 executables: []
@@ -47,8 +56,9 @@ files:
 - LICENSE
 - lib/after_commit.rb
 - lib/after_commit/active_record.rb
+- lib/after_commit/active_support_callbacks.rb
+- lib/after_commit/after_savepoint.rb
 - lib/after_commit/connection_adapters.rb
-- lib/after_commit/test_bypass.rb
 - README.textile
 has_rdoc: true
 homepage: http://github.com/freelancing-god/after_commit
@@ -63,18 +73,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: after_commit callback for ActiveRecord

data/lib/after_commit/test_bypass.rb

@@ -1,30 +0,0 @@
-# Fix problems caused because tests all run in a single transaction.
-
-# The single transaction means that after_commit callback never happens in tests.  Each of these method definitions
-# overwrites the method in the after_commit plugin that stores the callback for after the commit.  In each case here
-# we simply call the callback rather than waiting for a commit that will never come.
-
-module AfterCommit::TestBypass
-  def self.included(klass)
-    klass.class_eval do
-      [:add_committed_record_on_create, :add_committed_record_on_update, :add_committed_record_on_destroy].each do |method|
-        remove_method(method)
-      end
-    end
-  end
-
-  def add_committed_record_on_create
-    callback :after_commit
-    callback :after_commit_on_create
-  end
-
-  def add_committed_record_on_update
-    callback :after_commit
-    callback :after_commit_on_update
-  end
-
-  def add_committed_record_on_destroy
-    callback :after_commit
-    callback :after_commit_on_destroy
-  end
-end