after_transaction_commit 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1c7c34764bd9e999d94e171a49d5c30770ec7a3
-  data.tar.gz: 45fd10cf2ad53b268774ce368fc52131a3161ab6
+  metadata.gz: 63f1cd01dccbe67715506366d7614ab1a3c371c9
+  data.tar.gz: b5680b26a3c4dc8598e9e77bb22de844138889c2
 SHA512:
-  metadata.gz: d42d9aa4f572b0883d1093076ca9b806671263b5e6ae4b66e02f6d37b7c9d608b1376da7759b1bdc85601b8cc92e545ef29aa93cd42c0a315651ef92923e8220
-  data.tar.gz: 7df1363b174f0848d9b2d40234ec580c6172fa2ae66db672980f81a7d2965994c89cc0190818761a42437f0eac7a9bce153d9e4c64aed80c330ada6f5dacbec2
+  metadata.gz: e9842667116d5471a281863ddd689aa7357f28010e144a3ed3341d6907319ac09cee50445c7735f060000938a82ed3eb38ddff2228401c53be8e481be7f1e368
+  data.tar.gz: a05ca303f7121c54fbdd3d6776d1668a6b7677bc8864fc76af4d3a5506454dd61d4f8ad96ec277314e1f8efa62ed351368f0983dfbd89d1679057e4b12d96693

data/.gitignore

@@ -1,10 +1,12 @@
 /.bundle/
+/.byebug_history
 /.yardoc
 /Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
