ruby/trema/timers.rb in trema-0.4.6 vs ruby/trema/timers.rb in trema-0.4.7

- old
+ new

@@ -15,68 +15,68 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # module Timers - def self.included base + def self.included(base) base.send :include, TimerMethods base.send :extend, TimerMethods end module TimerMethods - lambda { + lambda do timer_event_handlers = {} Kernel.send :define_method, :add_timer do | handler, interval, event_type | - timer_event_handlers[ handler ] = { + timer_event_handlers[ handler] = { :interval => interval, :rest => interval, :event_type => event_type } end Kernel.send :define_method, :fire_event do timer_event_handlers.each do | handler, data | - data[ :rest ] -= 1 - if data[ :rest ] <= 0 + data[ :rest] -= 1 + if data[ :rest] <= 0 __send__ handler - data[ :rest ] = data[ :interval ] if data[ :event_type ] == :periodic + data[ :rest] = data[ :interval] if data[ :event_type] == :periodic end end timer_event_handlers.delete_if do | handler, data | - data[ :rest ] <= 0 && data[ :event_type ] == :oneshot + data[ :rest] <= 0 && data[ :event_type] == :oneshot end end Kernel.send :define_method, :delete_timer do | handler | timer_event_handlers.delete end - }.call + end.call - def add_timer_event handler, interval, event_type + def add_timer_event(handler, interval, event_type) add_timer handler, interval, event_type end alias_method :timer_event, :add_timer_event - def delete_timer_event handler + def delete_timer_event(handler) delete_timer handler end # shortcut methods - def add_periodic_timer_event handler, interval + def add_periodic_timer_event(handler, interval) add_timer_event handler, interval, :periodic end alias_method :periodic_timer_event, :add_periodic_timer_event - def add_oneshot_timer_event handler, interval + def add_oneshot_timer_event(handler, interval) add_timer_event handler, interval, :oneshot end alias_method :oneshot_timer_event, :add_oneshot_timer_event