aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-14 10:48:53 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-14 10:48:53 +0200
commit27d6ccd8c86cffaa5f74ebfb6861ece429172854 (patch)
treeb7a7217fb0274639465f340e7a408b1e8d2505c6 /activemodel
parent60ac540053d5b5d32d7b349bae03f4d874a9826e (diff)
downloadrails-27d6ccd8c86cffaa5f74ebfb6861ece429172854.tar.gz
rails-27d6ccd8c86cffaa5f74ebfb6861ece429172854.tar.bz2
rails-27d6ccd8c86cffaa5f74ebfb6861ece429172854.zip
Rename Observing#count_observers to Observing#observers_count
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/observing.rb9
-rw-r--r--activemodel/test/cases/observing_test.rb2
2 files changed, 9 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 32f2aa46bd..b905d2b6d2 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -4,6 +4,7 @@ require 'active_support/core_ext/module/aliasing'
require 'active_support/core_ext/module/remove_method'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/enumerable'
+require 'active_support/deprecation'
require 'active_support/descendants_tracker'
module ActiveModel
@@ -74,10 +75,16 @@ module ActiveModel
end
# Total number of observers.
- def count_observers
+ def observers_count
observer_instances.size
end
+ def count_observers
+ msg = "count_observers is deprecated in favor of observers_count"
+ ActiveSupport::Deprecation.warn(msg)
+ observers_count
+ end
+
protected
def instantiate_observer(observer) #:nodoc:
# string/symbol
diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index f6ec24ae57..df070d2d8e 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -73,7 +73,7 @@ class ObservingTest < ActiveModel::TestCase
test "passes observers to subclasses" do
FooObserver.instance
bar = Class.new(Foo)
- assert_equal Foo.count_observers, bar.count_observers
+ assert_equal Foo.observers_count, bar.observers_count
end
end