counter_culture 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5495ff50331ad38e5543733232a54d77605f5b68
-  data.tar.gz: 87bbafc46cee9282a6e809f9aa912357db60722d
+  metadata.gz: b21a580a6873b3d63ccddaf37e9ab42da83665d8
+  data.tar.gz: eb40b01c09c04572acae15638170a54a18ceea70
 SHA512:
-  metadata.gz: 5f776a977831ea9aae705529c3010ee60d4e253b63d77c8aa808c6d907207c60ab30e386d62ed1778b9b8e05ecd8015f2cd3a55a2820ddcfe6833c913c740e4b
-  data.tar.gz: b5a9c5f30dff001b9fb50d0d723a14a77395243a7b628d76be3187cf4657ddc192f47bb55a13b735439a5a9b9c57fec0114b9ffd8a276796be4b502b9687ee4a
+  metadata.gz: 1415bf5f64587fd1fb7b6c0ab3903b4a6f0da32f7d9570c3b35d11cd4b33c0b8059fb91cd80547c270362872028fdf720b8c87d402928e77e2179059e18916cc
+  data.tar.gz: 0b729a1911b0a38d9acc9ad9f02f22895b1e92a7b1af39f1dd3010c5ec5705ae7eea248b7c07ab236eca255ef277626caaecdb48b5d85deec33e753c82d6cd60

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 1.8.1 (September 5, 2018)
+## 1.8.2 (September 27, 2017)
+
+Bugfixes:
+  - Actually use `batch_size` parameter in `counter_culture_fix_counts` (#200)
+
+## 1.8.1 (September 5, 2017)
 
 Improvements:
   - Use ActiveRecord version, not Rails version, in `Reconciler`, makeing it possible to use `counter_culture_fix_counts` without Rails

data/README.md

@@ -14,7 +14,7 @@ Tested against Ruby 2.2.5 and 2.3.1 and against the latest patch releases of Rai
 Add counter_culture to your Gemfile:
 
 ```ruby
-gem 'counter_culture', '~> 1.0'
+gem 'counter_culture', '~> 1.8'
 ```
 
 Then run `bundle install`
@@ -234,13 +234,13 @@ You will sometimes want to populate counter-cache values from primary data. This
 Product.counter_culture_fix_counts
 # will automatically fix counts for all counter caches defined on Product
 
-Product.counter_culture_fix_counts except: :category
+Product.counter_culture_fix_counts exclude: :category
 # will automatically fix counts for all counter caches defined on Product, except for the :category relation
 
 Product.counter_culture_fix_counts only: :category
 # will automatically fix counts only on the :category relation on Product
 
-# :except and :only also accept arrays of one level relations
+# :exclude and :only also accept arrays of one level relations
 # if you want to fix counts on a more than one level relation you need to use convention below:
 
 Product.counter_culture_fix_counts only: [[:subcategory, :category]]

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

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.8.1 ruby lib
+# stub: counter_culture 1.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   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 = "2017-09-05"
+  s.date = "2017-09-27"
   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

@@ -63,7 +63,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))
+          reconciler = CounterCulture::Reconciler.new(counter, options.slice(:skip_unsupported, :batch_size))
           reconciler.reconcile!
           reconciler.changes
         end.compact

data/lib/counter_culture/reconciler.rb

@@ -99,23 +99,27 @@ module CounterCulture
 
           counts_query.group(full_primary_key(relation_class)).find_in_batches(batch_size: batch_size) do |records|
             # now iterate over all the models and see whether their counts are right
-            ActiveRecord::Base.transaction do
-              records.each do |record|
-                count = record.read_attribute('count') || 0
-                next if record.read_attribute(column_name) == count
-
-                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)
-              end
-            end
+            update_count_for_batch(column_name, records)
           end
         end
       end
 
       private
 
+      def update_count_for_batch(column_name, records)
+        ActiveRecord::Base.transaction do
+          records.each do |record|
+            count = record.read_attribute('count') || 0
+            next if record.read_attribute(column_name) == count
+
+            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)
+          end
+        end
+      end
+
       # keep track of what we fixed, e.g. for a notification email
       def track_change(record, column_name, count)
         @changes_holder << {

data/spec/counter_culture_spec.rb

@@ -34,7 +34,6 @@ describe "CounterCulture" do
     DatabaseCleaner.clean
   end
 
-
   it "should use relation foreign_key correctly" do
     post = AnotherPost.new
     comment = post.comments.build
@@ -1276,6 +1275,21 @@ describe "CounterCulture" do
   A_FEW = CI_TEST_RUN ? 50:  10
   A_BATCH = CI_TEST_RUN ? 100: 10
 
+  it "should support batch processing" do
+    # first, clean up
+    SimpleDependent.delete_all
+    SimpleMain.delete_all
+
+    expect_any_instance_of(CounterCulture::Reconciler::Reconciliation).to receive(:update_count_for_batch).exactly(MANY/A_BATCH).times
+
+    MANY.times do |i|
+      main = SimpleMain.create
+      3.times { main.simple_dependents.create }
+    end
+
+    SimpleDependent.counter_culture_fix_counts :batch_size => A_BATCH
+  end
+
   it "should correctly fix the counter caches with thousands of records" do
     # first, clean up
     SimpleDependent.delete_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action