after_commit 1.0.5 → 1.0.6

data/lib/after_commit/active_record.rb

@@ -4,8 +4,9 @@ module AfterCommit
       base.class_eval do
         class << self
           def establish_connection_with_after_commit(spec = nil)
-            establish_connection_without_after_commit spec
+            result = establish_connection_without_after_commit spec
             include_after_commit_extensions
+            result
           end
           alias_method_chain :establish_connection, :after_commit
           

data/lib/after_commit/connection_adapters.rb

@@ -10,21 +10,23 @@ module AfterCommit
         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_destroy_callbacks
             
-            commit_db_transaction_without_callback
+            result = 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
+            result
           rescue
-            rollback_db_transaction unless committed
+            committed ? result : rollback_db_transaction
           ensure
             AfterCommit.cleanup(self)
             decrement_transaction_pointer
@@ -37,9 +39,11 @@ module AfterCommit
         # callback for each record that failed to be committed.
         def rollback_db_transaction_with_callback
           begin
+            result = nil
             trigger_before_rollback_callbacks
-            rollback_db_transaction_without_callback
+            result = rollback_db_transaction_without_callback
             trigger_after_rollback_callbacks
+            result
           ensure
             AfterCommit.cleanup(self)
           end

data/test/after_commit_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class MockRecord < ActiveRecord::Base
   attr_accessor :before_commit_on_create_called

data/test/observer_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class ObservableMockRecord < ActiveRecord::Base
   set_table_name 'mock_records'

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'test/unit'
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 
 begin
   require 'sqlite3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: after_commit
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +11:00
+date: 2010-02-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency