ar_transaction_changes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819e175a8fd364bb81f216e4431e3481c4fb4458
-  data.tar.gz: de05ff5509c551638af333b7b42117cd33e4b1f0
+  metadata.gz: 464cbfbf5ac37f36f38328159dc6c6d913d5db95
+  data.tar.gz: 59ae318875b3050ee7a4a2c71f196a6e2eb34669
 SHA512:
-  metadata.gz: dcf1129a18a18cf496049e54ef46169c40ce6d36cc7ac67c7ae688188fb89a614813418e4d143e6a36e6bf1f0d1413dfd156d960f0cb1694ce0f1af934c6e6be
-  data.tar.gz: baadb5f8e2083168eaea6eac1374bfc871fa55820b7569a510b6f9a22a93d242c327d1211d19ae3e3cc6270373d871f30eb14975bdde70758fb7e7d32ed34031
+  metadata.gz: 7d46632d1585c8038490067757bb143fb0f0d32a2fd4465e03b424b148177454305042a9ad15ec9c9c761c8f743814e5b7d6a431c76b7cc56b482c896eda1b72
+  data.tar.gz: 86a9948798f5a517adb26262d73064e03f8cb4f7ae1da73e94a24e796fe7ff0590d1145389a1f46f24cdcb59abab2d43f4619bf14c31caf3de0bae61c2691b24

data/.travis.yml

@@ -2,25 +2,18 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.4
+  - 2.2.5
+  - 2.3.1
 
 gemfile:
-  - gemfiles/rails_3_2.gemfile
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5.gemfile
+  - Gemfile.rails42
+  - Gemfile.rails50
+  - Gemfile.rails51
 
 matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.1.5
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/rails_3_2.gemfile
+  include:
+    - rvm: 2.1.9
+      gemfile: Gemfile.rails42
 
 services:
   - mysql

data/Gemfile.rails42

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

data/Gemfile.rails50

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

data/Gemfile.rails51

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

data/Rakefile

@@ -1,7 +1,6 @@
 require "bundler/gem_tasks"
 require 'rake'
 require 'rake/testtask'
-require 'appraisal'
 
 task :default => 'test'
 

data/ar_transaction_changes.gemspec

@@ -17,9 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 3.0", "< 6.0", "!= 4.2.3"
+  gem.add_dependency "activerecord", ">= 4.2.4", "< 6.0"
 
   gem.add_development_dependency("rake")
   gem.add_development_dependency("mysql2")
-  gem.add_development_dependency("appraisal")
 end

data/lib/ar_transaction_changes.rb

@@ -1,51 +1,31 @@
 require "ar_transaction_changes/version"
 
 module ArTransactionChanges
-  if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2)
-    def _run_create_callbacks
-      ret = super
-      store_transaction_changed_attributes if ret != false
-      ret
-    end
-
-    def _run_update_callbacks
-      ret = super
-      store_transaction_changed_attributes if ret != false
-      ret
-    end
-
-    def _run_commit_callbacks
-      super
-    ensure
-      @transaction_changed_attributes = nil
-    end
-
-    def _run_rollback_callbacks
-      super
-    ensure
-      @transaction_changed_attributes = nil
-    end
-  else
-    def run_callbacks(kind, *args)
-      ret = super
-      case kind.to_sym
-      when :create, :update
-        store_transaction_changed_attributes if ret != false
-      when :commit, :rollback
-        @transaction_changed_attributes = nil
-      end
+  def _run_commit_callbacks
+    super
+  ensure
+    @transaction_changed_attributes = nil
+  end
 
-      ret
-    end
+  def _run_rollback_callbacks
+    super
+  ensure
+    @transaction_changed_attributes = nil
   end
 
   def transaction_changed_attributes
-    changed_attributes.merge(@transaction_changed_attributes ||= {})
+    @transaction_changed_attributes ||= HashWithIndifferentAccess.new
   end
 
   private
 
