mod_spox 0.0.4 → 0.0.5

data/lib/mod_spox/Timer.rb

@@ -1,3 +1,10 @@
+['mod_spox/Logger',
+ 'mod_spox/Pipeline',
+ 'mod_spox/Pool',
+ 'mod_spox/Action',
+ 'mod_spox/Exceptions',
+ 'mod_spox/Monitors'].each{|f|require f}
+
 module ModSpox
 
     class Timer < Pool
@@ -12,10 +19,13 @@ module ModSpox
             @monitor = Monitors::Timer.new
             @thread = nil
             @stop_timer = false
+            @owners = {}
+            @owners_lock = Mutex.new
             {:Internal_TimerAdd => :add_message,
-             :Internal_TimerRemove => :remove_message}.each_pair{|type,method|
+             :Internal_TimerRemove => :remove_message,
+             :Internal_TimerClear => :clear}.each_pair do |type,method|
                 @pipeline.hook(self, method, type)
-            }
+            end
             start_pool
         end
         
@@ -29,7 +39,12 @@ module ModSpox
         # Add a recurring code block
         def add_message(message)
             Logger.log("New block is being added to the timer", 15)
-            action = add(message.period, message.once, message.data, &message.block)
+            action = nil
+            @owners_lock.synchronize do
+                action = add(message.period, message.once, message.data, &message.block)
+                @owners[message.requester.name.to_sym] = [] unless @owners.has_key?(message.requester.name.to_sym)
+                @owners[message.requester.name.to_sym] << action
+            end
             begin
                 @pipeline << Messages::Internal::TimerResponse.new(message.requester, action, true, message.id)
                 Logger.log("New block was successfully added to the timer", 15)
@@ -102,9 +117,20 @@ module ModSpox
         end
         
         # Clears all actions in the timer's queue
-        def clear
-            @queue.clear
-            @timers.clear
+        def clear(message=nil)
+            if(message.nil? || message.plugin.nil?)
+                @queue.clear
+                @timers.clear
+                @owners.clear
+            else
+                @owners_lock.synchronize do
+                    if(@owners.has_key?(message.plugin))
+                        @owners[message.plugin].each do |action|
+                            remove(action)
+                        end
+                    end
+                end
+            end
         end
         
         private

