mod_spox 0.2.0 → 0.3.0

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

@@ -16,8 +16,8 @@ module ModSpox
                 # new_nick:: this should be the target
                 def initialize(raw, old_nick, new_nick)
                     super(raw)
-                    @original_nick = @source_nick
-                    @new_nick = @target
+                    @original_nick = old_nick
+                    @new_nick = new_nick
                 end
             
             end

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

@@ -42,7 +42,7 @@ module ModSpox
 
                 # Is this is private message
                 def is_private?
-                    return @target.is_a?(Models::Nick) || @target.is_a?(String)
+                    return !is_public?
                 end
 
                 # Is this a DCC message

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

@@ -35,6 +35,7 @@ module ModSpox
                 def lock
                     @locked = true
                     @raw_content = @raw.join("\n")
+                    @nick.refresh
                 end
                 
                 private

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

@@ -11,7 +11,7 @@ module ModSpox
                 # server:: Server to connect to
                 # port:: Port to connect to
                 # password:: password to connect
-                def initialize(server, port, password=nil)
+                def initialize(server=nil, port=nil, password=nil)
                     @server = server
                     @port = port
                     @password = password

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

@@ -0,0 +1,10 @@
+module ModSpox
+    module Messages
+        module Internal
+            # Sends message to reload plugin. If new and stale
+            # attributes are set, only that plugin will be reloaded
+            class PluginsReady
+            end
+        end
+    end
+end

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

@@ -0,0 +1,8 @@
+module ModSpox
+    module Messages
+        module Internal
+            class QueueSocket
+            end
+        end
+    end
+end

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

@@ -0,0 +1,8 @@
+module ModSpox
+    module Messages
+        module Internal
+            class Reconnect
+            end
+        end
+    end
+end

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

@@ -0,0 +1,8 @@
+module ModSpox
+    module Messages
+        module Internal
+            class UnqueueSocket
+            end
+        end
+    end
+end

data/lib/mod_spox/migrations/002_persistent_sigs.rb

@@ -0,0 +1,14 @@
+module ModSpox
+    module Migrations
+        class PersistentSigs < Sequel::Migration
+
+            def up
+                Database.db.add_column :signatures, :enabled, :boolean, :null => false, :default => true
+            end
+            
+            def down
+                Database.db.drop_column :signatures, :enabled
+            end
+        end
+    end
+end

data/lib/mod_spox/migrations/003_auth_restructure.rb

@@ -0,0 +1,31 @@
+module ModSpox
+    module Migrations
+        class AuthRestructureModeFix < Sequel::Migration
+
+            def up
+                Database.db.drop_column :auths, :mask
+                Database.db.create_table(:auth_masks) do
+                    primary_key :id, :null => false
+                    varchar :mask, :null => false, :unique => true
+                end
+                Database.db.create_table(:auth_masks_groups) do
+                    foreign_key :auth_mask_id, :table => :auth_masks, :null => false
+                    foreign_key :group_id, :null => false
+                    primary_key [:auth_mask_id, :group_id]
+                end
+                Database.db.create_table(:auth_masks_nicks) do
+                    foreign_key :auth_mask_id, :table => :auth_masks, :null => false
+                    foreign_key :nick_id, :null => false
+                    primary_key [:nick_id, :auth_mask_id]
+                end
+                Database.db.drop_table :nick_groups
+            end
+
+            def down
+                Database.db.drop_table(:auth_masks_group)
+                Database.db.drop_table(:auth_masks_nicks)
+                Database.db.drop_table(:auth_masks)
+            end
+        end
+    end
+end

data/lib/mod_spox/migrations/004_mode_index_fix.rb

@@ -0,0 +1,18 @@
+module ModSpox
+    module Migrations
+        class ModeIndexFix < Sequel::Migration
+            
+            def up
+                Database.db.drop_index :nick_modes, [:nick_id, :channel_id]
+                Database.db.add_index :nick_modes, [:nick_id, :channel_id], :unique => true
+                Database.db.drop_column :nick_modes, :mode
+                Database.db.add_column :nick_modes, :mode, :varchar, :null => true, :default => ''
+            end
+            
+            def down
+                Database.db.drop_index :nick_modes, [:nick_id, :channel_id]
+                Database.db.add_index :nick_modes, [:nick_id, :channel_id]
+            end
+        end
+    end
+end

data/lib/mod_spox/migrations/005_nick_mode_nopark.rb

@@ -0,0 +1,18 @@
+module ModSpox
+    module Migrations
+        class NickModeNoPark < Sequel::Migration
+            
+            def up
+                Database.db.drop_column :channels, :parked
+                Database.db.add_column :nicks, :mode, :varchar, :null => true, :default => ''
+                Database.db.drop_table :channel_modes
+                Database.db.add_column :channels, :mode, :varchar, :null => true, :default => ''
+            end
+            
+            def down
+                Database.db.drop_column :nicks, :mode
+                Database.add_column :nicks, :parked, :bool, :null => false, :default => true
+            end
+        end
+    end
+end

