ar_transaction_changes 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6cb7a7d939217a2aa0ce44c25c2f89a97ed7457be1c1836d6e7d82e2250c9a
-  data.tar.gz: 4d7295698fedf9d8981be7266b86f5c0ef75794ded3f0fce511b3aec151df76e
+  metadata.gz: 1b75ccc7bc393e60284a26e6077bdfc48e8032b52780770f0b762f292a6a3393
+  data.tar.gz: 2a048448c70283320792559fd7f7ae90d339384fda9fa3b9d437abf2607fd701
 SHA512:
-  metadata.gz: b3fbd5e913fc97722ea9181f088f9dd2b0282751ceb5cc1588a9f73c63b5f3e1df97dfad7f4aa9ee9952b3bb52bba49edafa65419ca904623475806aad5ebb92
-  data.tar.gz: 8bbbcf7edd439aa32bed2d1ef988a20adc49629256b779f1e6c473193c9b28c50c0d246e80b57195b37e452d81324a7ec71fd448a35f4b8f5bebe9abd4f4b7b8
+  metadata.gz: f3148c75a2a2bebc626451d1cbfbb7263cb1e39a56571af89761dc1f5b96a3a988de2a97ee2bef546744765f2b3eb569de77ce45fea5e7da1289821231435076
+  data.tar.gz: e21dff998d73c00ee6f6b8b7d92d9814412bf3421b8dc009e41429b7fc33e014cd9cd4f01d05288bc5009fc530749628de7d19c6e97973c53a3ddd37bc8f9cd0

data/lib/ar_transaction_changes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ar_transaction_changes/version"
 require "active_record"
 
@@ -36,12 +38,34 @@ module ArTransactionChanges
 
   def _store_transaction_changed_attributes(attr_name)
     attr_name = attr_name.to_s
-    old_value = read_attribute(attr_name)
+    old_value = _read_attribute_for_transaction(attr_name)
     ret = yield
-    new_value = read_attribute(attr_name)
+    new_value = _read_attribute_for_transaction(attr_name)
     unless transaction_changed_attributes.key?(attr_name) || new_value == old_value
-      transaction_changed_attributes[attr_name] = 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
     end
     ret
   end
+
+  def _read_attribute_for_transaction(attr_name)
+    attribute = @attributes[attr_name]
+    # Avoid causing an earlier memoized type cast of mutable serialized user values,
+    # since could prevent mutations of that user value from affecting the attribute value
+    # that would affect it without using this library.
+    if attribute.type.is_a?(::ActiveRecord::Type::Serialized)
+      if attribute.came_from_user?
+        attribute.type.serialize(attribute.value_before_type_cast)
+      else
+        attribute.value_before_type_cast
+      end
+    else
+      _read_attribute(attr_name)
+    end
+  end
 end

data/lib/ar_transaction_changes/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArTransactionChanges
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/test/models/user.rb

@@ -1,6 +1,16 @@
 class User < ActiveRecord::Base
   include ArTransactionChanges
 
+  class ConnectionDetails
+    attr_accessor :client_ip
+
+    def initialize(client_ip:)
+      @client_ip = client_ip
+    end
+  end
+
+  serialize :connection_details, Array
+
   attr_accessor :stored_transaction_changes
 
   after_commit :store_transaction_changes_for_tests

data/test/test_helper.rb

@@ -19,6 +19,7 @@ ActiveRecord::Base.connection.tap do |db|
     t.string :name
     t.string :occupation
     t.integer :age
+    t.text :connection_details
     t.timestamps null: false
   end
 end

data/test/transaction_changes_test.rb

@@ -110,4 +110,20 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
     end
     assert_empty @user.stored_transaction_changes
   end
+
+  def test_serialized_attributes_value
+    @user.connection_details = [User::ConnectionDetails.new(client_ip: '1.1.1.1')]
+    @user.save!
+    old_value, new_value = @user.stored_transaction_changes['connection_details']
+    assert_equal([], old_value)
+    assert_equal(['1.1.1.1'], new_value.map(&:client_ip))
+  end
+
+  def test_serialized_attributes_mutation
+    details = User::ConnectionDetails.new(client_ip: '1.1.1.1')
+    @user.connection_details = [details]
+    details.client_ip = '2.2.2.2'
+    @user.save!
+    assert_equal '2.2.2.2', @user.connection_details.first.client_ip
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_transaction_changes
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Dylan Thacker-Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -79,7 +79,7 @@ homepage: https://github.com/dylanahsmith/ar_transaction_changes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Store transaction changes for active record objects
 test_files: