ar_transaction_changes 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714d24f3fc939b5ab4170bd5863573aea0b5f9f918d3494f51656096579d0cc6
-  data.tar.gz: 62d4814dccd3e3f5623958e1182ba8654eca9d37cc01bf986cfa09527fc5b6b5
+  metadata.gz: c1ad6773a9205c5481c708ac6685c0f0609018fb0bc03845b57db109a32bd6b3
+  data.tar.gz: a4df65cd09d591fefb68fa9c3b1ccf311fbffcafb42e7ac7192622d747e05d49
 SHA512:
-  metadata.gz: 1a77baf0fd44d182e407c79ae17499933aa0a85aa1a9d2c7be3c4b1df2a0a6bee34a4d18d10bb82a5aea3b45aaa65dfde4d6254bf49b5aa8abb2dd293900b6ac
-  data.tar.gz: ab7fd9f52be45e78f6911159cb7c472ac9d78151891b1968bfcf1629ee97e65a944ef71178c5b5411f935b680d5a460f99f6884c3d8ce08aad6274b882b175f5
+  metadata.gz: f51346e32137f229013ccaf2f201e6d2ec2c60a806fb92f452818c1cf8d553a13f45744d17b0a0b8bff33496455611451443aa81f7f780826fa4b546fb91394e
+  data.tar.gz: 4c7200f2d0dcbe341fda292fe71a916dd072c52a617c992c5140abb203765d4ce1b456efa67a20bf8ba3c310ea1038c90486424fce9b6e1844c91920c5910fbf

data/lib/ar_transaction_changes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArTransactionChanges
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
 end

data/lib/ar_transaction_changes.rb

@@ -4,37 +4,37 @@ require "ar_transaction_changes/version"
 require "active_record"
 
 module ArTransactionChanges
-  def self.included(base)
-    if base.respond_to?(:_commit_callbacks) && base.respond_to?(:_rollback_callbacks)
-      if !base._commit_callbacks.empty? || !base._rollback_callbacks.empty?
-        raise "ArTransactionChanges must be included before defining any after_commit or after_rollback callbacks"
-      end
-    end
-  end
-
-  if ActiveRecord.version >= Gem::Version.new('8.1.0.alpha')
-    def _run_commit_callbacks!
+  if ActiveRecord.version >= Gem::Version.new('7.1')
+    def run_callbacks(kind, type = nil)
       super
     ensure
-      @transaction_changed_attributes = nil
+      if kind == :commit || kind == :rollback
+        @transaction_changed_attributes = nil
+      end
     end
 
-    def _run_rollback_callbacks!
-      super
-    ensure
-      @transaction_changed_attributes = nil
+    if ActiveRecord.version >= Gem::Version.new('8.1.0.alpha')
+      # We should reset @transaction_changed_attributes in the no-op version of the method.
+      # Even if there are no callbacks registered, attributes should be reset on commit/rollback.
+      def _run_commit_callbacks
+        super
+      ensure
+        @transaction_changed_attributes = nil
+      end
+
+      def _run_rollback_callbacks
+        super
+      ensure
+        @transaction_changed_attributes = nil
+      end
     end
   else
-    def _run_commit_callbacks
+    def run_callbacks(kind)
       super
     ensure
-      @transaction_changed_attributes = nil
-    end
-
-    def _run_rollback_callbacks
-      super
-    ensure
-      @transaction_changed_attributes = nil
+      if kind == :commit || kind == :rollback
+        @transaction_changed_attributes = nil
+      end
     end
   end
 

data/test/transaction_changes_test.rb

@@ -174,28 +174,4 @@ class TransactionChangesTest < Minitest::Test
 
     assert_equal [[], ['a', 'b']], @user.stored_transaction_changes['notes']
   end
-
-  def test_do_not_allow_adding_this_gem_to_a_model_after_commit_callbacks_are_defined
-    assert_raises(RuntimeError) do
-      Class.new(ActiveRecord::Base) do
-        after_commit :some_method
-
-        include ArTransactionChanges
-
-        def some_method; end
-      end
-    end
-  end
-
-    def test_do_not_allow_adding_this_gem_to_a_model_after_rollback_callbacks_are_defined
-    assert_raises(RuntimeError) do
-      Class.new(ActiveRecord::Base) do
-        after_rollback :some_method
-
-        include ArTransactionChanges
-
-        def some_method; end
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_transaction_changes
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Dylan Thacker-Smith