@@ -4,6 +4,7 @@ == ruote - 0.9.21 not yet released +- bug #25953 : conflict with Rails #observers method. Fixed. - todo #25799 : implemented engine.reapply(exp) - bug #25832 : scheduled launch broken. Fixed. - todo #25851 : added fdate to ProcessError (date in float) CHANGELOG.txt @@ -65,55 +65,55 @@ module OpenWFE protected - # - # Observable classes do call this method to notify their - # observers. - # - # Returns true if there was an observer registered. - # - def onotify (channel, *args) - - do_notify(:all, channel, *args) - do_notify(channel, channel, *args) - end + # + # Observable classes do call this method to notify their + # observers. + # + # Returns true if there was an observer registered. + # + def onotify (channel, *args) + + do_notify(:all, channel, *args) + do_notify(channel, channel, *args) + end private - def do_remove_observer (observer, channel) + def do_remove_observer (observer, channel) - observers = @observers[channel] - observers.delete(observer) if observers - end - - def do_notify (target_channel, channel, *args) + observers = @observers[channel] + observers.delete(observer) if observers + end - #ldebug { "do_notify() @observers.size is #{@observers.size}" } + def do_notify (target_channel, channel, *args) - observers = if target_channel.is_a?(String) + #ldebug { "do_notify() @observers.size is #{@observers.size}" } - @observers.inject([]) do |r, (c, o)| + observers = if target_channel.is_a?(String) - if c.is_a?(String) - r += o if target_channel.match(c) - elsif c.is_a?(Regexp) - r += o if c.match(target_channel) - end + @observers.inject([]) do |r, (c, o)| - r + if c.is_a?(String) + r += o if target_channel.match(c) + elsif c.is_a?(Regexp) + r += o if c.match(target_channel) end - else - @observers[target_channel] + r end + else + + @observers[target_channel] + end - return false unless observers + return false unless observers - observers.each { |obs| obs.call(channel, *args) } + observers.each { |obs| obs.call(channel, *args) } - (observers.size > 0) - # - # returns true if at least one observer was called - end + (observers.size > 0) + # + # returns true if at least one observer was called + end end end lib/openwfe/util/observable.rb 7bbdcd307a96692b71c814d10b179e035112f4fb John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote/commit/6e9e64f3d54520ada6a4f49d003fe426e6511cf8 6e9e64f3d54520ada6a4f49d003fe426e6511cf8 2009-05-18T20:28:40-07:00 2009-05-18T20:28:40-07:00 bug #25953 : conflict with Rails #observers method. Fixed. 0cc5c0987a19be97651e6de2ba0a3e77de860f2d John Mettraux jmettraux@gmail.com