data/lib/mod_spox/handlers/BadNick.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class BadNick < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::BadNick.new(string, $1)
                 else
                     Logger.log('Failed to process RPL_ERRORONEOUSNICK message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Bounce.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Bounce < Handler
@@ -8,6 +9,8 @@ module ModSpox
             def process(string)
                 if(string =~ /:Try server (\S+), port (.+)$/)
                     return Messages::Incoming::Bounce.new(string, $1, $2)
+                else
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Created.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Created < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::Created.new(string, $1)
                 else
                     Logger.log('Failed to parse RPL_CREATED message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Handler.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/rfc2812'
 module ModSpox
     module Handlers
     
@@ -16,4 +17,8 @@ module ModSpox
         end
         
     end
+end
+
+Dir.new(File.dirname(__FILE__)).each do |file|
+    require File.dirname(__FILE__) + '/' + file if file =~ /\.rb$/
 end

data/lib/mod_spox/handlers/Invite.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Invite < Handler
@@ -12,6 +13,7 @@ module ModSpox
                     return Messages::Incoming::Invite.new(string, source, target, channel)
                 else
                     Logger.log('Failed to parse INVITE message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Join.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Join < Handler
@@ -9,20 +10,35 @@ module ModSpox
                     source = $1
                     chan = $2
                     if(source =~ /^(.+?)!(.+?)@(.+)$/)
+                        do_save = false
                         nick = find_model($1)
-                        nick.username = $2
-                        nick.address = $3
-                        nick.source = source
-                        nick.visible = true
-                        nick.save
+                        unless(nick.username == $2)
+                            nick.username == $2
+                            do_save = true
+                        end
+                        unless(nick.address == $3)
+                            nick.address = $3
+                            do_save = true
+                        end
+                        unless(nick.source == source)
+                            nick.source = source
+                            do_save = true
+                        end
+                        unless(nick.visible == true)
+                            nick.visible = true
+                            do_save = true
+                        end
+                        nick.save if do_save
                         channel = find_model(chan)
                         channel.nick_add(nick)
                         return Messages::Incoming::Join.new(string, channel, nick)
                     else
                         Logger.log('Failed to parse source on JOIN message')
+                        return nil
                     end
                 else
                     Logger.log('Failed to parse JOIN message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Kick.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Kick < Handler
@@ -17,6 +18,7 @@ module ModSpox
                     return Messages::Incoming::Kick.new(string, channel, kicker, kickee, reason)
                 else
                     Logger.log('Failed to process KICK message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/LuserChannels.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class LuserChannels < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::LuserChannels.new(string, $1.to_i)
                 else
                     Logger.log('Failed to match RPL_LUSERCHANNELS message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/LuserClient.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class LuserClient < Handler

data/lib/mod_spox/handlers/LuserMe.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class LuserMe < Handler

data/lib/mod_spox/handlers/LuserOp.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class LuserOp < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::LuserOp.new(string, $1.to_i)
                 else
                     Logger.log('Failed to match RPL_LUSEROP message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/LuserUnknown.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class LuserUnknown < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::LuserUnknown.new(string, $1.to_i)
                 else
                     Logger.log('Failed to match RPL_LUSERUNKNOWN message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Mode.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Mode < Handler
@@ -47,6 +48,7 @@ module ModSpox
                 rescue Object => boom
                     Logger.log("Failed to process MODE message. Reason: #{boom}")
                 end
+                return nil
             end
         end
     end

data/lib/mod_spox/handlers/Motd.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Motd < Handler
@@ -12,17 +13,19 @@ module ModSpox
                 if(string =~ /^:(\S+) #{RPL_MOTDSTART.to_s}.*?:-\s?(\S+)/)
                     @motds[$1] = Array.new
                     @raw[$1] = [string]
-                    return
+                    return nil
                 elsif(string =~ /^:(\S+) #{RPL_MOTD.to_s}.*?:-\s?(.+)$/)
                     @motds[$1] << $2
                     @raw[$1] << string
-                    return
+                    return nil
                 elsif(string =~ /^:(\S+) #{RPL_ENDOFMOTD.to_s}/)
                     @raw[$1] << string
                     message = Messages::Incoming::Motd.new(@raw[$1].join("\n"), @motds[$1].join("\n"), $1)
                     @motds.delete($1)
                     @raw.delete($1)
                     return message
+                else
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/MyInfo.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class MyInfo < Handler
@@ -14,6 +15,7 @@ module ModSpox
                     return Messages::Incoming::MyInfo.new(string, servername, version, usermodes, channelmodes)
                 else
                     Logger.log('Failed to match My Info message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Names.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Names < Handler
@@ -13,6 +14,7 @@ module ModSpox
                     chan = $1
                     nicks = $2
                     @names[chan] = Array.new unless @names[chan]
+                    @raw[chan] = Array.new unless @raw[chan]
                     if(@raw[chan])
                         @raw[chan] << string
                     else
@@ -22,7 +24,7 @@ module ModSpox
                     return nil
                 elsif(string =~ /#{RPL_ENDOFNAMES}.*?(\S+) :/)
                     chan = $1
-                    @raw[chan] << string
+                    @raw[chan] << string if @raw.has_key?(chan)
                     channel = find_model(chan)
                     nicks = Array.new
                     ops = Array.new
@@ -47,6 +49,8 @@ module ModSpox
                     @names.delete(chan)
                     @raw.delete(chan)
                     return Messages::Incoming::Names.new(raw, channel, nicks, ops, voice)
+                else
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Nick.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Nick < Handler
@@ -17,6 +18,7 @@ module ModSpox
                     return Messages::Incoming::Nick.new(string, old_nick, new_nick)
                 else
                     Logger.log('Failed to parse NICK message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/NickInUse.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class NickInUse < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::NickInUse.new(string, $1)
                 else
                     Logger.log('Failed to parse RPL_NICKNAMEINUSE message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Notice.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Notice < Handler
@@ -13,10 +14,20 @@ module ModSpox
                     if(base_source =~ /\!/)
                         source = find_model(base_source.gsub(/!.+$/, ''))
                         if(base_source =~ /!(.+)@(.+)$/)
-                            source.username = $1
-                            source.address = $2
-                            source.source = base_source
-                            source.save
+                            do_save = false
+                            unless(source.username == $1)
+                                source.username == $1
+                                do_save = true
+                            end
+                            unless(source.address == $2)
+                                source.address = $2
+                                do_save = true
+                            end
+                            unless(source.source == base_source)
+                                source.source = base_source
+                                do_save = true
+                            end
+                            source.save if do_save
                         end
                         target = find_model(target)
                     else
@@ -25,6 +36,7 @@ module ModSpox
                     return Messages::Incoming::Notice.new(string, source, target, message)
                 else
                     Logger.log('Failed to match NOTICE message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Part.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Part < Handler
@@ -12,6 +13,7 @@ module ModSpox
                     return Messages::Incoming::Part.new(string, channel, nick, $3)
                 else
                     Logger.log('Failed to parse PART message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Ping.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Ping < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::Ping.new(string, $1, nil)
                 else
                     Logger.log('Failed to match PING message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Pong.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Pong < Handler
@@ -9,6 +10,7 @@ module ModSpox
                     return Messages::Incoming::Pong.new(string, $1, $2)
                 else
                     Logger.log('Failed to parse PONG message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Privmsg.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Privmsg < Handler
@@ -12,15 +13,26 @@ module ModSpox
                     base_source = $1
                     source = find_model(base_source.gsub(/!.+$/, ''))
                     if(base_source =~ /!(.+)@(.+)$/)
-                        source.username = $1
-                        source.address = $2
-                        source.source = base_source
-                        source.save
+                        do_save = false
+                        unless(source.username == $1)
+                            source.username == $1
+                            do_save = true
+                        end
+                        unless(source.address == $2)
+                            source.address = $2
+                            do_save = true
+                        end
+                        unless(source.source == base_source)
+                            source.source = base_source
+                            do_save = true
+                        end
+                        source.save if do_save
                     end
                     Models::NickChannel.find_or_create(:channel_id => target.pk, :nick_id => source.pk) if target.is_a?(ModSpox::Models::Channel)
                     return Messages::Incoming::Privmsg.new(string, source, target, message)
                 else
                     Logger.log('Failed to match PRIVMSG message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Quit.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Quit < Handler
@@ -14,6 +15,7 @@ module ModSpox
                     return Messages::Incoming::Quit.new(string, nick, reason)
                 else
                     Logger.log('Failed to parse KICK message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Topic.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Topic < Handler
@@ -21,6 +22,7 @@ module ModSpox
                     return Messages::Incoming::TopicInfo.new(string, channel, nick, time)
                 else
                     Logger.log('Failed to parse TOPIC type string')
+                    return nil
                 end                    
             end
         end

data/lib/mod_spox/handlers/Welcome.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Welcome < Handler
@@ -24,9 +25,11 @@ module ModSpox
                         return Messages::Incoming::Welcome.new(string, server, message, nick, username, hostname)
                     else
                         Logger.log('Failed to match user string in welcome message')
+                        return nil
                     end
                 else
                     Logger.log('Failed to match welcome message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/Who.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Who < Handler
@@ -44,6 +45,7 @@ module ModSpox
                             Models::NickMode.filter(:channel_id => channel.pk, :nick_id => nick.pk).each{|m| m.destroy}
                         end
                     end
+                    return nil
                 elsif(string =~ /#{RPL_ENDOFWHO}\s\S+\s(\S+)\s/)
                     location = $1
                     loc = find_model(location)
@@ -54,8 +56,8 @@ module ModSpox
                     return message
                 else
                     Logger.log('Failed to match RPL_WHO type message')
+                    return nil
                 end
-                return nil
             end
         end
     end

data/lib/mod_spox/handlers/Whois.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class Whois < Handler
@@ -21,6 +22,7 @@ module ModSpox
                     nick.real_name = $4
                     @cache[$1] = Messages::Incoming::Whois.new(nick)
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_WHOISCHANNELS}\s\S+\s(\S+)\s:(.+)$/)
                     nick = $1
                     $2.split(/\s/).each{|chan|
@@ -35,18 +37,23 @@ module ModSpox
                         end
                     }
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_WHOISSERVER}\s\S+\s(\S+)\s(\S+)\s:(.+)$/)
                     @cache[$1].nick.connected_to = $2
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_WHOISIDENTIFIED}\s\S+\s(\S+)\s/)
                     @cache[$1].nick.auth.services_identified = true
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_WHOISIDLE}\s\S+\s(\S+)\s(\d+)\s(\d+)\s:(.+?),(.+?)/)
                     @cache[$1].nick.seconds_idle = $2.to_i
                     @cache[$1].nick.connected_at = Time.at($3.to_i)
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_WHOISOPERATOR}\s\S+\s(\S+)/)
                     @cache[$1].raw_push(string)
+                    return nil
                 elsif(string =~ /#{RPL_ENDOFWHOIS}\s\S+\s(\S+)\s:/)
                     @cache[$1].raw_push(string)
                     message = @cache[$1]
@@ -56,6 +63,7 @@ module ModSpox
                     return message
                 else
                     Logger.log('Failed to parse WHOIS type reply')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/handlers/YourHost.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/handlers/Handler'
 module ModSpox
     module Handlers
         class YourHost < Handler
@@ -10,6 +11,7 @@ module ModSpox
                     return Messages::Incoming::YourHost.new(string, $1, $2)
                 else
                     Logger.log('Failed to match Your Host message')
+                    return nil
                 end
             end
         end

data/lib/mod_spox/messages/Messages.rb

@@ -0,0 +1,6 @@
+# Lazy loader for messages
+['incoming', 'outgoing', 'internal'].each do |dir|
+    Dir.new(File.dirname(__FILE__) + '/' + dir).each do |file|
+        require File.dirname(__FILE__) + '/' + dir + '/' + file if file =~ /\.rb$/
+    end
+end

data/lib/mod_spox/messages/incoming/BadNick.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/Bounce.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/Created.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/Invite.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/Join.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/Kick.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/LuserChannels.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming

data/lib/mod_spox/messages/incoming/LuserClient.rb

@@ -1,3 +1,4 @@
+require 'mod_spox/messages/incoming/Message'
 module ModSpox
     module Messages
         module Incoming