data/lib/mod_spox/models/Auth.rb

@@ -1,7 +1,8 @@
 require 'digest/sha1'
+require 'mod_spox/models/Group'
+require 'mod_spox/models/Nick'
 module ModSpox
     module Models
-
             # Attributes provided by model:
             # password:: Password to autenticate against
             # services:: Authentication by nickserv
@@ -9,16 +10,12 @@ module ModSpox
             # authed:: Nick has authenticated
         class Auth < Sequel::Model
 
-            before_destroy :clear_auth_groups
-
+            many_to_many :groups, :join_table => :auth_groups, :class => 'ModSpox::Models::Group'
+            many_to_one :nick, :class => 'ModSpox::Models::Nick'
+            
             # Clear relations before destroying
-            def clear_auth_groups
-                AuthGroup.filter(:auth_id => pk).destroy
-            end
-
-            # Nick associated with this Auth
-            def nick
-                Nick[nick_id]
+            def before_destroy
+                remove_all_groups
             end
 
             # Is nick identified with services
@@ -31,42 +28,20 @@ module ModSpox
                 end
             end
 
-            def authenticated(bool=true)
-                update_values :authed => bool
-            end
-
-            # Groups this auth is a member of
-            def groups
-                # we grab IDs, then the object. Otherwise we get sync problems
-                group_id = []
-                AuthGroup.filter(:auth_id => pk).each do |ag|
-                    group_id << ag.group_id
-                end
-                group = []
-                group_id.each{|id| group << Group[id]}
-                return group
-            end
-
-            # Add group to this auth's list
-            def group=(group)
-                AuthGroup.find_or_create(:auth_id => pk, :group_id => group.pk)
-            end
-
-            # Remove given group from auth
-            def remove_group(group)
-                AuthGroup.filter(:auth_id => pk, :group_id => group.pk).each{|g|g.destroy}
-            end
-
             # Set services (nickserv) identification
             def services_identified=(val)
-                update_with_params :authed => true if val && services
+                if(val && services)
+                    update(:authed => true)
+                else
+                    update(:authed => false)
+                end
             end
 
             # pass:: password to compare
             # Check and authenticate against password
             def check_password(pass)
                 if(Digest::SHA1.hexdigest(pass) == password)
-                    update_with_params :authed => true
+                    update(:authed => true)
                     return true
                 else
                     return false
@@ -74,19 +49,14 @@ module ModSpox
             end
 
             def password=(pass)
-                unless(pass.nil?)
-                    update_values :password => Digest::SHA1.hexdigest(pass)
-                else
-                    update_values :password => nil
-                end
+                pass = pass.nil? ? nil : Digest::SHA1.hexdigest(pass)
+                super(pass)
             end
 
             # source:: source to apply mask to
             # Check and authenticate by mask against source
             def check_mask(source)
