counter_culture 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23a499dee5870dc087f2e8ce149275601321728359755ece6f4143c1859e464
-  data.tar.gz: e4a114da0ca6ab7e8439e8f497c5924ca5c728699f6a939aaf53cd0bb82e4b22
+  metadata.gz: 74fff95505913ba522b3ec93bc9101c375c7de5678744145a0e4959f2c267361
+  data.tar.gz: bc284f87da6f949e7d875b7f30c43accbe23ce5716601af9fc4143eb6346954d
 SHA512:
-  metadata.gz: 16d8b66aec6b846328a99596736f4faf8aca1b84b07cd3f5257ec476b4edecae0f4360ab073199c90850bd93c0d8b7705a2723f9644a1df33dafdccc759273f2
-  data.tar.gz: 871f23c424dcecf010f65f9cb948090246814bf5c691a2da3c03d750b320c655d0930107748a937a1926784c9ec1f2953e683a674288460d7e01952277f8dbcd
+  metadata.gz: e63708745c4ffbb727a1b4da61a0d027de76d7256ee5d9669fa0f18dfcc2b183f26ddc109f45d6af6fb68a79c040e73872f647e8453c7b801e390036601878eb
+  data.tar.gz: c58c36d4aaf450450d913ad93487c7012de5de0ba8bb4f99c83a3994b64e8aed19f04a0d62c0df21ceda862312b9c010af042857709d891f746e20403ef893f2

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 2.7.0 (November 16, 2020)
+
+Improvements:
+  - New `column_name` option for `counter_culture_fix_counts` (#300)
+
+## 2.6.2 (October 21, 2020)
+
+Improvements:
+  - Remove superfluous dependency to after_commit_action gem (#297)
+
+## 2.6.1 (September 8, 2020)
+
+Bugfixes:
+  - Address Ruby 2.7.0 deprecation warning (#292)
+
+## 2.6.0 (July 29, 2020)
+
+Improvements:
+  - Use []= method instead of attribute writer method internally to avoid conflicts with read-only attributes (#287)
+  - More detailed logging when performing reconciliation (#288)
+
+## 2.5.1 (May 18, 2020)
+
+Bugfixes:
+  - Fix migration generation in Rails 6+ (#281)
+
 ## 2.5.0 (May 12, 2020)
 
 Bugfixes:

data/README.md

@@ -187,6 +187,8 @@ end
 
 Now, the ```Category``` model will keep the counter cache in ```special_count``` up-to-date. Only products where ```special?``` returns true will affect the special_count.
 
+If you would like to use this with `counter_culture_fix_counts`, make sure to also provide [the `column_names` configuration](#handling-dynamic-column-names).
+
 ### Totaling instead of counting
 
 Instead of keeping a running count, you may want to automatically track a running total.
@@ -268,6 +270,10 @@ Product.counter_culture_fix_counts only: :category
 Product.counter_culture_fix_counts only: [[:subcategory, :category]]
 # will automatically fix counts only on the two-level [:subcategory, :category] relation on Product
 
+Product.counter_culture_fix_counts column_name: :reviews_count
+# will automatically fix counts only on the :reviews_count column on Product
+# This allows us to skip the columns that have already been processed. This is useful after running big DB changes that affect only one counter cache column.
+
 # :except and :only also accept arrays
 
 Product.counter_culture_fix_counts verbose: true

data/counter_culture.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Turbo-charged counter caches for your Rails app.'
   spec.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.'
-  spec.homepage      = 'http://github.com/magnusvk/counter_culture'
+  spec.homepage      = 'https://github.com/magnusvk/counter_culture'
   spec.license       = 'MIT'
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'after_commit_action', '~> 1.0'
   spec.add_dependency 'activerecord', '>= 4.2'
   spec.add_dependency 'activesupport', '>= 4.2'
 

data/lib/counter_culture.rb

@@ -1,4 +1,3 @@
-require 'after_commit_action'
 require 'active_support/concern'
 require 'active_support/lazy_load_hooks'
 

data/lib/counter_culture/counter.rb

@@ -290,7 +290,7 @@ module CounterCulture
       changes_method = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? :saved_changes : :changed_attributes
       obj.public_send(changes_method).each do |key, value|
         old_value = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? value.first : value
-        prev.public_send("#{key}=", old_value)
+        prev[key] = old_value
       end
 
       prev

data/lib/counter_culture/extensions.rb

@@ -15,8 +15,6 @@ module CounterCulture
       # called to configure counter caches
       def counter_culture(relation, options = {})
         unless @after_commit_counter_cache
-          include AfterCommitAction unless include?(AfterCommitAction)
-
           # initialize callbacks only once
           after_create :_update_counts_after_create
 
@@ -61,7 +59,8 @@ module CounterCulture
       #
       # options:
       #   { :exclude => list of relations to skip when fixing counts,
-      #     :only => only these relations will have their counts fixed }
+      #     :only => only these relations will have their counts fixed,
+      #     :column_name => only this column will have its count fixed }
       # returns: a list of fixed record as an array of hashes of the form:
       #   { :entity => which model the count was fixed on,
       #     :id => the id of the model that had the incorrect count,
@@ -81,7 +80,7 @@ module CounterCulture
           next if options[:exclude] && options[:exclude].include?(counter.relation)
           next if options[:only] && !options[:only].include?(counter.relation)
 
-          reconciler_options = %i(batch_size finish skip_unsupported start touch verbose where)
+          reconciler_options = %i(batch_size column_name finish skip_unsupported start touch verbose where)
 
           reconciler = CounterCulture::Reconciler.new(counter, options.slice(*reconciler_options))
           reconciler.reconcile!

data/lib/counter_culture/reconciler.rb

@@ -76,6 +76,10 @@ module CounterCulture
 
         counter_column_names = column_names || {nil => counter_cache_name}
 
+        if options[:column_name]
+          counter_column_names = counter_column_names.select{ |_, v| options[:column_name].to_s == v }
+        end
+
         # iterate over all the possible counter cache column names
         counter_column_names.each do |where, column_name|
           # if the column name is nil, that means those records don't affect
@@ -102,8 +106,6 @@ module CounterCulture
           # iterate in batches; otherwise we might run out of memory when there's a lot of
           # instances and we try to load all their counts at once
           batch_size = options.fetch(:batch_size, CounterCulture.config.batch_size)
-          start_index = options[:start]
-          finish_index = options[:finish]
 
           counts_query = counts_query.where(options[:where]).group(full_primary_key(relation_class))
 
@@ -111,9 +113,11 @@ module CounterCulture
           find_in_batches_args[:start] = options[:start] if options[:start].present?
           find_in_batches_args[:finish] = options[:finish] if options[:finish].present?
 
-          counts_query.find_in_batches(find_in_batches_args) do |records|
+          counts_query.find_in_batches(**find_in_batches_args).with_index(1) do |records, index|
+            log "Processing batch ##{index}."
             # now iterate over all the models and see whether their counts are right
             update_count_for_batch(column_name, records)
+            log "Finished batch ##{index}."
           end
         end
         log_without_newline "\n"
@@ -123,8 +127,6 @@ module CounterCulture
       private
 
       def update_count_for_batch(column_name, records)
-        log_without_newline "."
-
         ActiveRecord::Base.transaction do
           records.each do |record|
             count = record.read_attribute('count') || 0

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.7.0'.freeze
 end

data/lib/generators/counter_culture_generator.rb

@@ -27,7 +27,7 @@ class CounterCultureGenerator < ActiveRecord::Generators::Base
   end
 
   def migration_version
-    if Rails.version.start_with? '5.'
+    if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
       "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
     end
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Magnus von Koeller
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: after_commit_action
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -285,11 +271,11 @@ files:
 - lib/generators/counter_culture_generator.rb
 - lib/generators/templates/counter_culture_migration.rb.erb
 - run_tests_locally.sh
-homepage: http://github.com/magnusvk/counter_culture
+homepage: https://github.com/magnusvk/counter_culture
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,9 +290,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.
 test_files: []