events 0.9.7 → 0.9.8

data/lib/events.rb

@@ -101,7 +101,9 @@ module Events # :nodoc:
       unless listener.respond_to?(:call)
         raise ArgumentError.new("Listener must respond to #call")
       end
-      emit(:new_listener, event, listener)
+      
+      to_emit = OnceWrapper === listener ? listener.original : listener
+      emit(:new_listener, event, to_emit)
       
       event_listeners = listeners(event)
       event_listeners.push(listener)
@@ -151,7 +153,6 @@ module Events # :nodoc:
         @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
     end
@@ -165,7 +166,6 @@ module Events # :nodoc:
       @listeners = nil if event == :_remove_all_listeners_default_arg_
       if @listeners && @listeners.key?(event)
         @listeners[event].clear
-        @listeners.delete(event)
       end
       self
     end

data/readme.rdoc

@@ -1,4 +1,4 @@
-=Events::Emitter
+=Events::Emitter {<img src=https://travis-ci.org/matsadler/rb-event-emitter.png>}[http://travis-ci.org/matsadler/rb-event-emitter]
 
 The Events::Emitter mixin provides a clone of the Node.js EventEmitter API for
 Ruby.

data/test/events_test.rb

@@ -1,5 +1,5 @@
 require "test/unit"
-require "../lib/events"
+require File.expand_path("../../lib/events", __FILE__)
 require "stringio"
 
 class TestEvents < Test::Unit::TestCase

data/test/node_transliterated_test.rb

@@ -1,5 +1,5 @@
 require "test/unit"
-require "../lib/events"
+require File.expand_path("../../lib/events", __FILE__)
 
 # Tests transliterated from javascript originals at
 # http://github.com/joyent/node/
@@ -10,19 +10,25 @@ class TestEventEmitter < Test::Unit::TestCase
     e = Events::EventEmitter.new
     
     events_new_listener_emited = []
+    listeners_new_listener_emited = []
     times_hello_emited = 0
     
     e.add_listener(:new_listener) do |event, listener|
       puts "new_listener: #{event}"
       events_new_listener_emited.push(event)
+      listeners_new_listener_emited.push(listener)
     end
     
-    e.on(:hello) do |a, b|
+    hello = Proc.new do |a, b|
       puts "hello"
       times_hello_emited += 1
       assert_equal("a", a)
       assert_equal("b", b)
     end
+    e.on(:hello, hello)
+    
+    foo = Proc.new {}
+    e.once(:foo, foo)
     
     puts "start"
     
@@ -33,7 +39,8 @@ class TestEventEmitter < Test::Unit::TestCase
     f = Events::EventEmitter.new
     assert_nothing_raised {f.max_listeners = 0}
     
-    assert_equal([:hello], events_new_listener_emited)
+    assert_equal([:hello, :foo], events_new_listener_emited)
+    assert_equal([hello, foo], listeners_new_listener_emited)
     assert_equal(1, times_hello_emited)
   end
   
@@ -58,6 +65,13 @@ class TestEventEmitter < Test::Unit::TestCase
     e.on(:specific) {}
     assert(e.listeners(:specific).warned)
     
+    # only one
+    e.max_listeners = 1
+    e.on(:only_one) {}
+    assert(!e.listeners(:only_one).warned)
+    e.on(:only_one) {}
+    assert(e.listeners(:only_one).warned)
+    
     # unlimited
     e.max_listeners = 0
     1000.times do
@@ -177,9 +191,14 @@ class TestEventEmitter < Test::Unit::TestCase
     e1 = Events::EventEmitter.new
     e1.add_listener(:foo, &listener)
     e1.add_listener(:bar, &listener)
+    foo_listeners = e1.listeners(:foo)
+    bar_listeners = e1.listeners(:bar)
     e1.remove_all_listeners(:foo)
     assert_equal([], e1.listeners(:foo))
     assert_equal([listener], e1.listeners(:bar))
+    # identity check, the array should not change
+    assert_same(foo_listeners, e1.listeners(:foo))
+    assert_same(bar_listeners, e1.listeners(:bar))
     
     e2 = Events::EventEmitter.new
     e2.add_listener(:foo, &listener)
@@ -209,10 +228,15 @@ class TestEventEmitter < Test::Unit::TestCase
     end
     
     e1 = Events::EventEmitter.new
+    e1_listeners = e1.listeners(:hello)
     e1.add_listener(:hello, &listener1)
+    assert_equal(1, e1_listeners.length)
     e1.remove_listener(:hello, listener1)
     assert_equal([], e1.listeners(:hello))
     
+    # identity check, listeners array should be the same
+    assert_same(e1_listeners, e1.listeners(:hello))
+    
     e2 = Events::EventEmitter.new
     e2.add_listener(:hello, &listener1)
     e2.remove_listener(:hello, listener2)
@@ -221,8 +245,13 @@ class TestEventEmitter < Test::Unit::TestCase
     e3 = Events::EventEmitter.new
     e3.add_listener(:hello, &listener1)
     e3.add_listener(:hello, &listener2)
+    e3_listeners = e3.listeners(:hello)
+    assert_equal(2, e3_listeners.length)
     e3.remove_listener(:hello, listener1)
+    assert_equal(1, e3_listeners.length)
     assert_equal([listener2], e3.listeners(:hello))
+    
+    assert_same(e3_listeners, e3.listeners(:hello))
   end
   
 end

data/test/runner.rb

@@ -0,0 +1 @@
+Dir["**/*_test.rb"].each {|test| require File.expand_path(test)}

metadata

@@ -1,67 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: events
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 7
-  version: 0.9.7
+version: !ruby/object:Gem::Version
+  version: 0.9.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matthew Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-06 00:00:00 +01:00
-default_executable: 
+date: 2012-05-06 00:00:00.000000000Z
 dependencies: []
-
-description: The Events::Emitter mixin provides a clone of the Node.js EventEmitter API for Ruby.
+description: The Events::Emitter mixin provides a clone of the Node.js EventEmitter
+  API for Ruby.
 email: mat@sourcetagsandcodes.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - readme.rdoc
-files: 
+files:
 - lib/events.rb
 - test/events_test.rb
 - test/node_transliterated_test.rb
+- test/runner.rb
 - readme.rdoc
-has_rdoc: true
 homepage: http://github.com/matsadler/rb-event-emitter
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - readme.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Clone of the node.js EventEmitter api for Ruby
-test_files: 
+test_files:
 - test/events_test.rb
 - test/node_transliterated_test.rb
+- test/runner.rb