ar_transaction_changes 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a85de7f78cb23d9af300f5279a909db5ecab9b3e02bca9cf2ecd4703062b8b
-  data.tar.gz: cc04e7f4c6e884d4db4fe94c84b8a8ef55871613c0b0d737f9956a5f69d3ebcf
+  metadata.gz: 5871403ece76d3c6fceb41b1a5aecd240d5460363e0d86a88f4b27ba4fc1d562
+  data.tar.gz: fda845379838e83afc84c11bc23005f4af0ac8e12df804c48c5010d724b52ba3
 SHA512:
-  metadata.gz: 4fde634868ccbb2518edbde7841bce8ca6745a41c6ef398d1d20ce55bae6a7eefb9c35689ebecadd3ef8246200a6034bc202960457f42e430a351c56b7ef0742
-  data.tar.gz: d14df655313155febb0c769a2852efc8c1ce4888cfbaa05ea362ecdb3a1219bc98051b5da1b3583dd8add30ff40a6ea52f0a6ac86198cb54a4d7208520daecb4
+  metadata.gz: 386cd79e7207afdc17fc9f019183fe14674c5a3af5fe6b35c87433417bfe0ce94573abbe43954f46812e22911051aa3ab80a8d47ddee7a78b6f5801b6d10fef2
+  data.tar.gz: 628f82d89b3c54455dc9c5071e9beb1610deb710bbfa158f616d886b04c9136f446bc25ad04d8f1ba9e6f3096dd5c93f64340a207cc4541f53e6420ab74db115

data/.github/workflows/ci.yml

@@ -15,13 +15,13 @@ jobs:
       matrix:
         entry:
           - name: 'Minimum supported'
-            ruby: 2.4
-            gemfile: Gemfile.rails52
+            ruby: 2.7
+            gemfile: Gemfile.rails6
           - name: "Latest released versions"
-            ruby: 3.0
+            ruby: 3.2
             gemfile: Gemfile
           - name: "Rails main branch"
-            ruby: 3.0
+            ruby: 3.2
             gemfile: Gemfile.rails_head
 
     name: ${{ matrix.entry.name }}
@@ -34,14 +34,11 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install libsqlite3-dev
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.entry.ruby }}
-    - name: Install bundler and gems
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
     - name: Run tests
       run: bundle exec rake

data/{Gemfile.rails52 → Gemfile.rails6}

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.2.0'
+gem 'activerecord', '~> 6.0.0'
 gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec

data/lib/ar_transaction_changes/version.rb

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

data/lib/ar_transaction_changes.rb

@@ -34,25 +34,37 @@ module ArTransactionChanges
     end
   end
 
+  def attribute_will_change!(attr_name)
+    unless transaction_changed_attributes.key?(attr_name)
+      value = _read_attribute_for_transaction(attr_name)
+      value = _deserialize_transaction_change_value(attr_name, value)
+      transaction_changed_attributes[attr_name] = value
+    end
+    super
+  end
+
   private
 
+  def init_internals
+    super
+    @transaction_changed_attributes = nil
+  end
+
+  def _deserialize_transaction_change_value(attr_name, value)
+    attribute = @attributes[attr_name]
+    return value unless attribute.type.is_a?(::ActiveRecord::Type::Serialized)
+    attribute.type.deserialize(value)
+  end
+
   def _store_transaction_changed_attributes(attr_name)
     attr_name = attr_name.to_s
     old_value = _read_attribute_for_transaction(attr_name)
     ret = yield
     new_value = _read_attribute_for_transaction(attr_name)
     if !transaction_changed_attributes.key?(attr_name) && new_value != old_value
-      attribute = @attributes[attr_name]
-      transaction_changed_attributes[attr_name] = if attribute.type.is_a?(::ActiveRecord::Type::Serialized)
-        attribute.type.deserialize(old_value)
-      else
-        old_value
-      end
+      transaction_changed_attributes[attr_name] = _deserialize_transaction_change_value(attr_name, old_value)
     elsif transaction_changed_attributes.key?(attr_name)
-      attribute = @attributes[attr_name]
-      if attribute.type.is_a?(::ActiveRecord::Type::Serialized)
-        new_value = attribute.type.deserialize(new_value)
-      end
+      new_value = _deserialize_transaction_change_value(attr_name, new_value)
 
       stored_value = transaction_changed_attributes[attr_name]
 

data/test/test_helper.rb

@@ -28,3 +28,10 @@ ActiveRecord::Base.connection.tap do |db|
 end
 
 Dir[test_dir.join("models/*.rb")].each{ |file| require file }
+
+serializable_classes = [User::ConnectionDetails]
+if ActiveRecord::VERSION::MAJOR >= 7
+  ActiveRecord.yaml_column_permitted_classes += serializable_classes
+else
+  ActiveRecord::Base.yaml_column_permitted_classes += serializable_classes
+end

data/test/transaction_changes_test.rb

@@ -153,4 +153,25 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
 
     assert_empty @user.stored_transaction_changes
   end
+
+  def test_mutating_serialized_attribute_in_place_with_attribute_will_change
+    @user.notes_will_change!
+    @user.notes.push('a')
+    @user.save!
+
+    assert_equal [[], ['a']], @user.stored_transaction_changes['notes']
+  end
+
+  def test_double_modification_with_attribute_will_change
+    @user.transaction do
+      @user.notes = ['a']
+      @user.save!
+
+      @user.notes_will_change!
+      @user.notes.push('b')
+      @user.save!
+    end
+
+    assert_equal [[], ['a', 'b']], @user.stored_transaction_changes['notes']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_transaction_changes
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -63,7 +63,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
-- Gemfile.rails52
+- Gemfile.rails6
 - Gemfile.rails_head
 - LICENSE.txt
 - README.md
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Store transaction changes for active record objects