custom_counter_cache 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccba1337c291259711f6a18d6604a72c9be6a8a858342b345dab51f434d05816
-  data.tar.gz: 97d0e479eb6900a090449243a326a5a3572597219bb119af248dade70adc188b
+  metadata.gz: e36d2910a85a7b6354c086adad83820f1503947aba48f3caeb3c09b424b565d5
+  data.tar.gz: 6e8892f7c9a9d447117ff9ae0c7c23f16afc00739e93e4b1fd407631989fa0eb
 SHA512:
-  metadata.gz: 6d342ee7e3857b846c66f3183ce2010c0f5c9fc9719060c3d542669fd66ca0266dd2caa77b972013ed01b516bf48799b62ffe32188124900ce8ae74bdb0ef2e9
-  data.tar.gz: c5b2d8ee7b87e16b04cd62c85d358787126112c8781775a9648aec8f31f5d7f808c363a282a27d6713ec4f6bd452f9a4c4f69998980df95befe84f745d1c3c34
+  metadata.gz: 7986c0f65fd6c43a38a71f4acfd6d62a7bd36e9aeeb03dbe613dff4553d1c0119cd88b48a1c6d19adffd06e4cfd214462202fc8aafe84e8e05d2034288219750
+  data.tar.gz: f52a1259232d2ae16a2117ea42f0950a41f81379892387c7f4191ec595918750b87b4f9b482223faaac03d19c50f459cd4af610523c89428bd38635c25ac0f41

data/lib/custom_counter_cache/model.rb

@@ -15,11 +15,11 @@ module CustomCounterCache::Model
           if counters.loaded? && counter = counters.detect{|c| c.key == cache_column.to_s }
             counter.value
           else
-            counters.find_by_key(cache_column.to_s).try(:value).to_i
+            counters.find_by(key: cache_column.to_s).try(:value).to_i
           end
         end
         define_method "#{cache_column}=" do |count|
-          if ( counter = counters.find_by_key(cache_column.to_s) )
+          if ( counter = counters.find_by(key: cache_column.to_s) )
             counter.update_attribute :value, count.to_i
           else
             counters.create key: cache_column.to_s, value: count.to_i
@@ -53,11 +53,9 @@ module CustomCounterCache::Model
       # define callback
       define_method method_name do
         # update old association
-        rails_5_1_or_newer = ActiveModel.version >= Gem::Version.new('5.1.0')
         target_key = reflection.options[:polymorphic] ? "#{association}_type" : foreign_key
-        target_changed = rails_5_1_or_newer ? send("saved_change_to_#{target_key}?") : send("#{target_key}_changed?")
-        if target_changed
-          old_id = rails_5_1_or_newer ? send("#{target_key}_before_last_save") : send("#{target_key}_was")
+        if send("saved_change_to_#{target_key}?")
+          old_id = send("#{target_key}_before_last_save")
           klass = if reflection.options[:polymorphic]
             ( old_id || send("#{association}_type") ).constantize
           else
@@ -79,9 +77,10 @@ module CustomCounterCache::Model
       }
 
       # set callbacks
-      after_create  method_name, options unless skip_callback.call(:create, options)
-      after_update  method_name, options unless skip_callback.call(:update, options)
-      after_destroy method_name, options unless skip_callback.call(:destroy, options)
+      callback_opts = options.slice(:if, :unless, :prepend)
+      after_create  method_name, **callback_opts unless skip_callback.call(:create, options)
+      after_update  method_name, **callback_opts unless skip_callback.call(:update, options)
+      after_destroy method_name, **callback_opts unless skip_callback.call(:destroy, options)
 
     rescue StandardError => e
       # Support Heroku's database-less assets:precompile pre-deploy step:

data/lib/custom_counter_cache/version.rb

@@ -1,5 +1,5 @@
 module CustomCounterCache
 
-  VERSION = '0.2.8'
+  VERSION = '0.3.0'
 
 end

data/test/counter_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class CounterTest < MiniTest::Unit::TestCase
+class CounterTest < Minitest::Test
 
   def setup
     @user = User.create
@@ -36,7 +36,7 @@ class CounterTest < MiniTest::Unit::TestCase
     assert_equal 1, @user.published_count
     3.times { |i| @user.articles.create(state: 'published') }
     assert_equal 4, @user.published_count
