test_after_commit 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be5c7c35e9b83e1cf522ca5c7cfd3f046a56ca33
-  data.tar.gz: e2cb178b2b1584c88d607db6540bbe17e3834a71
+  metadata.gz: f0c33d45bb130525ad374d2829fc825e45306aa7
+  data.tar.gz: 3e04fd9445ffc157141bf77d34346f6e5530fb87
 SHA512:
-  metadata.gz: f8a232c5bbb1bfbcefa6c4772cb4d01d7a95f55bdb8e3732bfcef90ccf2f512ec55e76d87e36e6eda0dda6b9dac644abef0088562adc401c673cf198b96cb871
-  data.tar.gz: 2047d7d6342337a640a222e45d79616c9c14af4f8184e01db39fb1cbfc8828ec7e9b210bec851afacc623df026cb5e82f5b37c504acc4fc57c334a82d2fd99b2
+  metadata.gz: b7a67f0068b761afc604941b655b75e525c3f2eb9232a36fb5c45b987e5e5fbe9d749759dffecb1a8bc755282b0768301edb055d0907a6a4867b7208df3cf324
+  data.tar.gz: 23515300ab9f8c87fd68ae4fee7ca308cb910ff70061893309d8ec1f2408d193e8269cc0b3d86e6ec8ea67314713c04b5a3430e29caf6dc298a2ee7da2c7899b

data/Readme.md

@@ -70,6 +70,7 @@ Inspired by https://gist.github.com/1305285
  - [Tony Novak](https://github.com/afn)
  - [Brian Palmer](https://github.com/codekitchen)
  - [Oleg Dashevskii](https://github.com/be9)
+ - [Jonathan Spies](https://github.com/jspies)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/test_after_commit.rb

@@ -1,5 +1,13 @@
 require 'test_after_commit/version'
 
+if ActiveRecord::VERSION::MAJOR >= 4
+  require 'test_after_commit/with_transaction_state'
+  ActiveRecord::Base.prepend(TestAfterCommit::WithTransactionState)
+end
+
+require 'test_after_commit/database_statements'
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(TestAfterCommit::DatabaseStatements)
+
 module TestAfterCommit
   @enabled = true
   class << self
@@ -14,61 +22,3 @@ module TestAfterCommit
     end
   end
 end
-
-ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
-  def transaction_with_transactional_fixtures(*args)
-    @test_open_transactions ||= 0
-    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
-          @test_open_transactions -= 1
-          if TestAfterCommit.enabled && @test_open_transactions == 0 && !rolled_back
-            test_commit_records
-          end
-        ensure
-          result
-        end
-      end
-    end
-  end
-  alias_method_chain :transaction, :transactional_fixtures
-
-  def test_commit_records
-    if ActiveRecord::VERSION::MAJOR == 3
-      commit_transaction_records
-    else
-      # 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
-
-if ActiveRecord::VERSION::MAJOR >= 4
-  # disable parts of the sync code that starts looping
-  ActiveRecord::Base.class_eval do
-    alias_method :sync_with_transaction_state_with_state, :sync_with_transaction_state
-    def sync_with_transaction_state
-      @reflects_state ||= []
-      @reflects_state[0] = true
-      sync_with_transaction_state_with_state
-    end
-  end
-end

data/lib/test_after_commit/database_statements.rb

@@ -0,0 +1,45 @@
+module TestAfterCommit::DatabaseStatements
+  def transaction(*)
+    @test_open_transactions ||= 0
+
+    super 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
+        rolled_back = true
+        raise
+      ensure
+        begin
+          @test_open_transactions -= 1
+          if TestAfterCommit.enabled && @test_open_transactions == 0 && !rolled_back
+            test_commit_records
+          end
+        ensure
+          result
+        end
+      end
+    end
+  end
+
+  def test_commit_records
+    if ActiveRecord::VERSION::MAJOR == 3
+      commit_transaction_records
+    else
+      # 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.4.2'
+  VERSION = '0.5.0'
 end

data/lib/test_after_commit/with_transaction_state.rb

@@ -0,0 +1,10 @@
+# disable parts of the sync code that starts looping
+module TestAfterCommit
+  module WithTransactionState
+    def sync_with_transaction_state
+      @reflects_state ||= []
+      @reflects_state[0] = true
+      super
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,7 +103,9 @@ files:
 - MIT-LICENSE
 - Readme.md
 - lib/test_after_commit.rb
+- lib/test_after_commit/database_statements.rb
 - lib/test_after_commit/version.rb
+- lib/test_after_commit/with_transaction_state.rb
 homepage: https://github.com/grosser/test_after_commit
 licenses:
 - MIT
@@ -116,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="