after_transaction_commit 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63f1cd01dccbe67715506366d7614ab1a3c371c9
-  data.tar.gz: b5680b26a3c4dc8598e9e77bb22de844138889c2
+SHA256:
+  metadata.gz: 20d35571092e0e740743873aa021004cc975761ece8ec9b09ca6032e129f3ae6
+  data.tar.gz: 605ca6c85f2bb022af1293e2a3628f7835c8cdd7a2019af97f701adbbc896e5e
 SHA512:
-  metadata.gz: e9842667116d5471a281863ddd689aa7357f28010e144a3ed3341d6907319ac09cee50445c7735f060000938a82ed3eb38ddff2228401c53be8e481be7f1e368
-  data.tar.gz: a05ca303f7121c54fbdd3d6776d1668a6b7677bc8864fc76af4d3a5506454dd61d4f8ad96ec277314e1f8efa62ed351368f0983dfbd89d1679057e4b12d96693
+  metadata.gz: 4f4596c9ca8547334cfdcce3e223e975852ccae179138f213bcd37fe638f0b80b0db05648fb3aed942fe4e1b82da488b75488d7d4b54338b3cae30390333a210
+  data.tar.gz: 90a1974ab88def8e409fbc7b3e7f39d7ddd43a9d2de99297ce6aa908feab9e050b23eefb1ab7ada7ee60770d6f076c976d51219baa3c1b492a51f21b937d8847

data/lib/after_transaction_commit.rb

@@ -8,4 +8,3 @@ require "after_transaction_commit/transaction"
 # force autoloading if necessary
 ActiveRecord::ConnectionAdapters::RealTransaction
 ActiveRecord::ConnectionAdapters::Transaction.prepend(AfterTransactionCommit::Transaction)
-ActiveRecord::ConnectionAdapters::TransactionManager.include(AfterTransactionCommit::TransactionManager)

data/lib/after_transaction_commit/database_statements.rb

@@ -2,8 +2,8 @@
 # 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)
-    transaction = transaction_manager.outermost_joinable_transaction
-    return block.call unless transaction
-    transaction.after_transaction_commit(&block)
+    transaction = transaction_manager.current_transaction
+    return block.call unless transaction.joinable?
+    transaction.add_after_commit(block)
   end
 end

data/lib/after_transaction_commit/transaction.rb

@@ -1,24 +1,21 @@
 module AfterTransactionCommit
   module Transaction
-    def after_transaction_commit(&block)
-      @after_transaction_commit ||= []
-      @after_transaction_commit << block
+    def initialize(*)
+      super
+      @after_commit_blocks = []
     end
 
-    def commit_records
-      super
-      @after_transaction_commit.each(&:call) if @after_transaction_commit.present?
+    def add_after_commit(block)
+      @after_commit_blocks << block
     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
+    def commit_records
+      super
+      if @run_commit_callbacks
+        @after_commit_blocks.each(&:call)
+      else
+        connection.current_transaction.instance_variable_get(:@after_commit_blocks).concat(@after_commit_blocks)
       end
-      last_t if last_t&.joinable?
     end
   end
 end

data/lib/after_transaction_commit/version.rb

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

data/spec/after_transaction_commit_spec.rb

@@ -82,6 +82,19 @@ describe AfterTransactionCommit do
     expect(a).to eql 1
   end
 
+  it "doesn't execute the callback if an intermediate transaction rolls back" do
+    a = 0
+    User.connection.transaction do
+      User.connection.transaction(requires_new: true) do
+        User.connection.transaction(requires_new: true) do
+          User.connection.after_transaction_commit { a += 1 }
+        end
+        raise ActiveRecord::Rollback
+      end
+    end
+    expect(a).to eql 0
+  end
+
   it "doesn't lose a callback inside a callback inside a nested non-joinable transaction" do
     a = 0
     User.connection.transaction do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: after_transaction_commit
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Brian Palmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brianp@instructure.com
 executables: []
@@ -151,7 +151,7 @@ homepage: https://github.com/instructure/after_transaction_commit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,9 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: ActiveRecord::Base.connection.after_transaction_commit { ... }
 test_files: