after_commit 1.0.2 → 1.0.3

data/lib/after_commit.rb

@@ -1,53 +1,64 @@
 module AfterCommit
   def self.record(connection, record)
-    Thread.current[:committed_records] ||= {}
-    Thread.current[:committed_records][connection.object_id] ||= []
-    Thread.current[:committed_records][connection.object_id] << record
+    prepare_collection :committed_records, connection
+    add_to_collection  :committed_records, connection, record
   end
 
   def self.record_created(connection, record)
-    Thread.current[:committed_records_on_create] ||= {}
-    Thread.current[:committed_records_on_create][connection.object_id] ||= []
-    Thread.current[:committed_records_on_create][connection.object_id] << record
+    prepare_collection :committed_records_on_create, connection
+    add_to_collection  :committed_records_on_create, connection, record
   end
 
   def self.record_updated(connection, record)
-    Thread.current[:committed_records_on_update] ||= {}
-    Thread.current[:committed_records_on_update][connection.object_id] ||= []
-    Thread.current[:committed_records_on_update][connection.object_id] << record
+    prepare_collection :committed_records_on_update, connection
+    add_to_collection  :committed_records_on_update, connection, record
   end
 
   def self.record_destroyed(connection, record)
-    Thread.current[:committed_records_on_destroy] ||= {}
-    Thread.current[:committed_records_on_destroy][connection.object_id] ||= []
-    Thread.current[:committed_records_on_destroy][connection.object_id] << record
+    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
 
   def self.created_records(connection)
-    Thread.current[:committed_records_on_create] ||= {}
-    Thread.current[:committed_records_on_create][connection.object_id] ||= []
+    collection :committed_records_on_create, connection
   end
 
   def self.updated_records(connection)
-    Thread.current[:committed_records_on_update] ||= {}
-    Thread.current[:committed_records_on_update][connection.object_id] ||= []
+    collection :committed_records_on_update, connection
   end
 
   def self.destroyed_records(connection)
-    Thread.current[:committed_records_on_destroy] ||= {}
-    Thread.current[:committed_records_on_destroy][connection.object_id] ||= []
-  end
-
-  def self.records(connection)
-    Thread.current[:committed_records] ||= {}
-    Thread.current[:committed_records][connection.object_id] ||= []
+    collection :committed_records_on_destroy, connection
   end
 
   def self.cleanup(connection)
-    Thread.current[:committed_records]            = {}
-    Thread.current[:committed_records_on_create]  = {}
-    Thread.current[:committed_records_on_update]  = {}
-    Thread.current[:committed_records_on_destroy] = {}
+    [
+      :committed_records,
+      :committed_records_on_create,
+      :committed_records_on_update,
+      :committed_records_on_destroy
+    ].each do |collection|
+      Thread.current[collection]                        ||= {}
+      Thread.current[collection][connection.old_transaction_key] = []
+    end
+  end
+  
+  def self.prepare_collection(collection, connection)
+    Thread.current[collection] ||= {}
+    Thread.current[collection][connection.unique_transaction_key] ||= []
+  end
+  
+  def self.add_to_collection(collection, connection, record)
+    Thread.current[collection][connection.unique_transaction_key] << record
+  end
+  
+  def self.collection(collection, connection)
+    Thread.current[collection] ||= {}
+    Thread.current[collection][connection.old_transaction_key] ||= []
   end
 end
 

data/lib/after_commit/connection_adapters.rb

@@ -7,7 +7,9 @@ module AfterCommit
         # override it so that after this happens, any records that were saved
         # or destroyed within this transaction now get their after_commit
         # callback fired.
-        def commit_db_transaction_with_callback          
+        def commit_db_transaction_with_callback
+          increment_transaction_pointer
+          committed = false
           begin
             trigger_before_commit_callbacks
             trigger_before_commit_on_create_callbacks
@@ -15,13 +17,17 @@ module AfterCommit
             trigger_before_commit_on_destroy_callbacks
             
             commit_db_transaction_without_callback
+            committed = true
             
             trigger_after_commit_callbacks
             trigger_after_commit_on_create_callbacks
             trigger_after_commit_on_update_callbacks
             trigger_after_commit_on_destroy_callbacks
+          rescue
+            rollback_db_transaction unless committed
           ensure
             AfterCommit.cleanup(self)
+            decrement_transaction_pointer
           end
         end 
         alias_method_chain :commit_db_transaction, :callback
@@ -40,6 +46,14 @@ module AfterCommit
         end
         alias_method_chain :rollback_db_transaction, :callback
         
+        def unique_transaction_key
+          [object_id, transaction_pointer]
+        end
+        
+        def old_transaction_key
+          [object_id, transaction_pointer - 1]
+        end
+        
         protected
         
         def trigger_before_commit_callbacks
@@ -134,6 +148,18 @@ module AfterCommit
             end
           end 
         end
+        
+        def transaction_pointer
+          Thread.current[:after_commit_pointer] ||= 0
+        end
+        
+        def increment_transaction_pointer
+          Thread.current[:after_commit_pointer] += 1
+        end
+        
+        def decrement_transaction_pointer
+          Thread.current[:after_commit_pointer] -= 1
+        end
       end 
     end 
   end

data/test/after_commit_test.rb

@@ -39,6 +39,26 @@ class MockRecord < ActiveRecord::Base
   end
 end
 
+class Foo < ActiveRecord::Base
+  attr_reader :creating
+  
+  after_commit :create_bar
+  
+  private
+  
+  def create_bar
+    @creating ||= 0
+    @creating += 1
+    
+    raise Exception, 'looping' if @creating > 1
+    Bar.create
+  end
+end
+
+class Bar < ActiveRecord::Base
+  #
+end
+
 class UnsavableRecord < ActiveRecord::Base
   attr_accessor :after_commit_called
 
@@ -65,35 +85,42 @@ class AfterCommitTest < Test::Unit::TestCase
   def test_before_commit_on_create_is_called
     assert_equal true, MockRecord.create!.before_commit_on_create_called
   end
-
+  
   def test_before_commit_on_update_is_called
     record = MockRecord.create!
     record.save
     assert_equal true, record.before_commit_on_update_called
   end
-
+  
   def test_before_commit_on_destroy_is_called
     assert_equal true, MockRecord.create!.destroy.before_commit_on_destroy_called
   end
-
+  
   def test_after_commit_on_create_is_called
     assert_equal true, MockRecord.create!.after_commit_on_create_called
   end
-
+  
   def test_after_commit_on_update_is_called
     record = MockRecord.create!
     record.save
     assert_equal true, record.after_commit_on_update_called
   end
-
+  
   def test_after_commit_on_destroy_is_called
     assert_equal true, MockRecord.create!.destroy.after_commit_on_destroy_called
   end
-
+  
   def test_after_commit_does_not_trigger_when_transaction_rolls_back
     record = UnsavableRecord.new
     begin; record.save; rescue; end
-
+  
     assert_equal false, record.after_commit_called
   end
+  
+  def test_two_transactions_are_separate
+    Bar.delete_all
+    foo = Foo.create
+    
+    assert_equal 1, foo.creating
+  end
 end

data/test/test_helper.rb

@@ -13,8 +13,12 @@ end
 ActiveRecord::Base.establish_connection({"adapter" => "sqlite3", "database" => 'test.sqlite3'})
 begin
   ActiveRecord::Base.connection.execute("drop table mock_records");
+  ActiveRecord::Base.connection.execute("drop table foos");
+  ActiveRecord::Base.connection.execute("drop table bars");
 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)");
 
 require 'after_commit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: after_commit
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +11:00
+date: 2009-11-21 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency