larsklevan-after_commit 1.0.5 → 1.0.6

data/lib/after_commit/after_savepoint.rb

@@ -35,7 +35,7 @@ module AfterCommit
     def self.included(base)
       base.class_eval do
         def release_savepoint_with_callback
-          increment_transaction_pointer
+          increment_transaction_nesting_level
           committed = false
           begin
             trigger_before_commit_callbacks
@@ -51,10 +51,14 @@ module AfterCommit
             trigger_after_commit_on_update_callbacks
             trigger_after_commit_on_destroy_callbacks
           rescue
-            rollback_to_savepoint unless committed
+            unless committed
+              decrement_transaction_nesting_level
+              rollback_to_savepoint
+              increment_transaction_nesting_level
+            end
           ensure
             AfterCommit.cleanup(self)
-            decrement_transaction_pointer
+            decrement_transaction_nesting_level
           end
         end 
         alias_method_chain :release_savepoint, :callback
@@ -63,6 +67,7 @@ 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_to_savepoint_with_callback
+          increment_transaction_nesting_level
           begin
             trigger_before_rollback_callbacks
             rollback_to_savepoint_without_callback
@@ -70,6 +75,7 @@ module AfterCommit
           ensure
             AfterCommit.cleanup(self)
           end
+          decrement_transaction_nesting_level
         end
         alias_method_chain :rollback_to_savepoint, :callback
       end

data/lib/after_commit/connection_adapters.rb

@@ -8,7 +8,7 @@ module AfterCommit
         # or destroyed within this transaction now get their after_commit
         # callback fired.
         def commit_db_transaction_with_callback
-          increment_transaction_pointer
+          increment_transaction_nesting_level
           committed = false
           result    = nil
           begin
@@ -26,10 +26,18 @@ module AfterCommit
             trigger_after_commit_on_destroy_callbacks
             result
           rescue
-            committed ? result : rollback_db_transaction
+            if committed
+              result
+            else
+              # Need to decrement the transaction nesting level before calling
+              # rollback... to ensure it is not incremented twice
+              decrement_transaction_nesting_level
+              rollback_db_transaction
+              increment_transaction_nesting_level
+            end
           ensure
             AfterCommit.cleanup(self)
-            decrement_transaction_pointer
+            decrement_transaction_nesting_level
           end
         end 
         alias_method_chain :commit_db_transaction, :callback
@@ -38,6 +46,7 @@ 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
+          increment_transaction_nesting_level
           begin
             result = nil
             trigger_before_rollback_callbacks
@@ -47,15 +56,16 @@ module AfterCommit
           ensure
             AfterCommit.cleanup(self)
           end
+          decrement_transaction_nesting_level
         end
         alias_method_chain :rollback_db_transaction, :callback
-        
-        def unique_transaction_key
-          [object_id, transaction_pointer]
+
+        def current_transaction_key
+          [object_id, transaction_nesting_level]
         end
-        
-        def old_transaction_key
-          [object_id, transaction_pointer - 1]
+
+        def previous_transaction_key
+          [object_id, transaction_nesting_level - 1]
         end
         
         protected
@@ -153,18 +163,19 @@ module AfterCommit
           end 
         end
         
-        def transaction_pointer
-          Thread.current[:after_commit_pointer] ||= 0
+
+        def transaction_nesting_level
+          Thread.current[:after_commit_transaction_nesting_level] ||= 0
         end
-        
-        def increment_transaction_pointer
-          Thread.current[:after_commit_pointer] ||= 0
-          Thread.current[:after_commit_pointer] += 1
+
+        def increment_transaction_nesting_level
+          Thread.current[:after_commit_transaction_nesting_level] ||= 0
+          Thread.current[:after_commit_transaction_nesting_level] += 1
         end
-        
-        def decrement_transaction_pointer
-          Thread.current[:after_commit_pointer] ||= 0
-          Thread.current[:after_commit_pointer] -= 1
+
+        def decrement_transaction_nesting_level
+          Thread.current[:after_commit_transaction_nesting_level] ||= 0
+          Thread.current[:after_commit_transaction_nesting_level] -= 1
         end
       end 
     end 

data/lib/after_commit.rb

@@ -18,7 +18,7 @@ module AfterCommit
     prepare_collection :committed_records_on_destroy, connection
     add_to_collection  :committed_records_on_destroy, connection, record
   end
-  
+
   def self.records(connection)
     collection :committed_records, connection
   end
@@ -42,23 +42,23 @@ module AfterCommit
       :committed_records_on_update,
       :committed_records_on_destroy
     ].each do |collection|
-      Thread.current[collection]                        ||= {}
-      Thread.current[collection][connection.old_transaction_key] = []
+      Thread.current[collection] ||= {}
+      Thread.current[collection][connection.previous_transaction_key] = []
     end
   end
-  
+
   def self.prepare_collection(collection, connection)
     Thread.current[collection] ||= {}
-    Thread.current[collection][connection.unique_transaction_key] ||= []
+    Thread.current[collection][connection.current_transaction_key] ||= []
   end
-  
+
   def self.add_to_collection(collection, connection, record)
-    Thread.current[collection][connection.unique_transaction_key] << record
+    Thread.current[collection][connection.current_transaction_key] << record
   end
-  
+
   def self.collection(collection, connection)
     Thread.current[collection] ||= {}
-    Thread.current[collection][connection.old_transaction_key] ||= []
+    Thread.current[collection][connection.previous_transaction_key] ||= []
   end
 end
 
@@ -69,7 +69,7 @@ require 'after_commit/after_savepoint'
 ActiveRecord::Base.send(:include, AfterCommit::ActiveRecord)
 ActiveRecord::Base.include_after_commit_extensions
 
-if defined?(RAILS_ENV) && RAILS_ENV == 'test'
+if defined?(RAILS_ENV) && %w(test cucumber).include?(RAILS_ENV)
   ActiveRecord::Base.send(:include, AfterCommit::AfterSavepoint)
   ActiveRecord::Base.include_after_savepoint_extensions
 end

data/test/after_commit_test.rb

@@ -60,7 +60,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 +75,14 @@ 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 AfterCommitTest < Test::Unit::TestCase
@@ -113,10 +117,22 @@ 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_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: larsklevan-after_commit
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -06:00
+date: 2010-01-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency