test_after_commit 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c217f295482402f1b0b61450c5688abbe5cdbb
-  data.tar.gz: 2089d55aa79c4110eafe4ce88d88b893bea0875a
+  metadata.gz: 8823861468a75a7bca2bb53477565b321df0b4d6
+  data.tar.gz: ca3d17b225ca68cb1f27c15b98b3af6263fc79ef
 SHA512:
-  metadata.gz: 4647ddfa475ad62303dafa1a0d589ff454ce0c4db4188607fba5937b412775acfdae06167257cca2431556474715cedc22e62ce0a2b59272c662189a30bcd03f
-  data.tar.gz: 13b4ce6d63d923ce30c050c01ed43524aaf8685bfd95ce093af8b2ef669874948b28c54bc72dd060a121824b008df053efa76f03d199bde3faa0f7daf825b3f2
+  metadata.gz: 8ff5bd019f7c9dac53ea5e3548fe2a53cdb7fc20e22c026259dadb5b2a14cbdace0249a51f8860bd6a053bd048e9e3ba48c9b8942c941444acfe048502593bcd
+  data.tar.gz: abff3757960d644d0bbb414c29012e749d84dd5e01ca5d7fe8738755600de6a8fa19afe3428fd0d1f17dc414965206e3efd59e9608ac092b7fda5ea1f4101315

data/Readme.md

@@ -45,6 +45,8 @@ Inspired by https://gist.github.com/1305285
  - [Brad Gessler](https://github.com/bradgessler)
  - [Rohan McGovern](https://github.com/rohanpm)
  - [lsylvester](https://github.com/lsylvester)
+ - [Tony Novak](https://github.com/afn)
+ - [Brian Palmer](https://github.com/codekitchen)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/test_after_commit.rb

@@ -9,17 +9,20 @@ ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
     transaction_without_transactional_fixtures(*args) do
       begin
         @test_open_transactions += 1
+        if ActiveRecord::VERSION::MAJOR == 3
+          @_current_transaction_records.push([]) if @_current_transaction_records.empty?
+        end
         result = yield
       rescue Exception => e
         rolled_back = true
         raise e
       ensure
         begin
-          if @test_open_transactions == 1 && !rolled_back
+          @test_open_transactions -= 1
+          if @test_open_transactions == 0 && !rolled_back
             test_commit_records
           end
         ensure
-          @test_open_transactions -= 1
           result
         end
       end
@@ -29,44 +32,19 @@ ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
 
   def test_commit_records
     if ActiveRecord::VERSION::MAJOR == 3
-      commit_transaction_records(false)
+      commit_transaction_records
     else
-      transaction = @transaction || @transaction_manager.current_transaction
-      begin
-        transaction.commit_records
-      ensure
-        transaction.records.clear # prevent duplicate .commit!
-        transaction.instance_variable_get(:@state).set_state(nil)
-      end
-    end
-  end
-
-  if ActiveRecord::VERSION::MAJOR == 3
-    # The @_current_transaction_records is a stack of arrays, each one
-    # containing the records associated with the corresponding transaction
-    # in the transaction stack. This is used by the
-    # `rollback_transaction_records` method (to only send a rollback hook to
-    # models attached to the transaction being rolled back) but is usually
-    # ignored by the `commit_transaction_records` method. Here we
-    # monkey-patch it to temporarily replace the array with only the records
-    # for the top-of-stack transaction, so the real
-    # `commit_transaction_records` method only sends callbacks to those.
-    #
-    def commit_transaction_records_with_transactional_fixtures(commit = true)
-      return commit_transaction_records_without_transactional_fixtures if commit
-
-      preserving_current_transaction_records do
-        @_current_transaction_records = @_current_transaction_records.pop || []
-        commit_transaction_records_without_transactional_fixtures
-      end
-    end
-    alias_method_chain :commit_transaction_records, :transactional_fixtures
-
-    def preserving_current_transaction_records
-      old_current_transaction_records = @_current_transaction_records.dup
-      yield
-    ensure
-      @_current_transaction_records = old_current_transaction_records
+      # To avoid an infinite loop, we need to copy the transaction locally, and clear out
+      # `records` on the copy that stays in the AR stack. Otherwise new
+      # transactions inside a commit callback will cause an infinite loop.
+      #
+      # This is because we're re-using the transaction on the stack, before
+      # it's been popped off and re-created by the AR code.
+      original = @transaction || @transaction_manager.current_transaction
+      transaction = original.dup
+      transaction.instance_variable_set(:@records, transaction.records.dup) # deep clone of records array
+      original.records.clear                                                # so that this clear doesn't clear out both copies
+      transaction.commit_records
     end
   end
 end

data/lib/test_after_commit/version.rb

@@ -1,3 +1,3 @@
 module TestAfterCommit
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord