ar_transaction_changes 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 464cbfbf5ac37f36f38328159dc6c6d913d5db95
-  data.tar.gz: 59ae318875b3050ee7a4a2c71f196a6e2eb34669
+SHA256:
+  metadata.gz: 4a6cb7a7d939217a2aa0ce44c25c2f89a97ed7457be1c1836d6e7d82e2250c9a
+  data.tar.gz: 4d7295698fedf9d8981be7266b86f5c0ef75794ded3f0fce511b3aec151df76e
 SHA512:
-  metadata.gz: 7d46632d1585c8038490067757bb143fb0f0d32a2fd4465e03b424b148177454305042a9ad15ec9c9c761c8f743814e5b7d6a431c76b7cc56b482c896eda1b72
-  data.tar.gz: 86a9948798f5a517adb26262d73064e03f8cb4f7ae1da73e94a24e796fe7ff0590d1145389a1f46f24cdcb59abab2d43f4619bf14c31caf3de0bae61c2691b24
+  metadata.gz: b3fbd5e913fc97722ea9181f088f9dd2b0282751ceb5cc1588a9f73c63b5f3e1df97dfad7f4aa9ee9952b3bb52bba49edafa65419ca904623475806aad5ebb92
+  data.tar.gz: 8bbbcf7edd439aa32bed2d1ef988a20adc49629256b779f1e6c473193c9b28c50c0d246e80b57195b37e452d81324a7ec71fd448a35f4b8f5bebe9abd4f4b7b8

data/.travis.yml

@@ -1,22 +1,17 @@
 language: ruby
 sudo: false
 
-rvm:
-  - 2.2.5
-  - 2.3.1
-
-gemfile:
-  - Gemfile.rails42
-  - Gemfile.rails50
-  - Gemfile.rails51
-
-matrix:
+jobs:
   include:
-    - rvm: 2.1.9
-      gemfile: Gemfile.rails42
+    - name: "Minimum supported versions"
+      rvm: 2.4
+      gemfile: Gemfile.rails52
+    - name: "Latest released versions"
+      rvm: 2.7
+      gemfile: Gemfile
+    - name: "Rails master branch"
+      rvm: 2.7
+      gemfile: Gemfile.rails_head
 
 services:
   - mysql
-
-before_script:
-  - mysql -e 'create database ar_transaction_changes_test'

data/{Gemfile.rails42 → Gemfile.rails52}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem 'activerecord', '~> 5.2.0'
 
 gemspec

data/Gemfile.rails_head

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'activerecord', github: 'rails/rails'
+
+gemspec

data/README.md

@@ -44,6 +44,19 @@ class User < ActiveRecord::Base
 end
 ```
 
+## Important Notes
+
+`ar_transaction_changes` may have conflict with another gems who modify
+`active_record#write_attribute` method, e.g. `globalize` gem
+
+the workaround is by requiring this gem first, for example:
+
+```ruby
+gem 'ar_transaction_changes', require: false
+gem 'globalize', require: ['ar_transaction_changes', 'globalize']
+
+```
+
 ## Contributing
 
 1. Fork it

data/ar_transaction_changes.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Solves the problem of trying to get all the changes to an object during a transaction in an after_commit callbacks.}
   gem.summary       = %q{Store transaction changes for active record objects}
   gem.homepage      = "https://github.com/dylanahsmith/ar_transaction_changes"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 4.2.4", "< 6.0"
+  gem.add_dependency "activerecord", ">= 5.2.0"
 
   gem.add_development_dependency("rake")
   gem.add_development_dependency("mysql2")

data/lib/ar_transaction_changes.rb

@@ -1,4 +1,5 @@
 require "ar_transaction_changes/version"
+require "active_record"
 
 module ArTransactionChanges
   def _run_commit_callbacks
@@ -17,13 +18,28 @@ module ArTransactionChanges
     @transaction_changed_attributes ||= HashWithIndifferentAccess.new
   end
 
+  def _write_attribute(attr_name, value)
+    _store_transaction_changed_attributes(attr_name) do
+      super(attr_name, value)
+    end
+  end
+
+  if ActiveRecord.version >= Gem::Version.new('6.1.0.alpha')
+    def write_attribute(attr_name, value)
+      _store_transaction_changed_attributes(attr_name) do
+        super(attr_name, value)
+      end
+    end
+  end
+
   private
 
