counter_culture 3.4.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749d2a26a921731dd342cddd6d9e479776b26eb3ccd836fb703e47bca4c05b22
-  data.tar.gz: f59ff08373a8831c2f96605bf75063b5d50d6f1adecfa0486a53d41a3c9a8b9b
+  metadata.gz: 6a69421ca46fbb8c213e7babacde9bb2d9fc365a956929855574f07b2f9d8d77
+  data.tar.gz: 67f26aea01f3b1647da2266c492ca0241fb17615f9a2d6af55e55f8a01b4fe11
 SHA512:
-  metadata.gz: 3a57f1f22ce98c08ccf76552a040445bbcf37f53966bf3abde13f2be2fcb9c4abbf3ea13f8e911ffd536122f161e04cb0a6b62b0a1330435c2568bd8d06c39ac
-  data.tar.gz: f29b2abad46f30de69df23e0e02fa0bcb75447fd2dd854cc42dc979efbe9955316984285ae68bfd3033e4e0d8a2d31bc06699a667b2c375306e654ac2eaff8f7
+  metadata.gz: bd230e2a56efec0b5154a3568f00470829a123f36419e1297cb9f715be91755e30cbcc06bc0296c476d9e11df3b491adeff88b03631348be45b6f71b6f0f9ad9
+  data.tar.gz: b43aec06f3bc6d12f92d02ee7501ad254e5e2138776bc688b24bea2b0dd3fe68aed3dc5018158bc02ba0e1cacfee57b83ac1cf33349c4ef6fd5f664d08855922

data/.circleci/config.yml

@@ -48,8 +48,8 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2"]
-              rails-version: ["5.2", "6.0", "6.1", "7.0"]
+              ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+              rails-version: ["5.2", "6.0", "6.1", "7.0", "7.1"]
               database: ["postgresql", "sqlite3", "mysql2"]
             exclude:
               - ruby-version: "3.0"
@@ -57,28 +57,37 @@ workflows:
                 database: "postgresql"
               - ruby-version: "3.0"
                 rails-version: "5.2"
-                database: "sqlite3"
+                database: "mysql2"
               - ruby-version: "3.0"
                 rails-version: "5.2"
-                database: "mysql2"
+                database: "sqlite3"
               - ruby-version: "3.1"
                 rails-version: "5.2"
                 database: "postgresql"
+              - ruby-version: "3.1"
+                rails-version: "5.2"
+                database: "mysql2"
               - ruby-version: "3.1"
                 rails-version: "5.2"
                 database: "sqlite3"
               - ruby-version: "3.2"
                 rails-version: "5.2"
-                database: "mysql2"
+                database: "postgresql"
               - ruby-version: "3.2"
                 rails-version: "5.2"
-                database: "postgresql"
+                database: "mysql2"
               - ruby-version: "3.2"
                 rails-version: "5.2"
                 database: "sqlite3"
-              - ruby-version: "3.1"
+              - ruby-version: "3.3"
+                rails-version: "5.2"
+                database: "postgresql"
+              - ruby-version: "3.3"
                 rails-version: "5.2"
                 database: "mysql2"
+              - ruby-version: "3.3"
+                rails-version: "5.2"
+                database: "sqlite3"
               - ruby-version: "2.6"
                 rails-version: "7.0"
                 database: "postgresql"
@@ -88,3 +97,12 @@ workflows:
               - ruby-version: "2.6"
                 rails-version: "7.0"
                 database: "mysql2"
+              - ruby-version: "2.6"
+                rails-version: "7.1"
+                database: "postgresql"
+              - ruby-version: "2.6"
+                rails-version: "7.1"
+                database: "sqlite3"
+              - ruby-version: "2.6"
+                rails-version: "7.1"
+                database: "mysql2"

data/Appraisals

@@ -3,6 +3,7 @@
   6.0
   6.1
   7.0