+/spec/gemfiles/*.lock
 /spec/reports/
 /tmp/
 *.bundle

data/.travis.yml

@@ -2,21 +2,9 @@ bundler_args: ""
 language: ruby
 
 gemfile:
-  - spec/gemfiles/40.gemfile
-  - spec/gemfiles/41.gemfile
-  - spec/gemfiles/42.gemfile
   - spec/gemfiles/50.gemfile
+  - spec/gemfiles/51.gemfile
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-env:
-  - REAL=1
-  - TEST=1
-
-matrix:
-  exclude:
-    - gemfile: spec/gemfiles/50.gemfile
-      rvm: 2.1.10
+  - 2.4.1
 
 script: bundle exec rake spec

data/Gemfile

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 
-group :test do
-  gem 'test_after_commit', git: 'https://github.com/codekitchen/test_after_commit.git', branch: 'nested-commit-callbacks'
-end
-
 # Specify your gem's dependencies in after_transaction_commit.gemspec
 gemspec

data/after_transaction_commit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1"
 
-  spec.add_dependency "activerecord", ">= 4.0"
+  spec.add_dependency "activerecord", ">= 5.0"
 
   spec.add_development_dependency "bump"
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/after_transaction_commit.rb

@@ -1,19 +1,11 @@
 module AfterTransactionCommit
 end
 
-unless ActiveRecord::VERSION::MAJOR.between? 4, 5
-  raise "Unsupported Rails version"
-end
-
 require "after_transaction_commit/version"
 require "after_transaction_commit/database_statements"
 require "after_transaction_commit/transaction"
 
 # force autoloading if necessary
-_ = ActiveRecord::ConnectionAdapters::RealTransaction
-
-klass = defined?(ActiveRecord::ConnectionAdapters::OpenTransaction) ?
-  ActiveRecord::ConnectionAdapters::OpenTransaction : # rails < 4.2
-  ActiveRecord::ConnectionAdapters::Transaction       # rails >= 4.2
-
-klass.prepend AfterTransactionCommit::Transaction
+ActiveRecord::ConnectionAdapters::RealTransaction
+ActiveRecord::ConnectionAdapters::Transaction.prepend(AfterTransactionCommit::Transaction)
+ActiveRecord::ConnectionAdapters::TransactionManager.include(AfterTransactionCommit::TransactionManager)

data/lib/after_transaction_commit/database_statements.rb

@@ -1,47 +1,9 @@
+# this is still a class eval because it has already been included into other
+# classes, so if we include into it, the other classes won't get this method
 ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
   def after_transaction_commit(&block)
-    if !_in_transaction_for_callbacks?
-      block.call
-    else
-      @after_transaction_commit ||= []
-      @after_transaction_commit << block
-    end
-  end
-
-  private
-
-  def _run_after_transaction_commit_callbacks
-    if @after_transaction_commit.present?
-      # the callback could trigger a new transaction on this connection,
-      # and leaving the callbacks in @after_transaction_commit could put us in an
-      # infinite loop.
-      # so we store off the callbacks to a local var here.
-      callbacks = @after_transaction_commit
-      @after_transaction_commit = []
-      callbacks.each { |cb| cb.call() }
-    end
-  end
-
-  def _remove_after_transaction_commit_callbacks
-    @after_transaction_commit = [] if @after_transaction_commit
-  end
-
-  if ActiveRecord.version < Gem::Version.new('5')
-    def _transaction_test_mode?
-      defined?(TestAfterCommit)
-    end
-
-    def _in_transaction_for_callbacks?
-      txn = _transaction_test_mode? ? _test_open_transactions : open_transactions
-      txn > 0
-    end
-
-    def _test_open_transactions
-      @test_open_transactions || 0
-    end
-  else
-    def _in_transaction_for_callbacks?
-      current_transaction.joinable?
-    end
+    transaction = transaction_manager.outermost_joinable_transaction
+    return block.call unless transaction
+    transaction.after_transaction_commit(&block)
   end
 end

data/lib/after_transaction_commit/transaction.rb

@@ -1,25 +1,24 @@
 module AfterTransactionCommit
   module Transaction
-    if ActiveRecord.version < Gem::Version.new('5')
-      def rollback_records
-        super
-        if self.is_a?(ActiveRecord::ConnectionAdapters::RealTransaction) ||
-          (connection.send(:_transaction_test_mode?) && connection.send(:_test_open_transactions) == 0)
-          connection.send(:_remove_after_transaction_commit_callbacks)
-        end
-      end
-    else
-      def rollback_records
-        super
-        unless connection.current_transaction.joinable?
-          connection.send(:_remove_after_transaction_commit_callbacks)
-        end
-      end
+    def after_transaction_commit(&block)
+      @after_transaction_commit ||= []
+      @after_transaction_commit << block
     end
 
     def commit_records
       super
-      connection.send(:_run_after_transaction_commit_callbacks)
+      @after_transaction_commit.each(&:call) if @after_transaction_commit.present?
+    end
+  end
+
+  module TransactionManager
+    def outermost_joinable_transaction
+      last_t = nil
+      @stack.reverse_each do |t|
+        return last_t unless t.joinable?
+        last_t = t
+      end
+      last_t if last_t&.joinable?
     end
   end
 end

data/lib/after_transaction_commit/version.rb

@@ -1,3 +1,3 @@
 module AfterTransactionCommit
-  VERSION = "1.1.2"
+  VERSION = "2.0.0"
 end

data/spec/after_transaction_commit_spec.rb

@@ -21,7 +21,6 @@ describe AfterTransactionCommit do
   end
 
   it "immediately executes the callback when in a non-joinable transaction" do
-    skip "Rails 5 only" if ActiveRecord.version < Gem::Version.new('5')
     a = 0
     User.connection.transaction(joinable: false) do
       User.connection.after_transaction_commit { a += 1 }
@@ -31,7 +30,6 @@ describe AfterTransactionCommit do
   end
 
   it "executes the callback when a nested transaction commits within a non-joinable transaction" do
-    skip "Rails 5 only" if ActiveRecord.version < Gem::Version.new('5')
     a = 0
     User.connection.transaction(joinable: false) do
       User.connection.transaction do
@@ -67,7 +65,6 @@ describe AfterTransactionCommit do
   end
 
   it "should execute the callback immediately if created during commit callback" do
-    skip "Pre-Rails 5 only" if !ENV['REAL'] && ActiveRecord.version >= Gem::Version.new('5')
     a = 0
     User.connection.transaction do
       User.connection.after_transaction_commit { User.connection.after_transaction_commit { a += 1 } }
@@ -96,4 +93,17 @@ describe AfterTransactionCommit do
     end
     expect(a).to eql 1
   end
+
+  it "doesn't call callbacks after a requires_new transaction" do
+    a = 0
+    User.connection.transaction do
+      User.connection.transaction(:requires_new => true) do
+        User.connection.after_transaction_commit do
+          a += 1
+        end
+      end
+      expect(a).to eq 0
+    end
+    expect(a).to eql 1
+  end
 end

data/spec/gemfiles/50.gemfile

@@ -3,7 +3,3 @@ source "https://rubygems.org"
 gemspec :path=>"../../"
 
 gem "activerecord", "~> 5.0.0"
-
-group :test do
-  gem 'test_after_commit', git: 'https://github.com/codekitchen/test_after_commit.git', branch: 'nested-commit-callbacks'
-end

data/spec/gemfiles/51.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../../"
+
+gem "activerecord", "~> 5.1.0"

data/spec/spec_helper.rb

@@ -1,26 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require File.expand_path '../database', __FILE__
+require_relative "database"
 
 require 'after_transaction_commit'
-
-if ENV['REAL']
-  puts 'using real transactions'
-else
-  puts 'using test-style transactions (use_transactional_fixtures)'
-  require 'test_after_commit'
-end
-
-RSpec.configure do |config|
-  unless ENV['REAL']
-    config.around do |example|
-      # open a transaction without using .transaction as activerecord use_transactional_fixtures does
-      # code taken from https://github.com/grosser/test_after_commit/blob/master/spec/spec_helper.rb
-      connection = ActiveRecord::Base.connection_handler.connection_pool_list.map(&:connection).first
-      connection.begin_transaction :joinable => false
-
-      example.call
-
-      connection.rollback_db_transaction
-    end
-  end
-end
+require 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: after_transaction_commit
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +144,8 @@ files:
 - lib/after_transaction_commit/version.rb
 - spec/after_transaction_commit_spec.rb
 - spec/database.rb
-- spec/gemfiles/40.gemfile
-- spec/gemfiles/40.gemfile.lock
-- spec/gemfiles/41.gemfile
-- spec/gemfiles/41.gemfile.lock
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
+- spec/gemfiles/51.gemfile
 - spec/spec_helper.rb
 homepage: https://github.com/instructure/after_transaction_commit
 licenses:
@@ -180,12 +174,6 @@ summary: ActiveRecord::Base.connection.after_transaction_commit { ... }
 test_files:
 - spec/after_transaction_commit_spec.rb
 - spec/database.rb
-- spec/gemfiles/40.gemfile
-- spec/gemfiles/40.gemfile.lock
-- spec/gemfiles/41.gemfile
-- spec/gemfiles/41.gemfile.lock
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
+- spec/gemfiles/51.gemfile
 - spec/spec_helper.rb

data/spec/gemfiles/40.gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "activerecord", "~> 4.0.0"
-
-group :test do
-  gem 'test_after_commit', git: 'https://github.com/codekitchen/test_after_commit.git', branch: 'nested-commit-callbacks'
-end

data/spec/gemfiles/40.gemfile.lock

@@ -1,74 +0,0 @@
-GIT
-  remote: https://github.com/codekitchen/test_after_commit.git
-  revision: 899ec8b6c699330d7804f91253e37beb610d097e
-  branch: nested-commit-callbacks
-  specs:
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-
-PATH
-  remote: ../..
-  specs:
-    after_transaction_commit (1.1.0)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    builder (3.1.4)
-    bump (0.5.3)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (0.3.51)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.0.0)
-  after_transaction_commit!
-  bump
-  bundler (~> 1.11)
-  rake (~> 11.0)
-  rspec
-  sqlite3
-  test_after_commit!
-  wwtd
-
-BUNDLED WITH
-   1.14.3

data/spec/gemfiles/41.gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "activerecord", "~> 4.1.0"
-
-group :test do
-  gem 'test_after_commit', git: 'https://github.com/codekitchen/test_after_commit.git', branch: 'nested-commit-callbacks'
-end

data/spec/gemfiles/41.gemfile.lock

@@ -1,73 +0,0 @@
-GIT
-  remote: https://github.com/codekitchen/test_after_commit.git
-  revision: 899ec8b6c699330d7804f91253e37beb610d097e
-  branch: nested-commit-callbacks
-  specs:
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-
-PATH
-  remote: ../..
-  specs:
-    after_transaction_commit (1.1.0)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.1.16)
-      activesupport (= 4.1.16)
-      builder (~> 3.1)
-    activerecord (4.1.16)
-      activemodel (= 4.1.16)
-      activesupport (= 4.1.16)
-      arel (~> 5.0.0)
-    activesupport (4.1.16)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    bump (0.5.3)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.1)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.1.0)
-  after_transaction_commit!
-  bump
-  bundler (~> 1.11)
-  rake (~> 11.0)
-  rspec
-  sqlite3
-  test_after_commit!
-  wwtd
-
-BUNDLED WITH
-   1.14.3

data/spec/gemfiles/42.gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "activerecord", "~> 4.2.0.beta2"
-
-group :test do
-  gem 'test_after_commit', git: 'https://github.com/codekitchen/test_after_commit.git', branch: 'nested-commit-callbacks'
-end

data/spec/gemfiles/42.gemfile.lock

@@ -1,73 +0,0 @@
-GIT
-  remote: https://github.com/codekitchen/test_after_commit.git
-  revision: 899ec8b6c699330d7804f91253e37beb610d097e
-  branch: nested-commit-callbacks
-  specs:
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-
-PATH
-  remote: ../..
-  specs:
-    after_transaction_commit (1.1.1)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.4)
-    builder (3.2.3)
-    bump (0.5.3)
-    byebug (9.0.6)
-    diff-lcs (1.3)
-    i18n (0.8.1)
-    minitest (5.10.2)
-    rake (11.3.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2.0.beta2)
-  after_transaction_commit!
-  bump
-  bundler (~> 1.11)
-  byebug
-  rake (~> 11.0)
-  rspec
-  sqlite3
-  test_after_commit!
-  wwtd
-
-BUNDLED WITH
-   1.14.6

data/spec/gemfiles/50.gemfile.lock

@@ -1,70 +0,0 @@
-GIT
-  remote: https://github.com/codekitchen/test_after_commit.git
-  revision: 899ec8b6c699330d7804f91253e37beb610d097e
-  branch: nested-commit-callbacks
-  specs:
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-
-PATH
-  remote: ../..
-  specs:
-    after_transaction_commit (1.1.0)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.3)
-    bump (0.5.3)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    minitest (5.9.1)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.0.0)
-  after_transaction_commit!
-  bump
-  bundler (~> 1.11)
-  rake (~> 11.0)
-  rspec
-  sqlite3
-  test_after_commit!
-  wwtd
-
-BUNDLED WITH
-   1.14.3