-  def store_transaction_changed_attributes
-    @transaction_changed_attributes = transaction_changed_attributes
+  def write_attribute(attr_name, value) # override
+    attr_name = attr_name.to_s
+    old_value = attributes[attr_name]
+    ret = super
+    unless transaction_changed_attributes.key?(attr_name) || value == old_value
+      transaction_changed_attributes[attr_name] = old_value
+    end
+    ret
   end
 end

data/lib/ar_transaction_changes/version.rb

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

data/test/test_helper.rb

@@ -10,17 +10,12 @@ config_filename = test_dir.join("database.yml").exist? ? "database.yml" : "datab
 database_yml = YAML.load(test_dir.join(config_filename).read)
 ActiveRecord::Base.establish_connection database_yml['test']
 
-if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("4.1")
-  class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-      NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
-  end
-end
-
 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.timestamps null: false
   end
 end
 

data/test/transaction_changes_test.rb

@@ -41,7 +41,7 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
       @user.save!
       raise ActiveRecord::Rollback
     end
-    assert_equal nil, @user.stored_transaction_changes
+    assert_nil @user.stored_transaction_changes
   end
 
   def test_transaction_changes_after_reload_saved
@@ -66,4 +66,32 @@ class TransactionChangesTest < MiniTest::Unit::TestCase
     assert_equal ["Dylan", "Dillon"], @user.stored_transaction_changes["name"]
   end
 
+  def test_transaction_changes_for_changing_updated_at
+    @user.update_attributes!(updated_at: Time.now - 1.second)
+    old_updated_at = @user.updated_at
+    @user.stored_transaction_changes = nil
+
+    @user.updated_at = Time.now
+    @user.save!
+
+    assert_equal [old_updated_at, @user.updated_at], @user.stored_transaction_changes["updated_at"]
+  end
+
+  def test_transaction_changes_for_touch
+    @user.update_attributes!(updated_at: Time.now - 1.second)
+    old_updated_at = @user.updated_at
+    @user.stored_transaction_changes = nil
+
+    @user.touch
+
+    assert_equal [old_updated_at, @user.updated_at], @user.stored_transaction_changes["updated_at"]
+  end
+
+  def test_transaction_changes_doesnt_record_non_changes
+    @user.transaction do
+      @user.name = "Dylan"
+      @user.save!
+    end
+    refute @user.stored_transaction_changes["name"]
+  end
 end

metadata

@@ -1,81 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: ar_transaction_changes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dylan Thacker-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+        version: 4.2.4
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - '!='
-      - !ruby/object:Gem::Version
-        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+        version: 4.2.4
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-    - - '!='
-      - !ruby/object:Gem::Version
-        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Solves the problem of trying to get all the changes to an object during
@@ -86,19 +66,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Appraisals
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.rails42
+- Gemfile.rails50
+- Gemfile.rails51
 - LICENSE.txt
 - README.md
 - Rakefile
 - ar_transaction_changes.gemspec
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5.gemfile
 - lib/ar_transaction_changes.rb
 - lib/ar_transaction_changes/version.rb
 - test/database.yml.default
@@ -114,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Store transaction changes for active record objects

data/Appraisals

@@ -1,22 +0,0 @@
-appraise "rails-3-2" do
-  gem "rails", "~> 3.2.21"
-  gem "mysql2", "~> 0.3.20"
-end
-
-appraise "rails-4-0" do
-  gem "rails", "~> 4.0.12"
-  gem "mysql2", "~> 0.3.20"
-end
-
-appraise "rails-4-1" do
-  gem "rails", "~> 4.1.8"
-  gem "mysql2", "~> 0.3.20"
-end
-
-appraise "rails-4-2" do
-  gem "rails", "~> 4.2.0"
-end
-
-appraise "rails-5" do
-  gem "rails", "~> 5.0.0.beta4"
-end

data/gemfiles/rails_3_2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2.21"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.0.12"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.8"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0.beta4"
-
-gemspec :path => "../"