after_transaction_commit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4165447ab4b683699ba7c83f00f146dfc2b16d7
-  data.tar.gz: 551149649de9ba7f7048e1f86b111f3698d0d756
+  metadata.gz: 5d37205f04fd9dab8a6f219b2ff9ab0760b953d2
+  data.tar.gz: '058120cf8588254d3ce383837752aaf0d575d5cc'
 SHA512:
-  metadata.gz: e46f1ff9660d8e0467251a1f3571de9895fa184bd132249f102e57bb36c33256b0b5aa31ffd0c5e1ccd36a2b96cba04f3234ed090a10731f87e78cf1ffb34ce3
-  data.tar.gz: 68d74ffaca0ad4cbdf7911266c7e8dbd85d02eabe271b8f4951580e0d035a1a7af6116a77c40be4fa6f833152888030c1278da3b961e7672521a5043a06a477d
+  metadata.gz: 692045eb18c6ec174083466cb7d5e02b84a8eeca2c03ddb023238dad14ee4067b70946e5870899f86718577d3efbce1a0801986c2c8d57ce2b991a4db958df3f
+  data.tar.gz: cb79f79c415901f0b4b2fec1875795fae2f515fe08aed3d015f0e31b277b4b21e57ccccd5f889985c5e9a67e21f1470ed2293c175e2b24500a2a152304b5b960

data/lib/after_transaction_commit/database_statements.rb

@@ -28,16 +28,22 @@ ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do
     @after_transaction_commit = [] if @after_transaction_commit
   end
 
-  def _transaction_test_mode?
-    defined?(TestAfterCommit)
-  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 _in_transaction_for_callbacks?
+      txn = _transaction_test_mode? ? _test_open_transactions : open_transactions
+      txn > 0
+    end
 
-  def _test_open_transactions
-    @test_open_transactions || 0
+    def _test_open_transactions
+      @test_open_transactions || 0
+    end
+  else
+    def _in_transaction_for_callbacks?
+      current_transaction.joinable?
+    end
   end
 end

data/lib/after_transaction_commit/transaction.rb

@@ -1,10 +1,19 @@
 module AfterTransactionCommit
   module Transaction
-    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)
+    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
     end
 

data/lib/after_transaction_commit/version.rb

@@ -1,3 +1,3 @@
 module AfterTransactionCommit
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/after_transaction_commit_spec.rb

@@ -20,6 +20,29 @@ describe AfterTransactionCommit do
     expect(a).to eql 1
   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 }
+      expect(a).to eql 1
+    end
+    expect(a).to eql 1
+  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
+        User.connection.after_transaction_commit { a += 1 }
+        expect(a).to eql 0
+      end
+      expect(a).to eql 1
+    end
+    expect(a).to eql 1
+  end
+
   it "should not execute the callbacks on rollback" do
     a = 0
     User.connection.transaction do
@@ -44,6 +67,7 @@ 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 } }

data/spec/gemfiles/40.gemfile.lock

@@ -7,7 +7,7 @@ GIT
       activerecord (>= 3.2)
 
 PATH
-  remote: ../../
+  remote: ../..
   specs:
     after_transaction_commit (1.1.0)
       activerecord (>= 4.0)
@@ -71,4 +71,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.5
+   1.14.3

data/spec/gemfiles/41.gemfile.lock

@@ -7,7 +7,7 @@ GIT
       activerecord (>= 3.2)
 
 PATH
-  remote: ../../
+  remote: ../..
   specs:
     after_transaction_commit (1.1.0)
       activerecord (>= 4.0)
@@ -70,4 +70,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.5
+   1.14.3

data/spec/gemfiles/42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
       activerecord (>= 3.2)
 
 PATH
-  remote: ../../
+  remote: ../..
   specs:
     after_transaction_commit (1.1.0)
       activerecord (>= 4.0)
@@ -70,4 +70,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.5
+   1.14.3

data/spec/gemfiles/50.gemfile.lock

@@ -7,7 +7,7 @@ GIT
       activerecord (>= 3.2)
 
 PATH
-  remote: ../../
+  remote: ../..
   specs:
     after_transaction_commit (1.1.0)
       activerecord (>= 4.0)
@@ -67,4 +67,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.5
+   1.14.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: after_transaction_commit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::Base.connection.after_transaction_commit { ... }
@@ -175,4 +175,3 @@ test_files:
 - spec/gemfiles/50.gemfile
 - spec/gemfiles/50.gemfile.lock
 - spec/spec_helper.rb
-has_rdoc: