events 0.9.4 → 0.9.5

data/lib/events.rb

@@ -31,8 +31,16 @@ module Events # :nodoc:
   module Emitter
     DEFAULT_MAX_LISTENERS = 10
     
+    class Listeners < Array
+      attr_accessor :warned
+    end
+    
+    class OnceWrapper < Proc
+      attr_accessor :original
+    end
+    
     def max_listeners
-      @max_listeners || DEFAULT_MAX_LISTENERS
+      (defined?(@max_listeners) ? @max_listeners : DEFAULT_MAX_LISTENERS) || 0
     end
     private :max_listeners
     
@@ -54,7 +62,7 @@ module Events # :nodoc:
     # manipulated, e.g. to remove listeners.
     # 
     def listeners(event)
-      (@listeners ||= Hash.new {|hash, key| hash[key] = []})[event]
+      (@listeners ||= Hash.new {|hash, key| hash[key] = Listeners.new})[event]
     end
     
     # :call-seq: emitter.emit(event[, arguments...]) -> bool
@@ -97,15 +105,12 @@ module Events # :nodoc:
       event_listeners = listeners(event)
       
       current = event_listeners.length
-      if max_listeners && max_listeners > 0 && current > max_listeners &&
-        (!event_listeners.respond_to?(:warned?) || !event_listeners.warned?)
+      if max_listeners > 0 && current > max_listeners && !event_listeners.warned
         warn(caller[1] +
           ": warning: possible EventEmitter memory leak detected. " <<
           "#{current} listeners added. " <<
           "Use Emitter#max_listeners = n to increase limit.")
-        def event_listeners.warned?
-          true
-        end
+        event_listeners.warned = true
       end
       
       event_listeners.push(listener)
@@ -123,10 +128,16 @@ module Events # :nodoc:
     #   end
     # 
     def once(event, proc=nil, &block)
-      once = Proc.new do |*args|
+      listener = proc || block
+      unless listener.respond_to?(:call)
+        raise ArgumentError.new("Listener must respond to #call")
+      end
+      once = OnceWrapper.new do |*args|
         remove_listener(event, once)
-        (proc || block).call(args)
+        listener.call(args)
       end
+      once.original = listener
+      
       add_listener(event, once)
     end
     
@@ -136,7 +147,9 @@ module Events # :nodoc:
     # 
     def remove_listener(event, proc)
       if @listeners && @listeners.key?(event)
-        @listeners[event].delete(proc)
+        @listeners[event].delete_if do |lis|
+          lis == proc || lis.respond_to?(:original) && lis.original == proc
+        end
         @listeners.delete(event) if @listeners[event].empty?
       end
       self

data/test/event_emitter_test.rb

@@ -27,6 +27,11 @@ class TestEventEmitter < Test::Unit::TestCase
     
     e.emit(:hello, "a", "b")
     
+    
+    # just make sure that this doesn't raise:
+    f = Events::EventEmitter.new
+    assert_nothing_raised {f.max_listeners = 0}
+    
     assert_equal([:hello], events_new_listener_emited)
     assert_equal(1, times_hello_emited)
   end
@@ -137,6 +142,14 @@ class TestEventEmitter < Test::Unit::TestCase
     e.emit(:hello, "a", "b")
     e.emit(:hello, "a", "b")
     
+    remove = Proc.new do
+      flunk("once->foo should not be emitted")
+    end
+    
+    e.once(:foo, remove)
+    e.remove_listener(:foo, remove)
+    e.emit(:foo)
+    
     assert_equal(1, times_hello_emited)
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: events
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matthew Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +00:00
+date: 2011-04-11 00:00:00 +01:00
 default_executable: 
 dependencies: []