transaction_changes 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8fed12bd13bb6d0513d3eb26237dc3a118c60f52
-  data.tar.gz: 22c7dfc663f82ad59736343a6893a82172498dc1
+SHA256:
+  metadata.gz: 87555349d944f68fc8675579a3749f97809cb2ca2695bc44073c094183edc40f
+  data.tar.gz: e45fa2e5cd31fcc251cadebe1e2a5598fa467ac16f5fd67026a4275a46b7ea63
 SHA512:
-  metadata.gz: 035145aa0ffd50636c6c716049d9bf37e7eab1f130664ecfced34fc61087a099a4c8d6b85d249cfb3a3a0978b7351d9471e6ac7fd16b5863dff20ea11bb0a3f3
-  data.tar.gz: 40c3b2b0232cc1fd02cad10d3d89c6587eadeb679ec7def959bf93e1a2e55eaf0f140fb733a2c2b6a82012de2c64e5fb70cef34029fc598c95c83033e8179de4
+  metadata.gz: 4696e4dcbc58633d5a8de757cfacf0d3bbf1ef6aaa8e4351396d7e44d7355716879b206bfa21009f52becaefa9165ac6d45ff8e4f5e4072a38690fb56be7940d
+  data.tar.gz: 52da1cca331d9097e26e95dd75c2c3eaea5fa4b87c337c55346e4d7cf928663536d832ac61a38db3238ef0e9e27973fb75f3c2e0bee7fd245e9260c39fc4cb4c

data/Gemfile

@@ -2,5 +2,7 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
+gem "rails", "~> 5.2.0.beta1"
+
 # Specify your gem's dependencies in transaction_changes.gemspec
 gemspec

data/Gemfile.lock

@@ -1,22 +1,108 @@
 PATH
   remote: .
   specs:
-    transaction_changes (2.0)
+    transaction_changes (2.0.1)
+      activerecord
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    arel (9.0.0)
+    builder (3.2.3)
+    byebug (10.0.2)
     concurrent-ruby (1.0.5)
+    crass (1.0.4)
     diff-lcs (1.3)
-    i18n (0.9.5)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
     minitest (5.11.3)
+    mysql2 (0.5.1)
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -31,15 +117,29 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.16)
+  byebug
+  mysql2
+  rails (~> 5.2.0.beta1)
   rake (~> 10.0)
   rspec (~> 3.0)
   transaction_changes!

data/lib/transaction_changes/version.rb

@@ -1,3 +1,3 @@
 module TransactionChanges
-  VERSION = "2.0.1"
+  VERSION = "2.1.1"
 end

data/lib/transaction_changes.rb

@@ -1,28 +1,38 @@
 require "transaction_changes/version"
 require 'active_support/concern'
+require "active_support/callbacks"
 
 module TransactionChanges
   extend ActiveSupport::Concern
+  include ActiveSupport::Callbacks
 
   included do
-    after_commit -> { reset_transaction_changes }
     after_save -> { accumulate_changes }
+    set_callback :commit, :before, :setting_variables
+  end
+
+  def setting_variables
+    @new_transaction_changes, @old_transaction_changes = HashWithIndifferentAccess.new, @new_transaction_changes
   end
 
   def transaction_changes
     @old_transaction_changes || HashWithIndifferentAccess.new
   end
 
+  def _run_rollback_callbacks
+    super
+  ensure
+    @old_transaction_changes = HashWithIndifferentAccess.new
+  end
+
   private
+
   def accumulate_changes
     @new_transaction_changes ||= HashWithIndifferentAccess.new
-
-    self.changes.each do |key, value|
+    attribute_changes = ::ActiveRecord.version.to_s.to_f >= 5.1 ? self.saved_changes : self.changes
+    attribute_changes.each do |key, value|
       @new_transaction_changes[key] = value
     end
   end
 
-  def reset_transaction_changes
-    @new_transaction_changes, @old_transaction_changes = HashWithIndifferentAccess.new, @new_transaction_changes
-  end
 end

data/transaction_changes.gemspec

@@ -27,4 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "byebug"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transaction_changes
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Priyanka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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: byebug
+  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: Store attribute changes during ActiveRecord Transaction
 email:
 - priyankatrancedi.iitd@gmail.com
@@ -107,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Store attribute changes during ActiveRecord Transaction