+  7.1
 ].each do |rails_version|
   appraise "rails-#{rails_version}" do
     gem 'rails', "~> #{rails_version}.0"

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.5.1 (January 8, 2024)
+
+Bugfixes:
+  - Fix touching for counted models without `updated_at` (#383)
+
+## 3.5.0 (August 25, 2023)
+
+Improvements:
+  - Allow passing context to `counter_culture_fix_counts` (#375)
+
 ## 3.4.0 (July 12, 2023)
 
 Improvements:

data/README.md

@@ -74,7 +74,7 @@ class Group < ActiveRecord::Base
   has_many :members, through: :group_memberships, class: "User"
 end
 
-class Membership < ActiveRecord::Base
+class GroupMembership < ActiveRecord::Base
   belongs_to :group
   belongs_to :member, class: "User"
   counter_culture :group, column_name: "members_count"
@@ -267,7 +267,7 @@ With this option, any time the `category_counter_cache` changes both the `catego
 
 Some applications run into issues with deadlocks involving counter cache updates when using this gem. See [#263](https://github.com/magnusvk/counter_culture/issues/263#issuecomment-772284439) for information and helpful links on how to avoid this issue.
 
-Another option is to simply defer the update of counter caches to outside of the transaction. This gives up transacrtional guarantees for your counter cache updates but should resolve any deadlocks you experience. This behavior is disabled by default, enable it on each affected counter cache as follows:
+Another option is to simply defer the update of counter caches to outside of the transaction. This gives up transactional guarantees for your counter cache updates but should resolve any deadlocks you experience. This behavior is disabled by default, enable it on each affected counter cache as follows:
 
 ```ruby
   counter_culture :category, execute_after_commit: true
@@ -358,6 +358,8 @@ Product.counter_culture_fix_counts touch: 'category_count_changed'
 
 The options start and finish are especially useful if you want multiple workers dealing with the same processing queue. You can make worker 1 handle all the records between id 1 and 9999 and worker 2 handle from 10000 and beyond by setting the :start and :finish option on each worker.
 
+>  **! NOTE**: the IDs we pass as `start` and `finish` here are in fact `Category` IDs, not `Product`!
+
 ```ruby
 Product.counter_culture_fix_counts start: 10_000
 # will fix counts for all counter caches defined on Product from record 10000 and onwards.
@@ -374,7 +376,7 @@ Product.counter_culture_fix_counts start: 2001, finish: 3000
 
 #### Fix counter cache using a replica database
 
-When fixing counter caches the number of reads usually vastly exceeds the number of writes. It can make sense to offload the road load to a replica database in this case. Rails 6 introduced [native handling of multiple database connections](https://guides.rubyonrails.org/v6.0/active_record_multiple_databases.html). You can use this to send read traffic to a read-only repliace using the option `db_connection_builder`:
+When fixing counter caches the number of reads usually vastly exceeds the number of writes. It can make sense to offload the read load to a replica database in this case. Rails 6 introduced [native handling of multiple database connections](https://guides.rubyonrails.org/v6.0/active_record_multiple_databases.html). You can use this to send read traffic to a read-only replica using the option `db_connection_builder`:
 
 ```ruby
 Product.counter_culture_fix_counts db_connection_builder: proc{|reading, block|
@@ -431,6 +433,23 @@ dynamic, you can pass `skip_unsupported`:
 Product.counter_culture_fix_counts skip_unsupported: true
 ```
 
+You can also use context within the block that was provided with the `column_names` method:
+
+```ruby
+class Product < ActiveRecord::Base
+  belongs_to :category
+  scope :awesomes, -> (ids) { where(ids: ids, product_type: 'awesome') }
+
+  counter_culture :category,
+      column_name: 'awesome_count'
+      column_names: -> (context) {
+        { Product.awesomes(context[:ids]) => :awesome_count }
+      }
+end
+
+Product.counter_culture_fix_counts(context: { ids: [1, 2] })
+```
+
 #### Handling over-written, dynamic foreign keys
 
 Manually populating counter caches with dynamically over-written foreign keys (```:foreign_key_values``` option) is not supported. You will have to write code to handle this case yourself.

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"

data/lib/counter_culture/counter.rb

@@ -81,8 +81,8 @@ module CounterCulture
         end
         # and here we update the timestamp, if so desired
         if touch
-          current_time = obj.send(:current_time_from_proper_timezone)
-          timestamp_columns = obj.send(:timestamp_attributes_for_update_in_model)
+          current_time = klass.send(:current_time_from_proper_timezone)
+          timestamp_columns = klass.send(:timestamp_attributes_for_update_in_model)
           if touch != true
             # starting in Rails 6 this is frozen
             timestamp_columns = timestamp_columns.dup

data/lib/counter_culture/extensions.rb

@@ -84,7 +84,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 column_name db_connection_builder finish skip_unsupported start touch verbose where polymorphic_classes)
+          reconciler_options = %i(context batch_size column_name db_connection_builder finish skip_unsupported start touch verbose where polymorphic_classes)
 
           reconciler = CounterCulture::Reconciler.new(counter, options.slice(*reconciler_options))
           reconciler.reconcile!

data/lib/counter_culture/reconciler.rb

@@ -77,7 +77,11 @@ module CounterCulture
         counter_column_names =
           case column_names
           when Proc
-            column_names.call
+            if column_names.lambda? && column_names.arity == 0
+              column_names.call
+            else
+              column_names.call(options.fetch(:context, {}))
+            end
           when Hash
             column_names
           else

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '3.4.0'.freeze
+  VERSION = '3.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -317,6 +317,7 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
 - lib/counter_culture.rb
 - lib/counter_culture/counter.rb
 - lib/counter_culture/extensions.rb
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.