From fec7bfe8d13b7f5a076011364cf68e6ae56f03ff Mon Sep 17 00:00:00 2001
From: Jason Normore <jnormore@gmail.com>
Date: Wed, 19 Mar 2014 12:24:46 -0400
Subject: Updates reset_counters to allow counter name in params

Add support for counter name to be passed as parameter
on `CounterCache::ClassMethods#reset_counters`. This is
to be consistent with the other methods in the module
that all accept counter name.
---
 activerecord/CHANGELOG.md                       |  4 ++++
 activerecord/lib/active_record/counter_cache.rb | 15 ++++++++++-----
 activerecord/test/cases/counter_cache_test.rb   | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 48e2862671..6cfd053eab 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add support for counter name to be passed as parameter on `CounterCache::ClassMethods#reset_counters`.
+
+    *jnormore*
+
 *   Restrict deletion of record when using `delete_all` with `uniq`, `group`, `having`
     or `offset`.
 
diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb
index b7b790322a..71e176a328 100644
--- a/activerecord/lib/active_record/counter_cache.rb
+++ b/activerecord/lib/active_record/counter_cache.rb
@@ -11,7 +11,7 @@ module ActiveRecord
       # ==== Parameters
       #
       # * +id+ - The id of the object you wish to reset a counter on.
-      # * +counters+ - One or more association counters to reset
+      # * +counters+ - One or more association counters to reset. Association name or counter name can be given.
       #
       # ==== Examples
       #
@@ -19,9 +19,14 @@ module ActiveRecord
       #   Post.reset_counters(1, :comments)
       def reset_counters(id, *counters)
         object = find(id)
-        counters.each do |association|
-          has_many_association = reflect_on_association(association.to_sym)
-          raise ArgumentError, "'#{self.name}' has no association called '#{association}'" unless has_many_association
+        counters.each do |counter_association|
+          has_many_association = reflect_on_association(counter_association.to_sym)
+          unless has_many_association
+            has_many = reflect_on_all_associations(:has_many)
+            has_many_association = has_many.find { |association| association.counter_cache_column && association.counter_cache_column.to_sym == counter_association.to_sym }
+            counter_association = has_many_association.plural_name if has_many_association
+          end
+          raise ArgumentError, "'#{self.name}' has no association called '#{counter_association}'" unless has_many_association
 
           if has_many_association.is_a? ActiveRecord::Reflection::ThroughReflection
             has_many_association = has_many_association.through_reflection
@@ -34,7 +39,7 @@ module ActiveRecord
           counter_name = reflection.counter_cache_column
 
           stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({
-            arel_table[counter_name] => object.send(association).count
+            arel_table[counter_name] => object.send(counter_association).count
           }, primary_key)
           connection.update stmt
         end
diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index ee3d8a81c2..ab2a749ba8 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -51,6 +51,16 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
+  test "reset counters by counter name" do
+    # throw the count off by 1
+    Topic.increment_counter(:replies_count, @topic.id)
+
+    # check that it gets reset
+    assert_difference '@topic.reload.replies_count', -1 do
+      Topic.reset_counters(@topic.id, :replies_count)
+    end
+  end
+
   test 'reset multiple counters' do
     Topic.update_counters @topic.id, replies_count: 1, unique_replies_count: 1
     assert_difference ['@topic.reload.replies_count', '@topic.reload.unique_replies_count'], -1 do
@@ -154,10 +164,10 @@ class CounterCacheTest < ActiveRecord::TestCase
     end
   end
 
-  test "the passed symbol needs to be an association name" do
+  test "the passed symbol needs to be an association name or counter name" do
     e = assert_raises(ArgumentError) do
-      Topic.reset_counters(@topic.id, :replies_count)
+      Topic.reset_counters(@topic.id, :undefined_count)
     end
-    assert_equal "'Topic' has no association called 'replies_count'", e.message
+    assert_equal "'Topic' has no association called 'undefined_count'", e.message
   end
 end
-- 
cgit v1.2.3