-                if(source =~ /^#{mask}$/)
-                    update_with_params :authed => true
-                end
+                authed = true if source =~ /^#{mask}$/
             end
 
         end

data/lib/mod_spox/models/AuthMask.rb

@@ -0,0 +1,13 @@
+require 'mod_spox/models/Nick'
+require 'mod_spox/models/Group'
+module ModSpox
+    module Models
+
+        class AuthMask < Sequel::Model
+
+            many_to_many :nicks, :join_table => :auth_masks_nicks, :class => 'ModSpox::Models::Nick'
+            many_to_many :groups, :join_table => :auth_masks_groups, :class => 'ModSpox::Models::Group'
+            
+        end
+    end
+end

data/lib/mod_spox/models/Channel.rb

@@ -1,3 +1,6 @@
+require 'mod_spox/models/Nick'
+require 'mod_spox/models/NickMode'
+
 module ModSpox
     module Models
 
@@ -10,10 +13,24 @@ module ModSpox
         # parked:: Bot is currently in this channel
         class Channel < Sequel::Model
 
-            set_cache Database.cache, :ttl => 3600 unless Database.cache.nil?
+            many_to_many :nicks, :join_table => :nick_channels, :class => 'ModSpox::Models::Nick'
+            one_to_many :nick_modes, :class => 'ModSpox::Models::NickMode'
 
+            # chan_name:: string
+            # set channel name after downcase
             def name=(chan_name)
-                update_values :name => chan_name.downcase
+                chan_name.downcase!
+                super(chan_name)
+            end
+
+            def Channel.find_or_create(args)
+                args[:name].downcase! if args[:name]
+                super(args)
+            end
+
+            def Channel.filter(args)
+                args[:name].downcase! if args[:name]
+                super(args)
             end
 
             def Channel.locate(string, create = true)
@@ -25,43 +42,45 @@ module ModSpox
                 return chan
             end
 
-            # Modes for this channel
-            def channel_modes
-                ChannelMode.filter(:channel_id => pk)
+            # m:: single character mode
+            # returns if mode is currently set for
+            # channel
+            def set?(m)
+                return mode.nil? ? false : !mode.index(m).nil?
             end
 
-            # Nicks residing within this channel
-            def nicks
-                all_nicks = []
-                NickChannel.filter(:channel_id => pk).each do |nc|
-                    all_nicks << nc.nick
-                end
-                return all_nicks
+            # m:: single character mode
+            # set a mode for the channel
+            # TODO: add some type checks
+            def set_mode(m)
+                update(:mode => "#{values[:mode]}#{m}") if values[:mode].nil? || values[:mode].index(m).nil?
             end
 
-            # Adds a nick to this channel
-            def nick_add(nick)
-                NickChannel.find_or_create(:channel_id => pk, :nick_id => nick.pk)
+            # m:: single character mode
+            # unset a mode for the channel
+            def unset_mode(m)
+                update(:mode => values[:mode].gsub(m, ''))
             end
 
-            # Removes a nick from this channel
-            def nick_remove(nick)
-                NickChannel.filter(:channel_id => pk, :nick_id => nick.pk).first.destroy
-                if(NickChannel.filter(:channel_id => pk).count < 1)
-                    update_values :parked => false
-                end
+            def clear_modes
+                update(:mode => '')
             end
 
             # Removes all nicks from this channel
             def clear_nicks
-                NickChannel.filter(:channel_id => pk, :nick_id => nick.pk).each{|o| o.destroy}
-                update_values :parked => false
+                remove_all_nicks
             end
 
-            # Purges all channel information
-            def self.clean
-                Channel.set(:topic => nil, :parked => false)
-                ChannelMode.destroy_all
+            def add_nick(n)
+                unless(nicks_dataset.filter(:nick_id => n.pk).count > 0)
+                    super(n)
+                end
+            end
+
+            def remove_nick(n)
+                if(nicks_dataset.filter(:nick_id => n.pk).count > 0)
+                    super(n)
+                end
             end
 
         end

data/lib/mod_spox/models/Config.rb

@@ -7,32 +7,23 @@ module ModSpox
         # It is important to note this model is for storing configuration
         # values only. It will only store strings, not complex objects. If
         # you need to store an object, use the Setting model.
+        # TODO: find and remove any [] usage
         class Config < Sequel::Model
 
             def name=(config_name)
-                values[:name] = config_name.downcase
-            end
-            
-            def value=(val)
-                values[:value] = val
+                config_name.downcase!
+                super(config_name)
             end
 
-            # key:: name of the config item
-            # Returns the value of config item named the given key
-            def self.[](key)
-                key = key.to_s if key.is_a?(Symbol)
-                match = Config.filter(:name => key).first
-                return match ? match.value : nil
+            def Config.val(sym)
+                s = Config.filter(:name => "#{sym}").first
+                return s ? s.value : nil
             end
 
-            # key:: name of the config item
-            # val:: value of the config item
-            # Modifies or creates config item and stores the value
-            def self.[]=(key, val)
-                key = key.to_s if key.is_a?(Symbol)
-                model = Config.find_or_create(:name => key)
-                model.update_with_params(:value => val)
-                model.save
+            def Config.set(sym, value)
+                s = Config.find_or_create(:name => "#{sym}")
+                s.value = value
+                s.save
             end
         end
     end

data/lib/mod_spox/models/Group.rb

@@ -1,18 +1,30 @@
+require 'mod_spox/models/Auth'
+require 'mod_spox/models/Signature'
+
 module ModSpox
     module Models
+
         class Group < Sequel::Model
 
-            def name=(group_name)
-                update_values :name => group_name.downcase
+            many_to_many :auth_masks, :join_table => :auth_masks_groups, :class => 'ModSpox::Models::AuthMask'
+            many_to_many :auths, :join_table => :auth_groups, :class => 'ModSpox::Models::Auth'
+            one_to_many :signature, :class => 'ModSpox::Models::Signature'
+
+            def Group.filter(args={})
+                args[:name].downcase! if args.has_key?(:name)
+                super(args)
+            end
+            
+            def Group.find_or_create(args={})
+                args[:name].downcase! if args.has_key?(:name)
+                super(args)
             end
 
-            def auths
-                auth = []
-                AuthGroup.filter(:group_id => pk).each do |ag|
-                    auth << ag.auth
-                end
-                return auth
+            def name=(group_name)
+                group_name.downcase!
+                super(group_name)
             end
+            
         end
     end
 end