Skip to content

Do not observe the same model more than once. Fixes #35. #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/rails/observers/active_model/observing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ def observed_class
# Start observing the declared classes and their subclasses.
# Called automatically by the instance method.
def initialize #:nodoc:
observed_classes.each { |klass| add_observer!(klass) }
klasses = observed_classes
klasses = (klasses + klasses.map(&:descendants).flatten).uniq
self.class.observe(klasses)
klasses.each { |klass| add_observer!(klass) }
end

def observed_classes #:nodoc:
Expand Down
5 changes: 0 additions & 5 deletions lib/rails/observers/activerecord/observer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@ class Observer < ActiveModel::Observer

protected

def observed_classes
klasses = super
klasses + klasses.map { |klass| klass.descendants }.flatten
end

def add_observer!(klass)
super
define_callbacks klass
Expand Down
2 changes: 1 addition & 1 deletion rails-observers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|

s.add_dependency 'activemodel', '>= 4.0'

s.add_development_dependency 'minitest', '>= 3'
s.add_development_dependency 'minitest', '>= 3', '< 5'
s.add_development_dependency 'railties', '>= 4.0'
s.add_development_dependency 'activerecord', '>= 4.0'
s.add_development_dependency 'actionmailer', '>= 4.0'
Expand Down
8 changes: 7 additions & 1 deletion test/lifecycle_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_before_destroy
def test_auto_observer
topic_observer = TopicaAuditor.instance
assert_nil TopicaAuditor.observed_class
assert_equal [Topic], TopicaAuditor.observed_classes.to_a
assert_equal [Topic, Reply, AroundTopic], TopicaAuditor.observed_classes.to_a

topic = Topic.find(1)
assert_equal topic.title, topic_observer.topic.title
Expand Down Expand Up @@ -161,9 +161,15 @@ def test_observing_subclasses
developer = SpecialDeveloper.find(1)
assert_equal developer.name, multi_observer.record.name

# SpecialDeveloper was observed when DeveloperObserver initialized
assert_equal [Developer, SpecialDeveloper], DeveloperObserver.observed_classes

klass = Class.new(Developer)
assert_equal klass, multi_observer.last_inherited

# Subclassing Developer adds new subclass to observed_classes
assert_equal [Developer, SpecialDeveloper, klass], DeveloperObserver.observed_classes

developer = klass.find(1)
assert_equal developer.name, multi_observer.record.name
end
Expand Down
18 changes: 9 additions & 9 deletions test/observing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def teardown
test "passes observers to subclasses" do
FooObserver.instance
bar = Class.new(Foo)
assert_equal Foo.observers_count, bar.observers_count
assert_equal [Foo, bar], FooObserver.observed_classes
end
end

Expand All @@ -124,26 +124,26 @@ def teardown
end

test "tracks implicit observable models" do
instance = FooObserver.new
assert_equal [Foo], instance.observed_classes
FooObserver.instance
assert_equal [Foo], FooObserver.observed_classes
end

test "tracks explicit observed model class" do
FooObserver.observe ObservedModel
instance = FooObserver.new
assert_equal [ObservedModel], instance.observed_classes
FooObserver.instance
assert_equal [ObservedModel], FooObserver.observed_classes
end

test "tracks explicit observed model as string" do
FooObserver.observe 'observed_model'
instance = FooObserver.new
assert_equal [ObservedModel], instance.observed_classes
FooObserver.instance
assert_equal [ObservedModel], FooObserver.observed_classes
end

test "tracks explicit observed model as symbol" do
FooObserver.observe :observed_model
instance = FooObserver.new
assert_equal [ObservedModel], instance.observed_classes
FooObserver.instance
assert_equal [ObservedModel], FooObserver.observed_classes
end

test "calls existing observer event" do
Expand Down