counter_culture 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d533810e55052bcda7977adb7fdff4137d04067a
-  data.tar.gz: 674d61d6f4252bdf24f79d4aaab15be41c2ef258
+  metadata.gz: 9f0d12b75377e5baffc9364982bfd8d08f2f5530
+  data.tar.gz: 21a22f582dd41bc8a6e7d9cc85a70757f5acb982
 SHA512:
-  metadata.gz: 34d9fea6a252d09e834425d7f385d4662335335ac98bf84bd8eb25afd480119ce6017731ba9bf2a716b9d9026e02931531ccb79841595de0e32676640e921d56
-  data.tar.gz: d505de4c567898de988956e15656e214b9733d7d0b910a4de34c7b0cda64acb255d57795bcf824973ea8e918bf1fc15732769fb24b0381259383158531766ffd
+  metadata.gz: d0a5bba782c586130d2436ae029e147d848a3fd740ecf2060e45a43e8df8775401dedd7b1df23643a71420a7c5ecbab63f4a47359c770263cfc5997110d7b608
+  data.tar.gz: f83999e34478258e389cb0d893194b0839104c5f7fd3adcef11b2833bfae1b5de72b087fc0d71e8528aca3479b52b9664cdf43bddf8c12f67e5fcd3125e4851d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.10.1 (April 20, 2018)
+
+Improvements:
+  - Added the ability to update timestamps while fixing count by passing `touch: true` to `counter_culture_fix_counts` (#212)
+
 ## 1.9.2 (April 13, 2018)
 
 Bugfixes:

data/README.md

@@ -272,6 +272,18 @@ Product.counter_culture_fix_counts batch_size: 100
 
 ```counter_culture_fix_counts``` is optimized to minimize the number of queries and runs very quickly.
 
+Similarly to `counter_culture`, it is possible to update the records' timestamps, when fixing counts. If you would like to update the default timestamp field, pass `touch: true` option:
+
+```ruby
+Product.counter_culture_fix_counts touch: true
+```
+
+If you have specified a custom timestamps column, pass its name as the value for the `touch` option:
+
+```ruby
+Product.counter_culture_fix_counts touch: category_count_changed
+```
+
 #### Handling dynamic column names
 
 Manually populating counter caches with dynamic column names requires additional configuration:

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.10.0

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 1.9.2 ruby lib
+# stub: counter_culture 1.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.9.2"
+  s.version = "1.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Magnus von Koeller"]
-  s.date = "2018-04-14"
+  s.date = "2018-04-20"
   s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback."
   s.email = "magnus@vonkoeller.de"
   s.extra_rdoc_files = [

data/lib/counter_culture/extensions.rb

@@ -70,7 +70,7 @@ module CounterCulture
           next if options[:exclude] && options[:exclude].include?(counter.relation)
           next if options[:only] && !options[:only].include?(counter.relation)
 
-          reconciler = CounterCulture::Reconciler.new(counter, options.slice(:skip_unsupported, :batch_size))
+          reconciler = CounterCulture::Reconciler.new(counter, options.slice(:skip_unsupported, :batch_size, :touch))
           reconciler.reconcile!
           reconciler.changes
         end.compact

data/lib/counter_culture/reconciler.rb

@@ -114,8 +114,20 @@ module CounterCulture
 
             track_change(record, column_name, count)
 
-            # use update_all because it's faster and because a fixed counter-cache shouldn't update the timestamp
-            relation_class.where(relation_class.primary_key => record.send(relation_class.primary_key)).update_all(column_name => count)
+            updates = []
+            # this updates the actual counter
+            updates << "#{column_name} = #{count}"
+            # and here we update the timestamp, if so desired
+            if options[:touch]
+              current_time = record.send(:current_time_from_proper_timezone)
+              timestamp_columns = record.send(:timestamp_attributes_for_update_in_model)
+              timestamp_columns << options[:touch] if options[:touch] != true
+              timestamp_columns.each do |timestamp_column|
+                updates << "#{timestamp_column} = '#{current_time.to_formatted_s(:db)}'"
+              end
+            end
+
+            relation_class.where(relation_class.primary_key => record.send(relation_class.primary_key)).update_all(updates.join(', '))
           end
         end
       end

data/spec/counter_culture_spec.rb

@@ -948,6 +948,63 @@ describe "CounterCulture" do
     expect(Review.counter_culture_fix_counts(skip_unsupported: true)).to eq([{ entity: 'User', id: user1.id, what: 'reviews_count', right: 1, wrong: 2 }])
   end
 
+  it 'should update the timestamp when fixing counts with `touch: true`' do
+    product = Product.create
+    review = Review.create product: product
+
+    product.update_column :reviews_count, 2
+
+    product.reload
+
+    old_product_updated_at = product.updated_at
+
+    Timecop.travel(1.second.from_now) do
+      Review.counter_culture_fix_counts(skip_unsupported: true, only: :product, touch: true)
+
+      product.reload
+
+      expect(product.updated_at).to be > old_product_updated_at
+    end
+  end
+
+  it 'should not update the timestamp when fixing counts without `touch: true`' do
+    product = Product.create
+    review = Review.create product: product
+
+    product.update_column :reviews_count, 2
+
+    product.reload
+
+    old_product_updated_at = product.updated_at
+
+    Timecop.travel(2.second.from_now) do
+      Review.counter_culture_fix_counts(skip_unsupported: true, only: :product)
+
+      product.reload
+
+      expect(product.updated_at).to eq old_product_updated_at
+    end
+  end
+
+  it 'should update the timestamp of a custom column when fixing counts with touch: rexiews_updated_at' do
+    product = Product.create
+    review = Review.create product: product
+
+    product.update_column :rexiews_count, 2
+
+    product.reload
+
+    old_rexiews_updated_at = product.rexiews_updated_at
+
+    Timecop.travel(1.second.from_now) do
+      Review.counter_culture_fix_counts(skip_unsupported: true, touch: :rexiews_updated_at)
+
+      product.reload
+
+      expect(product.rexiews_updated_at).to be > old_rexiews_updated_at
+    end
+  end
+
   it "should fix a simple counter cache correctly" do
     user = User.create
     product = Product.create

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action