-    @user.articles.each {|a| a.update_attributes(state: 'unpublished') }
+    @user.articles.each {|a| a.update(state: 'unpublished') }
     assert_equal 0, @user.published_count
   end
 
@@ -48,7 +48,7 @@ class CounterTest < MiniTest::Unit::TestCase
     assert_equal 1, @article.comments_count
     3.times { |i| @article.comments.create(state: "published") }
     assert_equal 4, @article.comments_count
-    @article.comments.each { |c| c.update_attributes(state: "unpublished") }
+    @article.comments.each { |c| c.update(state: 'unpublished') }
     assert_equal 0, @article.comments_count
   end
 
@@ -59,7 +59,7 @@ class CounterTest < MiniTest::Unit::TestCase
     assert_equal 1, @box.reload.green_balls_count
     3.times { |i| @box.balls.create(color: 'green') }
     assert_equal 4, @box.reload.green_balls_count
-    @box.balls.each {|b| b.update_attributes(color: 'red') }
+    @box.balls.each {|b| b.update(color: 'red') }
     assert_equal 0, @box.reload.green_balls_count
   end
 
@@ -95,4 +95,16 @@ class CounterTest < MiniTest::Unit::TestCase
     assert_equal 1, @box.reload.destroyed_balls_count
   end
 
+  def test_reassigning_article_to_different_user_updates_both_counters
+    @user2 = User.create
+    @article = @user.articles.create(state: 'unpublished')
+    assert_equal 0, @user.reload.published_count
+    assert_equal 0, @user2.reload.published_count
+    # Changing both user and state triggers the :if condition (state changed)
+    # and the reassignment logic inside the callback updates the old user's counter too
+    @article.update(user: @user2, state: 'published')
+    assert_equal 0, @user.reload.published_count
+    assert_equal 1, @user2.reload.published_count
+  end
+
 end

data/test/test_helper.rb

@@ -44,15 +44,6 @@ end
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
   include CustomCounterCache::Model
-  @@rails_5_1_or_newer = ActiveModel.version >= Gem::Version.new('5.1.0')
-
-  def saved_change_to_attribute_compat?(attr)
-    if @@rails_5_1_or_newer
-      saved_change_to_attribute?(attr)
-    else
-      attribute_changed?(attr)
-    end
-  end
 end
 
 class User < ApplicationRecord
@@ -64,7 +55,7 @@ end
 
 class Article < ApplicationRecord
   belongs_to :user
-  update_counter_cache :user, :published_count, if: Proc.new { |article| article.saved_change_to_attribute_compat?(:state) }
+  update_counter_cache :user, :published_count, if: Proc.new { |article| article.saved_change_to_attribute?(:state) }
   has_many :comments, as: :commentable, dependent: :destroy
   define_counter_cache :comments_count do |article|
     article.comments.where(state: "published").count
@@ -73,7 +64,7 @@ end
 
 class Comment < ApplicationRecord
   belongs_to :commentable, polymorphic: true
-  update_counter_cache :commentable, :comments_count, if: Proc.new { |comment| comment.saved_change_to_attribute_compat?(:state) }
+  update_counter_cache :commentable, :comments_count, if: Proc.new { |comment| comment.saved_change_to_attribute?(:state) }
 end
 
 class Counter < ApplicationRecord
@@ -96,7 +87,7 @@ end
 class Ball < ApplicationRecord
   belongs_to :box
   scope :green, lambda { where(color: 'green') }
-  update_counter_cache :box, :green_balls_count, if: Proc.new { |ball| ball.saved_change_to_attribute_compat?(:color) }
+  update_counter_cache :box, :green_balls_count, if: Proc.new { |ball| ball.saved_change_to_attribute?(:color) }
   update_counter_cache :box, :lifetime_balls_count, except: [:update, :destroy]
   update_counter_cache :box, :destroyed_balls_count, only: [:destroy]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_counter_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Cedric Howe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '2.0'
 description: ''
 email: cedric@howe.net
 executables: []
@@ -59,7 +59,7 @@ homepage: http://github.com/cedric/custom_counter_cache/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,18 +67,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Custom counter_cache functionality that supports conditions and multiple
   models.
 test_files:
-- test/test_helper.rb
 - test/counter_test.rb
+- test/test_helper.rb