Skip to content

reduce logic checks #16

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.

Sign up for GitHub

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
nestor-custodio wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −22
Open

reduce logic checks #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ced84
mod: simplify `defined?` checks
nestor-custodio Aug 5, 2026
b0dbc13
mod: rename variables to better reflect usage
nestor-custodio Aug 5, 2026
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
41 changes: 19 additions & 22 deletions lib/observer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,10 @@ module Observable
# <tt>*arg</tt> is the value passed to #notify_observers by this
# Observable
def add_observer(observer, func=:update)
@observer_peers = {} unless defined? @observer_peers
unless observer.respond_to? func
raise NoMethodError, "observer does not respond to `#{func}'"
end
@observer_peers[observer] = func
observers[observer] = func
end

#
Expand All @@ -164,25 +163,21 @@ def add_observer(observer, func=:update)
#
# +observer+:: An observer of this Observable
def delete_observer(observer)
@observer_peers.delete observer if defined? @observer_peers
observers.delete observer
end

#
# Remove all observers associated with this object.
#
def delete_observers
@observer_peers.clear if defined? @observer_peers
observers.clear
end

#
# Return the number of observers associated with this object.
#
def count_observers
if defined? @observer_peers
@observer_peers.size
else
0
end
observers.size
end

#
Expand All @@ -192,19 +187,15 @@ def count_observers
# +state+:: Boolean indicating the changed state of this Observable.
#
def changed(state=true)
@observer_state = state
@notification_pending = state
end

#
# Returns true if this object's state has been changed since the last
# #notify_observers call.
#
def changed?
if defined? @observer_state and @observer_state
true
else
false
end
!! @notification_pending
end

#
Expand All @@ -216,14 +207,20 @@ def changed?
#
# <tt>*arg</tt>:: Any arguments to pass to the observers.
def notify_observers(*arg)
if defined? @observer_state and @observer_state
if defined? @observer_peers
@observer_peers.each do |k, v|
k.__send__(v, *arg)
end
end
@observer_state = false
return unless @notification_pending

observers.each do |peer_or_proc, trigger_method|
peer_or_proc.__send__(trigger_method, *arg)
end
@notification_pending = false
end

private

#
# Lazy-initialized @observers getter.
#
def observers
@observers ||= {}
end
end