activerecord-delay_touching 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 731f1b62489c8675bb3df76d2d12ffb90ae5cc58
-  data.tar.gz: ff36c494301d616c19dd8300d05245eae989e553
+SHA256:
+  metadata.gz: 6f6e8902b0825be4680b4fe982948f644dd585fbe075fdfa64e7452afc18274d
+  data.tar.gz: b38c413cd1159118323390208b8ff53a98c01f94c0493b43641b275bc4810fb6
 SHA512:
-  metadata.gz: 5777ddf6f855fafac79a3866fdd7940986aeb2882f5622ca31930bca8beb86d20213fef6db7957f223828e69aa17f558d4e906218d54087007f2c9408fa8307b
-  data.tar.gz: d0733fe1dd22034db87c60a3d46acf5a4034be3c7803c6ee3765a345735ba9c73afa563329158e8b6323837a760a434629900b4b9b50248fa5db9b9eb5509368
+  metadata.gz: c07d67c08967b9ff4738d8d351e91702c12f9c0af79bbe90802abad098efe38c1d58c5d558ecc097ed5aa645f0b000f07ea2aec86360c0ca6bcd6ab65b73e7cd
+  data.tar.gz: 216fd4bb29889f49cb0b964e514751dad55f7d9af0fde877ac46ccebd0f77f6ad7b9aa3336e5830578d7cb0a82be9d655175f4db7588376e2f5ca327c309ec9e

data/activerecord-delay_touching.gemspec

@@ -6,8 +6,8 @@ require 'activerecord/delay_touching/version'
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-delay_touching"
   spec.version       = Activerecord::DelayTouching::VERSION
-  spec.authors       = ["Brian Morearty"]
-  spec.email         = ["brian@morearty.org"]
+  spec.authors       = ["GoDaddy P&C Commerce", "Brian Morearty"]
+  spec.email         = ["nemo-engg@godaddy.com", "brian@morearty.org"]
   spec.summary       = %q{Batch up your ActiveRecord "touch" operations for better performance.}
   spec.description   = %q{Batch up your ActiveRecord "touch" operations for better performance. ActiveRecord::Base.delay_touching do ... end. When "end" is reached, all accumulated "touch" calls will be consolidated into as few database round trips as possible.}
   spec.homepage      = ""
@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "activerecord", ">= 4.2"
+  spec.add_dependency             "activerecord", "~> 4.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "rspec-rails", "~> 2.0"
+  spec.add_development_dependency "rspec-rails", "~> 3.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency "yarjuf"

data/lib/activerecord/delay_touching.rb

@@ -86,7 +86,8 @@ module ActiveRecord
           column = column.to_s
           changes[column] = current_time
           records.each do |record|
-            next if record.destroyed?
+            # Don't bother if destroyed or not-saved
+            next unless record.persisted?
             record.instance_eval do
               write_attribute column, current_time
               @changed_attributes.except!(*changes.keys)

data/lib/activerecord/delay_touching/state.rb

@@ -33,8 +33,13 @@ module ActiveRecord
         @records.map { |attrs, records| [attrs, records.group_by(&:class)] }
       end
 
+      # There are more records as long as there is at least one record that is persisted
       def more_records?
-        @records.present?
+        @records.each do |_, set|
+          set.each { |record| return true if record.persisted? } # will shortcut on first persisted record found
+        end
+
+        false # no persisted records found, so no more records to process
       end
 
       def add_record(record, *columns)
@@ -48,7 +53,6 @@ module ActiveRecord
         @records.clear
         @already_updated_records.clear
       end
-
     end
   end
 end

data/lib/activerecord/delay_touching/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module DelayTouching
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/activerecord/delay_touching_spec.rb

@@ -173,6 +173,30 @@ describe Activerecord::DelayTouching do
 
   end
 
+  context 'persistence fails and rolls back transaction' do
+
+    it 'does not infinitely loop' do
+      updates = 0
+      allow(ActiveRecord::Base.connection).to receive(:update).and_wrap_original do |m, *args|
+        updates = updates + 1
+        raise StandardError, 'Too many updates - likely infinite loop detected' if updates > 1
+
+        m.call(*args)
+      end
+
+      ActiveRecord::Base.delay_touching do
+        ActiveRecord::Base.transaction do
+          # write and touch any new record
+          record = Post.create!
+          record.touch
+          raise ActiveRecord::Rollback
+        end
+      end
+
+    end
+
+  end
+
   def expect_updates(tables)
     expected_sql = tables.map do |entry|
       if entry.kind_of?(Hash)

metadata

@@ -1,27 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-delay_touching
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
+- GoDaddy P&C Commerce
 - Brian Morearty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -86,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +141,7 @@ description: Batch up your ActiveRecord "touch" operations for better performanc
   ActiveRecord::Base.delay_touching do ... end. When "end" is reached, all accumulated
   "touch" calls will be consolidated into as few database round trips as possible.
 email:
+- nemo-engg@godaddy.com
 - brian@morearty.org
 executables: []
 extensions: []
@@ -180,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Batch up your ActiveRecord "touch" operations for better performance.