From 05ed75ffa443302c140bdb68cb46b45239418fbb Mon Sep 17 00:00:00 2001
From: npezza93 <npezza93@gmail.com>
Date: Wed, 3 May 2017 16:15:14 -0400
Subject: [PATCH] Fix after_commit on: :destroy not being triggered

---
 .travis.yml           |  6 +++---
 lib/paranoia.rb       | 27 +++++++++++++++++++++++++++
 test/paranoia_test.rb | 29 +++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa863626..268c93ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,16 @@ env:
   matrix:
     - RAILS='~> 4.2.7.1'
     - RAILS='~> 5.0.0.1'
-    - RAILS='~> 5.1.0.rc1'
+    - RAILS='~> 5.1.0'
 
 matrix:
   exclude:
-    - env: RAILS='~> 5.1.0.rc1'
+    - env: RAILS='~> 5.1.0'
       rvm: 2.2.6
   allow_failures:
     - env: RAILS='~> 4.2.7.1'
       rvm: jruby-9.1.6.0
     - env: RAILS='~> 5.0.0.1'
       rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.1.0.rc1'
+    - env: RAILS='~> 5.1.0'
       rvm: jruby-9.1.6.0
diff --git a/lib/paranoia.rb b/lib/paranoia.rb
index ee42abfa..a4eb1722 100644
--- a/lib/paranoia.rb
+++ b/lib/paranoia.rb
@@ -86,6 +86,7 @@ def destroy
           association.decrement_counters
         end
         @_disable_counter_cache = false
+        @_trigger_destroy_callback = true
         result
       end
     end
@@ -193,6 +194,32 @@ def timestamp_attributes_with_current_time
     timestamp_attributes_for_update_in_model.each_with_object({}) { |attr,hash| hash[attr] = current_time_from_proper_timezone }
   end
 
+  def transaction_include_any_action?(actions)
+    actions.any? do |action|
+      case action
+      when :create
+        transaction_record_state(:new_record)
+      when :destroy
+        if ActiveRecord::VERSION::STRING < "5.1.0"
+          transaction_include_destroy?
+        else
+          defined?(@_trigger_destroy_callback) && @_trigger_destroy_callback
+        end
+      when :update
+        update_trigger = !(transaction_record_state(:new_record) || transaction_include_destroy?)
+        if ActiveRecord::VERSION::STRING >= "5.1.0"
+          update_trigger &&= (defined?(@_trigger_update_callback) && @_trigger_update_callback)
+        end
+        update_trigger
+      end
+    end
+  end
+
+
+  def transaction_include_destroy?
+    destroyed? || try(:paranoia_destroyed?)
+  end
+
   # restore associated records that have been soft deleted when
   # we called #destroy
   def restore_associated_records(recovery_window_range = nil)
diff --git a/test/paranoia_test.rb b/test/paranoia_test.rb
index 8c4c2d3f..08277e62 100644
--- a/test/paranoia_test.rb
+++ b/test/paranoia_test.rb
@@ -111,6 +111,16 @@ def test_destroy_behavior_for_plain_models
     assert_equal 0, model.class.unscoped.count
   end
 
+  def test_after_commit_on_destroy_callbacks
+    model = AfterCommitDestroyModel.new
+    model.save
+    model.reset_after_commit_callback_called     # clear called callback flags
+    refute model.after_commit_callback_called
+    model.destroy
+
+    assert model.after_commit_callback_called
+  end
+
   # Anti-regression test for #81, which would've introduced a bug to break this test.
   def test_destroy_behavior_for_plain_models_callbacks
     model = CallbackModel.new
@@ -1359,3 +1369,22 @@ class ParanoidBelongsTo < ActiveRecord::Base
     belongs_to :paranoid_has_one
   end
 end
+
+class AfterCommitDestroyModel < ActiveRecord::Base
+  self.table_name = "callback_models"
+
+  attr_reader :after_commit_callback_called
+
+  acts_as_paranoid
+  after_commit :callback_triggered, on: :destroy
+
+  def reset_after_commit_callback_called
+    @after_commit_callback_called = false
+  end
+
+  private
+
+  def callback_triggered
+    @after_commit_callback_called = true
+  end
+end