ruby_events 0.0.4 → 0.0.5

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'ruby_events'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   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

@@ -4,17 +4,18 @@
 # accessor, you can set up and listen to events or callbacks as fired by this
 # class.
 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
     # Initialize the events class by instantiating the class methods we'll be
     # using.
     def initialize(parent)
-      @parent = parent
-      @events = {}
+      @parent, @events = parent, {}
     end
 
     # Add a listener to the passed event type.
     def listen(event_type, &event)
-      @events[event_type] = [] unless @events.has_key? event_type
+      @events[event_type] = [] unless event_is_defined
       # TODO: Can we allow both block and an array of Proc's here?
       @events[event_type] << event
     end
@@ -22,26 +23,21 @@ module RubyEvents
     # Fire all registered listeners to the passed event, passing them the
     # arguments as provided.
     def fire(event_type, *arguments)
-      if @events.has_key?(event_type)
-        @events[event_type].each do |event|
-          event.call arguments
-        end
-      end
+      @events[event_type].each do |event|
+        event.call arguments
+      end if event_is_defined
     end
     
     # 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)
-      old_method = (method.to_s + '_event_old').to_sym
+      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
           alias_method old_method, method
         end
-        
-        method = method.to_s
-        old_method = old_method.to_s
-        
         # 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.
         #
@@ -51,7 +47,7 @@ module RubyEvents
         #
         # Make sure the self.send is at the end, or we won't return what we
         # are supposed to.
-        @parent.class_eval('def ' + method + '(*args); events.fire(:' + event_type + ', *args); self.send("' + old_method + '".to_sym, *args); end')
+        @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
@@ -59,9 +55,13 @@ module RubyEvents
 
     # Remove a method from the listening queue.
     def remove(event_type, event)
-      if @events.has_key?(event_type)
-        @events[event_type].delete_if {|stored_event| stored_event == event}
-      end
+      @events[event_type].delete_if {|stored_event| stored_event == event} if event_is_defined
+    end
+    
+    private
+    # Checks if an event of event_type is defined in the collection of events.
+    def event_is_defined(event_type)
+      @events.has_key?(event_type)
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nathan Kleyn