after_commit 1.0.8 → 1.0.9

data/README.textile

@@ -62,3 +62,5 @@ This version (maintained by Pat Allan) includes the following patches:
 * 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/)
+* Fixing up exception handling and savepoints in the test helper, and cleaning up successful transactions correctly ("Identified":https://github.com/Identified).
+* Improved JRuby support ("Kevin Menard":https://github.com/nirvdrum)

data/lib/after_commit/after_savepoint.rb

@@ -34,9 +34,23 @@ module AfterCommit
   module TestConnectionAdapters
     def self.included(base)
       base.class_eval do
+
+        def after_callback_transaction_committed?
+          committed = (Thread.current[:after_callback_committed] || {})[unique_transaction_key]
+          return !committed.nil? && committed
+        end
+
+        def after_callback_mark_committed committed          
+          (Thread.current[:after_callback_committed] ||= {})[unique_transaction_key] = committed
+        end
+
+        def after_callback_cleanup_committed
+          (Thread.current[:after_callback_committed] ||= {})[unique_transaction_key] = nil
+        end
+        
         def release_savepoint_with_callback
           increment_transaction_pointer
-          committed = false
+          after_callback_mark_committed false
           begin
             trigger_before_commit_callbacks
             trigger_before_commit_on_create_callbacks
@@ -45,21 +59,15 @@ module AfterCommit
             trigger_before_commit_on_destroy_callbacks
             
             release_savepoint_without_callback
-            committed = true
-            
+            after_callback_mark_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)
+            after_callback_cleanup_committed
+          ensure
             decrement_transaction_pointer
           end
         end 
@@ -71,13 +79,17 @@ module AfterCommit
         def rollback_to_savepoint_with_callback
           increment_transaction_pointer
           begin
-            trigger_before_rollback_callbacks
-            rollback_to_savepoint_without_callback
-            trigger_after_rollback_callbacks
+            # Only rollback if we have not already released rollback
+            unless after_callback_transaction_committed?
+              trigger_before_rollback_callbacks
+              rollback_to_savepoint_without_callback
+              trigger_after_rollback_callbacks
+            end
           ensure
             AfterCommit.cleanup(self)
-          end
-          decrement_transaction_pointer
+            after_callback_cleanup_committed
+            decrement_transaction_pointer
+          end         
         end
         alias_method_chain :rollback_to_savepoint, :callback
       end

data/lib/after_commit/connection_adapters.rb

@@ -2,18 +2,35 @@ 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
+
+        if respond_to?(:transaction)
+          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
+
+        elsif respond_to?(:begin_db_transaction)
+          def begin_db_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
+            begin_db_transaction_without_callback(*args, &block)
+          ensure
+            @disable_rollback = nil if outermost_call
+          end
+          alias_method_chain :begin_db_transaction, :callback
+        end
 
         # The commit_db_transaction method gets called when the outermost
         # transaction finishes and everything inside commits. We want to
@@ -53,7 +70,7 @@ module AfterCommit
             AfterCommit.cleanup(self)
             decrement_transaction_pointer unless @already_decremented
           end
-        end 
+        end
         alias_method_chain :commit_db_transaction, :callback
 
         # In the event the transaction fails and rolls back, nothing inside
@@ -183,6 +200,7 @@ module AfterCommit
           Thread.current[:after_commit_pointer] ||= 0
           Thread.current[:after_commit_pointer] -= 1
         end
+
       end 
     end 
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: after_commit
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 8
-  version: 1.0.8
+  prerelease: 
+  version: 1.0.9
 platform: ruby
 authors: 
 - Nick Muerdter
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +09:00
+date: 2011-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +23,10 @@ dependencies:
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.15.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,8 +37,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -72,8 +65,8 @@ homepage: http://github.com/freelancing-god/after_commit
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,21 +74,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: after_commit callback for ActiveRecord