events 0.9.5 → 0.9.6

data/lib/events.rb

@@ -103,6 +103,7 @@ module Events # :nodoc:
       emit(:new_listener, event, listener)
       
       event_listeners = listeners(event)
+      event_listeners.push(listener)
       
       current = event_listeners.length
       if max_listeners > 0 && current > max_listeners && !event_listeners.warned
@@ -113,7 +114,6 @@ module Events # :nodoc:
         event_listeners.warned = true
       end
       
-      event_listeners.push(listener)
       self
     end
     alias on add_listener
@@ -155,11 +155,13 @@ module Events # :nodoc:
       self
     end
     
-    # :call-seq: emitter.remove_all_listeners(event) -> emitter
+    # :call-seq: emitter.remove_all_listeners -> emitter
+    # emitter.remove_all_listeners(event) -> emitter
     # 
-    # Removes all listeners from the listener array for the specified event.
+    # Removes all listeners, or those of the specified event.
     # 
-    def remove_all_listeners(event)
+    def remove_all_listeners(event=:_remove_all_listeners_default_arg_)
+      @listeners = nil if event == :_remove_all_listeners_default_arg_
       if @listeners && @listeners.key?(event)
         @listeners[event].clear
         @listeners.delete(event)

data/test/event_emitter_test.rb

@@ -1,7 +1,8 @@
 require "test/unit"
 require "../lib/events"
 
-# Tests transliterated from javascript originals at http://github.com/ry/node/
+# Tests transliterated from javascript originals at
+# http://github.com/joyent/node/
 class TestEventEmitter < Test::Unit::TestCase
   
   # /test/simple/test-event-emitter-add-listeners.js
@@ -36,6 +37,35 @@ class TestEventEmitter < Test::Unit::TestCase
     assert_equal(1, times_hello_emited)
   end
   
+  # /test/simple/test-event-emitter-check-listener-leaks.js
+  def test_event_emitter_check_listener_leaks
+    e = Events::EventEmitter.new
+    
+    # default
+    10.times do
+      e.on(:default) {}
+    end
+    assert(!e.listeners(:default).warned)
+    e.on(:default) {}
+    assert(e.listeners(:default).warned)
+    
+    # specific
+    e.max_listeners = 5
+    5.times do
+      e.on(:specific) {}
+    end
+    assert(!e.listeners(:specific).warned)
+    e.on(:specific) {}
+    assert(e.listeners(:specific).warned)
+    
+    # unlimited
+    e.max_listeners = 0
+    1000.times do
+      e.on(:unlimited) {}
+    end
+    assert(!e.listeners(:unlimited).warned)
+  end
+  
   # /test/simple/test-event-emitter-modify-in-emit.js
   def test_event_emitter_modify_in_emit
     callbacks_called = []
@@ -92,6 +122,25 @@ class TestEventEmitter < Test::Unit::TestCase
     assert_equal(0, e.listeners(:foo).length)
   end
   
+  # /test/simple/test-event-emitter-remove-all-listeners.js
+  def test_event_emitter_remove_all_listeners
+    listener = Proc.new {}
+    
+    e1 = Events::EventEmitter.new
+    e1.add_listener(:foo, &listener)
+    e1.add_listener(:bar, &listener)
+    e1.remove_all_listeners(:foo)
+    assert_equal([], e1.listeners(:foo))
+    assert_equal([listener], e1.listeners(:bar))
+    
+    e2 = Events::EventEmitter.new
+    e2.add_listener(:foo, &listener)
+    e2.add_listener(:bar, &listener)
+    e2.remove_all_listeners
+    assert_equal([], e2.listeners(:foo))
+    assert_equal([], e2.listeners(:bar))
+  end
+  
   # /test/simple/test-event-emitter-remove-listeners.js
   def test_event_emitter_remove_listeners
     count = 0

metadata

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