-  def write_attribute(attr_name, value) # override
+  def _store_transaction_changed_attributes(attr_name)
     attr_name = attr_name.to_s
-    old_value = attributes[attr_name]
-    ret = super
-    unless transaction_changed_attributes.key?(attr_name) || value == old_value
+    old_value = read_attribute(attr_name)
+    ret = yield
+    new_value = read_attribute(attr_name)
+    unless transaction_changed_attributes.key?(attr_name) || new_value == old_value
       transaction_changed_attributes[attr_name] = old_value
     end
     ret

data/lib/ar_transaction_changes/version.rb

@@ -1,3 +1,3 @@
 module ArTransactionChanges
-  VERSION = "1.1.1"
+  VERSION = "1.1.6"
 end

data/test/test_helper.rb

@@ -1,20 +1,24 @@
-ENV["RAILS_ENV"] = "test"
 require 'pathname'
 require 'yaml'
-require 'active_record'
 require 'ar_transaction_changes'
 require 'minitest/autorun'
 
+ENV["RAILS_ENV"] = "test"
+
 test_dir = Pathname.new(File.dirname(__FILE__))
 config_filename = test_dir.join("database.yml").exist? ? "database.yml" : "database.yml.default"
 database_yml = YAML.load(test_dir.join(config_filename).read)
-ActiveRecord::Base.establish_connection database_yml['test']
+database_config = database_yml.fetch("test")
+
+ActiveRecord::Base.establish_connection(database_config.except("database"))
+ActiveRecord::Base.connection.recreate_database(database_config.fetch("database"))
+ActiveRecord::Base.establish_connection(database_config)
 
 ActiveRecord::Base.connection.tap do |db|
-  db.drop_table(:users) if db.table_exists?(:users)
   db.create_table(:users) do |t|
     t.string :name
     t.string :occupation
+    t.integer :age
     t.timestamps null: false
   end
 end

data/test/transaction_changes_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TransactionChangesTest < MiniTest::Unit::TestCase
   def setup
-    @user = User.new(:name => "Dylan", :occupation => "Developer")
+    @user = User.new(:name => "Dylan", :occupation => "Developer", age: 20)
     @user.save!
     @user.stored_transaction_changes = nil
   end
@@ -23,6 +23,13 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
     assert_equal ["Dylan", "Dillon"], @user.stored_transaction_changes["name"]
   end
 
+  def test_transaction_changes_for_updating_attribute
+    @user[:name] = "Dillon"
+    @user.save!
+
+    assert_equal ["Dylan", "Dillon"], @user.stored_transaction_changes["name"]
+  end
+
   def test_transaction_changes_for_double_save
     @user.transaction do
       @user.name = "Dillon"
@@ -67,7 +74,7 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
   end
 
   def test_transaction_changes_for_changing_updated_at
-    @user.update_attributes!(updated_at: Time.now - 1.second)
+    @user.update!(updated_at: Time.now - 1.second)
     old_updated_at = @user.updated_at
     @user.stored_transaction_changes = nil
 
@@ -78,7 +85,7 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
   end
 
   def test_transaction_changes_for_touch
-    @user.update_attributes!(updated_at: Time.now - 1.second)
+    @user.update!(updated_at: Time.now - 1.second)
     old_updated_at = @user.updated_at
     @user.stored_transaction_changes = nil
 
@@ -94,4 +101,13 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
     end
     refute @user.stored_transaction_changes["name"]
   end
+
+  def test_transaction_changes_type_cast
+    # "20" will be converted to 20 by read_attribute https://apidock.com/rails/ActiveRecord/AttributeMethods/read_attribute
+    @user.transaction do
+      @user.age = "20"
+      @user.save!
+    end
+    assert_empty @user.stored_transaction_changes
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_transaction_changes
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -69,9 +63,8 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.rails42
-- Gemfile.rails50
-- Gemfile.rails51
+- Gemfile.rails52
+- Gemfile.rails_head
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -83,7 +76,8 @@ files:
 - test/test_helper.rb
 - test/transaction_changes_test.rb
 homepage: https://github.com/dylanahsmith/ar_transaction_changes
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -100,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Store transaction changes for active record objects

data/Gemfile.rails50

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-gemspec

data/Gemfile.rails51

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0.rc1"
-
-gemspec