mod_spox 0.0.3 → 0.0.4

data/lib/mod_spox/messages/internal/TimerRemove.rb

@@ -4,10 +4,18 @@ module ModSpox
             class TimerRemove
                 # action to remove
                 attr_reader :action
+                # message identification
+                attr_reader :ident
                 # action:: action to remove from timer
                 # Remove action from timer
                 def initialize(action)
                     @action = action
+                    @ident = rand(99999999)
+                end
+                
+                # Message ID
+                def id
+                    @ident
                 end
             end
         end

data/lib/mod_spox/messages/internal/TimerResponse.rb

@@ -4,13 +4,16 @@ module ModSpox
             class TimerResponse < Response
                 # action from timer
                 attr_reader :action
+                # response to message with this ID
+                attr_reader :ident
                 # object:: object to send response to
                 # action:: action removed from timer
                 # Notification that action has been removed
-                def initialize(object, action, added)
+                def initialize(object, action, added, id)
                     super(object)
                     @action = action
                     @added = added
+                    @ident = id
                 end
                 # Action was added to timer
                 def action_added?
@@ -20,6 +23,10 @@ module ModSpox
                 def action_removed?
                     return !@added
                 end
+                # ID of message this response is for
+                def id
+                    @ident
+                end
             end
         end
     end

data/lib/mod_spox/models/Auth.rb

@@ -47,14 +47,14 @@ module ModSpox
             
             # Set services (nickserv) identification
             def services_identified=(val)
-                set :authed => true if val && services
+                update_with_params :authed => true if val && services
             end
             
             # pass:: password to compare
             # Check and authenticate against password
             def check_password(pass)
                 if(Digest::SHA1.hexdigest(pass) == password)
-                    set :authed => true
+                    update_with_params :authed => true
                     return true
                 else
                     return false
@@ -62,14 +62,14 @@ module ModSpox
             end
             
             def password=(pass)
-                set :password => Digest::SHA1.hexdigest(pass)
+                update_values :password => Digest::SHA1.hexdigest(pass)
             end
             
             # source:: source to apply mask to
             # Check and authenticate by mask against source
             def check_mask(source)
                 if(source =~ /^#{mask}$/)
-                    set :authed => true
+                    update_with_params :authed => true
                 end
             end
             

data/lib/mod_spox/models/Channel.rb

@@ -10,6 +10,17 @@ module ModSpox
         # parked:: Bot is currently in this channel
         class Channel < Sequel::Model(:channels)
             
+            set_cache Database.cache, :ttl => 3600 unless Database.cache.nil?
+            
+            def Channel.locate(string, create = true)
+                chan = nil
+                if(Database.type == :pgsql)
+                    chan = Channel.filter('name = lower(?)', string).first
+                end
+                chan = Channel.find_or_create(:name => string) if !chan && create
+                return chan
+            end
+            
             # Modes for this channel
             def channel_modes
                 ChannelMode.filter(:channel_id => pk)

data/lib/mod_spox/models/Nick.rb

@@ -16,22 +16,33 @@ module ModSpox
         # TODO: for nick field -> "tack a COLLATE NOCASE onto the columns"
         class Nick < Sequel::Model(:nicks)
             
+            set_cache Database.cache, :ttl => 3600 unless Database.cache.nil?
+            
+            def Nick.locate(string, create = true)
+                nick = nil
+                if(Database.type == :pgsql)
+                    nick = Nick.filter('nick = lower(?)', string).first
+                end
+                nick = Nick.find_or_create(:nick => string) if !nick && create
+                return nick
+            end
+            
             def visible=(val)
                 unless(val)
-                    set :username => nil
-                    set :real_name => nil
-                    set :address => nil
-                    set :source => nil
-                    set :connected_at => nil
-                    set :connected_to => nil
-                    set :seconds_idle => nil
-                    set :away => false
+                    update_with_params :username => nil
+                    update_with_params :real_name => nil
+                    update_with_params :address => nil
+                    update_with_params :source => nil
+                    update_with_params :connected_at => nil
+                    update_with_params :connected_to => nil
+                    update_with_params :seconds_idle => nil
+                    update_with_params :away => false
                 end
-                set :visible => val
+                update_values :visible => val
             end
                     
             def source=(mask)
-                set :source => mask
+                update_values :source => mask
                 auth.check_mask(mask)
             end
             
@@ -45,7 +56,7 @@ module ModSpox
                 groups = []
                 auth_ids = []
                 group_ids = []
-                auth = Auth.filter{:nick_id == pk && :authed == true}.first
+                auth = Auth.filter('nick_id = ?', pk).filter('authed = ?', true).first
                 if(auth)
                     groups = auth.groups
                 end

data/lib/mod_spox/models/Setting.rb

@@ -11,7 +11,7 @@ module ModSpox
         class Setting < Sequel::Model(:settings)
             
             def value=(val)
-                set(:value => Base64.encode64(Marshal.dump(val)))
+                update_values(:value => Base64.encode64(Marshal.dump(val)))
             end
             
             def value
@@ -33,7 +33,7 @@ module ModSpox
             def self.[]=(key, val)
                 key = key.to_s if key.is_a?(Symbol)
                 model = Setting.find_or_create(:name => key)
-                model.set(:value => Base64.encode64(Marshal.dump(val)))
+                model.update_with_params(:value => Base64.encode64(Marshal.dump(val)))
             end
         end
     end

data/lib/mod_spox/models/Signature.rb

@@ -1,3 +1,4 @@
+require 'base64'
 module ModSpox
     module Models
         # Attributes provided by model:
@@ -10,19 +11,27 @@ module ModSpox
             
             def params=(prms)
                 raise InvalidType.new('Parameter names must be provided in an array') unless prms.kind_of?(Array)
-                set(:params => prms.join('|'))
+                update_values(:params => prms.join('|'))
             end
         
             def params
                 return values[:params].nil? ? [] : values[:params].split('|')
             end
             
+            def signature=(sig)
+                update_values(:signature => Base64.encode64(Marshal.dump(sig)))
+            end
+            
+            def signature
+                return values[:signature] ? Marshal.load(Base64.decode64(values[:signature])) : nil
+            end
+            
             def group
                 Group[group_id]
             end
             
             def group=(group)
-                set :group_id => group.pk
+                update_values :group_id => group.pk
             end
 
         end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mod_spox
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2008-04-30 00:00:00 -07:00
+  version: 0.0.4
+date: 2008-05-09 00:00:00 -07:00
 summary: The mod_spox IRC robot
 require_paths: 
 - lib
@@ -241,6 +241,8 @@ files:
 - data/mod_spox/extras/Talk.rb
 - data/mod_spox/extras/EightBall.rb
 - data/mod_spox/extras/AOLSpeak.rb
+- data/mod_spox/extras/Logger.rb
+- data/mod_spox/extras/Topten.rb
 test_files: []
 
 rdoc_options: []