Ruby-IRC 1.0.10 → 1.0.11

data/lib/IRCEvent.rb

@@ -25,8 +25,8 @@ class IRCEvent
     # mess_parts[0] is server info
     # mess_parts[1] is the message that was sent
     @message = mess_parts[1]
-    @stats = mess_parts[0].scan(/[-\w.\#\@\+]+/)
- 
+    @stats = mess_parts[0].scan(/[-`\^\{\}\[\]\w.\#\@\+]+/)
+    
     if @stats[0].match(/^PING/)
       @event_type = 'ping'
     elsif @stats[1] && @stats[1].match(/^\d+/)

data/lib/IRCEvent.rb.~1.8.~

@@ -0,0 +1,90 @@
+require 'yaml'
+
+# This is a lookup class for IRC event name mapping
+class EventLookup
+  @@lookup = YAML.load_file("#{File.dirname(__FILE__)}/eventmap.yml")
+  
+  # returns the event name, given a number
+  def EventLookup::find_by_number(num)
+    return @@lookup[num.to_i]
+  end
+end
+
+
+# Handles an IRC generated event.
+# Handlers are for the IRC framework to use
+# Callbacks are for users to add.
+# Both handlers and callbacks can be called for the same event.
+class IRCEvent
+  @@handlers = { 'ping' => lambda {|event| IRCConnection.send_to_server("PONG #{event.message}") } }
+  @@callbacks = Hash.new()
+  attr_reader :hostmask, :message, :event_type, :from, :channel, :target, :mode, :stats
+  def initialize (line)
+    line.sub!(/^:/, '')
+    mess_parts = line.split(':', 2);
+    # mess_parts[0] is server info
+    # mess_parts[1] is the message that was sent
+    @message = mess_parts[1]
+    @stats = mess_parts[0].scan(/[-\w.\#\@\+]+/)
+ 
+    if @stats[0].match(/^PING/)
+      @event_type = 'ping'
+    elsif @stats[1] && @stats[1].match(/^\d+/)
+      @event_type = EventLookup::find_by_number(@stats[1]);
+      @channel = @stats[3]
+    else
+      @event_type = @stats[2].downcase if @stats[2]
+    end
+    
+    if @event_type != 'ping'
+      @from    = @stats[0] 
+      @user    = IRCUser.create_user(@from)
+    end
+    # FIXME: this list would probably be more accurate to exclude commands than to include them
+    @hostmask = @stats[1] if %W(topic privmsg join).include? @event_type
+    @channel = @stats[3] if @stats[3] && !@channel
+    @target  = @stats[5] if @stats[5]
+    @mode    = @stats[4] if @stats[4]
+
+    
+    
+    # Unfortunatly, not all messages are created equal. This is our
+    # special exceptions section
+    if @event_type == 'join'
+      @channel = @message
+    end
+    
+  end
+  
+  # Adds a callback for the specified irc message.
+  def IRCEvent.add_callback(message_id, &callback)
+    @@callbacks[message_id] = callback
+  end
+  
+  # Adds a handler to the handler function hash.
+  def IRCEvent.add_handler(message_id, proc=nil, &handler)
+    if block_given?
+      @@handlers[message_id] = handler
+    elsif proc
+      @@handlers[message_id] = proc
+    end
+  end
+  
+  # Process this event, preforming which ever handler and callback is specified
+  # for this event.
+  def process 
+    handled = nil
+    if @@handlers[@event_type]
+      @@handlers[@event_type].call(self)
+      handled = 1
+    end
+    if @@callbacks[@event_type]
+      @@callbacks[@event_type].call(self)
+      handled = 1
+    end
+    if !handled
+      # puts "No handler for event type #@event_type in #{self.class}"
+    end
+  end
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: Ruby-IRC
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
-date: 2007-11-07 00:00:00 -08:00
+  version: 1.0.11
+date: 2007-11-08 00:00:00 -08:00
 summary: An IRC Client library
 require_paths: 
 - lib
@@ -38,6 +38,7 @@ files:
 - lib/IRCUtil.rb
 - lib/eventmap.yml
 - lib/IRCConnection.rb.~1.4.~
+- lib/IRCEvent.rb.~1.8.~
 - README
 test_files: []