ruby_events 0.0.6 → 0.0.7

data/README.markdown

@@ -58,6 +58,15 @@ a little bit of sugar:
     end
     
     a << 'this is a test'
+    
+You can supply the `listen` method with a Proc, an array of Procs, or a block.
+You can also give it a mixute of Procs and a block if you really want:
+
+    a = []
+    a.events.fire_on_method('<<'.to_sym, :item_injected)
+    a.events.listen(:injected, [Proc.new { |event_data| puts event_data; }, Proc.new { puts 'Hello, I was called!'; }])
+    
+    a << 'this is a test'
 
 These method events will automatically be passed the arguments that were passed
 to that method when it was called. Don't let your imagination stop there. You

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'ruby_events'
-  s.version = '0.0.6'
+  s.version = '0.0.7'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.markdown']
   s.summary = 'A really simple event implementation that hooks into the Object class. Now all your objects can join in the fun of firing events!'

data/lib/ruby_events.rb

@@ -7,17 +7,29 @@ module RubyEvents
   # The Events class. Contains all the methods and functionality that drives
   # the actual processes of adding, listening, calling and receiving events.
   class Events
+    # The current version of RubyEvents.
+    def self.version
+      '0.0.7'
+    end
+    
     # Initialize the events class by instantiating the class methods we'll be
     # using.
     def initialize(parent)
       @parent, @events = parent, {}
     end
 
-    # Add a listener to the passed event type.
-    def listen(event_type, &event)
+    # Add a listener to the passed event type. You can pass a Proc, an array of
+    # Proc's, or a block.
+    def listen(event_type, procs = nil, &block)
       @events[event_type] = [] unless event_is_defined(event_type)
-      # TODO: Can we allow both block and an array of Proc's here?
-      @events[event_type] << event
+      procs_collected = []
+      if procs.respond_to?(:each)
+        procs_collected += procs.to_a
+      elsif procs
+        procs_collected << procs
+      end
+      procs_collected << block if block
+      @events[event_type] += procs_collected
     end
 
     # Fire all registered listeners to the passed event, passing them the
@@ -31,23 +43,32 @@ module RubyEvents
     # Set an event to fire when passed method is called. This is useful for
     # adding callbacks or events to built-in methods.
     def fire_on_method(method, event_type, &block)
-      method_s, old_method_s = method.to_s, old_method.to_s
-      old_method = (method_s + '_event_old').to_sym
-      if @parent && @parent.respond_to?(method) && !@parent.respond_to?(old_method)
-        @parent = @parent.class
-        @parent.class_eval do
+      parent = @parent
+      method_s = method.to_s
+      old_method = ('ruby_events_' + method_s + '_event_old').to_sym
+      old_method_s = old_method.to_s
+      if parent && parent.respond_to?(method)
+        parent.class.class_eval do
+          # If the parent is already responding to the alias method, it means
+          # the fire_on_method event was already triggered. Remove the other
+          # event and continue if this happens.
+          if parent.respond_to?(old_method, true)
+            undef_method method
+            alias_method method, old_method
+            undef_method old_method
+          end
+        
           alias_method old_method, method
+          private old_method
+          
+          # Make sure the self.send is at the end, or we won't return what we
+          # are supposed to.
+          define_method "#{method_s}" do |*args|
+            events.fire(event_type, *args)
+            block.call(*args) if(block) # Calling the block we've been passed
+            __send__(old_method, *args)
+          end
         end
-        # FIXME: We need to find a way to call the block that's been passed
-        # so they can define the arguments they want to pass to the event.
-        #
-        # We are using self.send instead of calling the method directory because
-        # methods like << can not be resolved as a method properly once they've
-        # had the _event_old suffix tacked on the end.
-        #
-        # Make sure the self.send is at the end, or we won't return what we
-        # are supposed to.
-        @parent.class_eval('def ' + method_s + '(*args); events.fire(:' + event_type.to_s + ', *args); self.send("' + old_method_s + '".to_sym, *args); end')
       else
         # TODO: Need to raise exception here.
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Nathan Kleyn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +01:00
+date: 2010-05-16 00:00:00 +01:00
 default_executable: 
 dependencies: []