test_after_commit 0.2.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb5ad1846055c48780400cecd1a21e2399d6862
-  data.tar.gz: d0abaa5cf7047545e2d4aaafcee3f2d2f6d434d1
+  metadata.gz: 476b2d55df60abf6d74c93b6b708bb1fb84fe8eb
+  data.tar.gz: 3124e64478bec9c3019f7ef86e872c3a90b725b8
 SHA512:
-  metadata.gz: e2ef9fe01a46227536a49a0e0190dc63c1566f8a0de333b3357e1761a0c8f5247fd6f0d8b0e302f933ca25b75637abeb4314fb88e965c161909c504b36ab9165
-  data.tar.gz: 70a4d044459a65829395aa9abb7a114eaedad05d3e29d65d7ab2d2a2d0f20e6c9b49858059d9dadac412416e9578c3a251d47ce37f06e0705b9a2f7784128035
+  metadata.gz: de5dbe1aad7eb2dfb337a019c30a1a30045fefcda15062805bff7c9e432f276d0544726d76e1c7c6173c8af35a67d50131dad1ed83d16d2fe1a43356037c2110
+  data.tar.gz: 098b7b282ceffaf27fd0829ffd6e6979286430537b2b9ebf628d46f796210c9a8b009902c66042f02dcdf2b8c24aef693ab05fd65a5fba63adbb5a81f0757bb9

data/MIT-LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Michael Grosser <michael@grosser.it>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Readme.md

@@ -1,5 +1,7 @@
 Make after_commit callbacks fire in tests for Rails 3+ with transactional_fixtures = true.
 
+**Deprecation** this is no longer needed on rails 5.0+ https://github.com/rails/rails/pull/18458
+
 Install
 =======
 
@@ -30,6 +32,26 @@ it "sets $foo on commit" do
 end
 ```
 
+### Temporary disable after commit hooks
+
+In your test_helper, you can specify the default
+
+```
+TestAfterCommit.enabled = true
+```
+
+Then use blocks in your tests to change the behavior:
+
+```
+TestAfterCommit.with_commits(true) do
+  my_tests
+end
+
+TestAfterCommit.with_commits(false) do
+  my_tests
+end
+```
+
 TIPS
 ====
  - hooks do not re-raise errors (with or without this gem) use [after_commit_exception_notification](https://github.com/grosser/after_commit_exception_notification)
@@ -44,6 +66,11 @@ Inspired by https://gist.github.com/1305285
  - [emirose](https://github.com/emirose)
  - [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)
+ - [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,76 +1,24 @@
 require 'test_after_commit/version'
 
-module TestAfterCommit
+if ActiveRecord::VERSION::MAJOR >= 4
+  require 'test_after_commit/with_transaction_state'
+  ActiveRecord::Base.send(:prepend, TestAfterCommit::WithTransactionState)
 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
-        result = yield
-      rescue Exception => e
-        rolled_back = true
-        raise e
-      ensure
-        if @test_open_transactions == 1 && !rolled_back
-          test_commit_records
-        end
-        @test_open_transactions -= 1
-        result
-      end
-    end
-  end
-  alias_method_chain :transaction, :transactional_fixtures
-
-  def test_commit_records
-    if ActiveRecord::VERSION::MAJOR == 3
-      commit_transaction_records(false)
-    else
-      @transaction.commit_records
-      @transaction.records.clear # prevent duplicate .commit!
-      @transaction.instance_variable_get(:@state).set_state(nil)
-    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
+require 'test_after_commit/database_statements'
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, TestAfterCommit::DatabaseStatements)
 
-      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
+module TestAfterCommit
+  @enabled = true
+  class << self
+    attr_accessor :enabled
 
-    def preserving_current_transaction_records
-      old_current_transaction_records = @_current_transaction_records.dup
+    def with_commits(value = true)
+      old = enabled
+      self.enabled = value
       yield
     ensure
-      @_current_transaction_records = old_current_transaction_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[0] = true
-      sync_with_transaction_state_with_state
+      self.enabled = old
     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.2.5'
+  VERSION = '0.5.1'
 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.2.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,9 +100,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 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
@@ -115,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:
   - - ">="
@@ -123,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: makes after_commit callbacks testable in Rails 3+ with transactional_fixtures