em-emitter 0.9.0.beta.1 → 0.9.0.beta.2

data/lib/em-emitter/emitter.rb

@@ -19,20 +19,50 @@ module EM
     def self.add_observer(object, event, method_to_call)
       raise EM::Emitter::MaxObserversReachedException.new if @@observers.count >= @@max_listeners
 
-      @@observers << EM::Emitter::Observer.new(event, object, method_to_call)
+      observer = EM::Emitter::Observer.new(event, object, method_to_call)
 
-      @@observers.count
+      @@observers << observer
+
+      # emit a system event that an observer has been added with the observer and the listener count
+      EM::Emitter::emit({
+        :from => '_emitter',
+        :action => 'add_observer'
+      }, {
+        :observer => observer,
+        :listeners_count => @@observers.count
+      })
+
+      observer
     end
 
     def self.remove_observer(observer)
       @@observers.delete_if { |x| x == observer }
+
+      # emit a system event that an observer has been remove with the observer and the listener count
+      EM::Emitter::emit({
+        :from => '_emitter',
+        :action => 'remove_observer'
+      }, {
+        :observer => observer,
+        :listeners_count => @@observers.count
+      })
     end
 
     def self.clear_observers!
       @@observers = []
+
+      # emit a system event that all observers have been removed
+      EM::Emitter::emit({
+        :from => '_emitter',
+        :action => 'clear_observers'
+      }, {
+        :listeners_count => @@observers.count
+      })
+
+      @@observers.count
     end
 
-    def self.emit(object, event, data)
+    def self.emit(event, data)
       @@observers.each do |ob|
         if ob.is_active && ob.event == event
           # make the observer method calls async
@@ -44,7 +74,7 @@ module EM
       end
 
       EM.next_tick do
-        # remove non active items first
+        # remove non active items
         @@observers.delete_if { |x| x.is_active == false }
       end
     end

data/lib/em-emitter/observable.rb

@@ -2,6 +2,9 @@ module EM
   module Emitter
     module Observable
 
+      attr_reader :receivers
+      # TODO: pass event along with data to methods
+
       def uses_clone(cloner)
         @uses_clone = cloner
       end
@@ -12,15 +15,21 @@ module EM
           object = clone_data(object)
         end
 
-        EM::Emitter.emit(self, event, object)
+        EM::Emitter.emit(event, object)
         self
       end
 
       def receiver(event, method_name)
-        EM::Emitter.add_observer(self, event, method_name)
+        @receivers ||= []
+        @receivers << EM::Emitter.add_observer(self, event, method_name)
         self
       end
 
+      def remove_receivers!
+        @receivers.each { |rec| EM::Emitter.remove_observer(rec) }
+        @receivers = []
+      end
+
       def clone_data(object)
         # clone or copy depending on type
         if object.nil?

data/lib/em-emitter/observer.rb

@@ -16,8 +16,9 @@ module EM
 
       def call_action(data)
         # only invoke the method if it can be invoked
-        if @object.nil? == false && @object.respond_to?(@method)
-          @object.send(@method, data)
+        if @object.nil? == false && @object.respond_to?(@method) &&
+          (@object.method(@method).arity == 2 || @object.method(@method).arity == -1)
+          @object.send(@method, data, @event.event_hash)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-emitter
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.1
+  version: 0.9.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine