net-irc 0.0.4 → 0.0.5

data/lib/net/irc.rb

@@ -9,7 +9,7 @@ require "monitor"
 module Net; end
 
 module Net::IRC
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 	class IRCException < StandardError; end
 
 	require "net/irc/constants"

data/lib/net/irc/client.rb

@@ -6,10 +6,11 @@ class Net::IRC::Client
 	attr_reader :prefix, :channels
 
 	def initialize(host, port, opts={})
-		@host = host
-		@port = port
-		@opts = OpenStruct.new(opts)
-		@log  = @opts.logger || Logger.new($stdout)
+		@host          = host
+		@port          = port
+		@opts          = OpenStruct.new(opts)
+		@log           = @opts.logger || Logger.new($stdout)
+		@server_config = Message::ServerConfig.new
 		@channels = {
 #			"#channel" => {
 #				:modes => [],
@@ -21,6 +22,8 @@ class Net::IRC::Client
 
 	# Connect to server and start loop.
 	def start
+		# reset config
+		@server_config = Message::ServerConfig.new
 		@socket = TCPSocket.open(@host, @port)
 		on_connected
 		post PASS, @opts.pass if @opts.pass
@@ -66,136 +69,17 @@ class Net::IRC::Client
 		@prefix = Prefix.new(m[1][/\S+$/])
 	end
 
+	# Default RPL_ISUPPORT callback.
+	# This detects server's configurations.
+	def on_rpl_isupport(m)
+		@server_config.set(m)
+	end
+
 	# Default PING callback. Response PONG.
 	def on_ping(m)
 		post PONG, @prefix ? @prefix.nick : ""
 	end
 
-	# For managing channel
-	def on_rpl_namreply(m)
-		type    = m[1]
-		channel = m[2]
-		init_channel(channel)
-
-		@channels.synchronize do
-			m[3].split(/\s+/).each do |u|
-				_, mode, nick = *u.match(/^([@+]?)(.+)/)
-
-				@channels[channel][:users] << nick
-				@channels[channel][:users].uniq!
-
-				case mode
-				when "@" # channel operator
-					@channels[channel][:modes] << [:o, nick]
-				when "+" # voiced (under moderating mode)
-					@channels[channel][:modes] << [:v, nick]
-				end
-			end
-
-			case type
-			when "@" # secret
-				@channels[channel][:modes] << [:s, nil]
-			when "*" # private
-				@channels[channel][:modes] << [:p, nil]
-			when "=" # public
-			end
-
-			@channels[channel][:modes].uniq!
-		end
-	end
-
-	# For managing channel
-	def on_part(m)
-		nick    = m.prefix.nick
-		channel = m[0]
-		init_channel(channel)
-
-		@channels.synchronize do
-			info = @channels[channel]
-			if info
-				info[:users].delete(nick)
-				info[:modes].delete_if {|u|
-					u[1] == nick
-				}
-			end
-		end
-	end
-
-	# For managing channel
-	def on_quit(m)
-		nick = m.prefix.nick
-
-		@channels.synchronize do
-			@channels.each do |channel, info|
-				info[:users].delete(nick)
-				info[:modes].delete_if {|u|
-					u[1] == nick
-				}
-			end
-		end
-	end
-
-	# For managing channel
-	def on_kick(m)
-		users = m[1].split(/,/)
-
-		@channels.synchronize do
-			m[0].split(/,/).each do |chan|
-				init_channel(chan)
-				info = @channels[chan]
-				if info
-					users.each do |nick|
-						info[:users].delete(nick)
-						info[:modes].delete_if {|u|
-							u[1] == nick
-						}
-					end
-				end
-			end
-		end
-	end
-
-	# For managing channel
-	def on_join(m)
-		nick    = m.prefix.nick
-		channel = m[0]
-
-		@channels.synchronize do
-			init_channel(channel)
-
-			@channels[channel][:users] << nick
-			@channels[channel][:users].uniq!
-		end
-	end
-
-	# For managing channel
-	def on_mode(m)
-		channel = m[0]
-		@channels.synchronize do
-			init_channel(channel)
-
-			mode = Message::ModeParser::RFC1459::Channel.parse(m)
-			mode[:negative].each do |m|
-				@channels[channel][:modes].delete(m)
-			end
-
-			mode[:positive].each do |m|
-				@channels[channel][:modes] << m
-			end
-
-			@channels[channel][:modes].uniq!
-			[mode[:negative], mode[:positive]]
-		end
-	end
-
-	# For managing channel
-	def init_channel(channel)
-		@channels[channel] ||= {
-			:modes => [],
-			:users => [],
-		}
-	end
-
 	# Do nothing.
 	# This is for avoiding error on calling super.
 	# So you can always call super at subclass.

data/lib/net/irc/client/channel_manager.rb

@@ -0,0 +1,144 @@
+
+module Net::IRC::Client::ChannelManager
+	# For managing channel
+	def on_rpl_namreply(m)
+		type    = m[1]
+		channel = m[2]
+		init_channel(channel)
+
+		@channels.synchronize do
+			m[3].split(/\s+/).each do |u|
+				_, mode, nick = *u.match(/^([@+]?)(.+)/)
+
+				@channels[channel][:users] << nick
+				@channels[channel][:users].uniq!
+				
+				op = @server_config.mode_parser.mark_to_op(mode)
+				if op
+					@channels[channel][:modes] << [op, nick]
+				end
+			end
+
+			case type
+			when "@" # secret
+				@channels[channel][:modes] << [:s, nil]
+			when "*" # private
+				@channels[channel][:modes] << [:p, nil]
+			when "=" # public
+			end
+
+			@channels[channel][:modes].uniq!
+		end
+	end
+
+	# For managing channel
+	def on_part(m)
+		nick    = m.prefix.nick
+		channel = m[0]
+		init_channel(channel)
+
+		@channels.synchronize do
+			info = @channels[channel]
+			if info
+				info[:users].delete(nick)
+				info[:modes].delete_if {|u|
+					u[1] == nick
+				}
+			end
+		end
+	end
+
+	# For managing channel
+	def on_quit(m)
+		nick = m.prefix.nick
+
+		@channels.synchronize do
+			@channels.each do |channel, info|
+				info[:users].delete(nick)
+				info[:modes].delete_if {|u|
+					u[1] == nick
+				}
+			end
+		end
+	end
+
+	# For managing channel
+	def on_kick(m)
+		users = m[1].split(/,/)
+
+		@channels.synchronize do
+			m[0].split(/,/).each do |chan|
+				init_channel(chan)
+				info = @channels[chan]
+				if info
+					users.each do |nick|
+						info[:users].delete(nick)
+						info[:modes].delete_if {|u|
+							u[1] == nick
+						}
+					end
+				end
+			end
+		end
+	end
+
+	# For managing channel
+	def on_join(m)
+		nick    = m.prefix.nick
+		channel = m[0]
+
+		@channels.synchronize do
+			init_channel(channel)
+
+			@channels[channel][:users] << nick
+			@channels[channel][:users].uniq!
+		end
+	end
+
+	# For managing channel
+	def on_nick(m)
+		oldnick = m.prefix.nick
+		newnick = m[0]
+
+		@channels.synchronize do
+			@channels.each do |channel, info|
+				info[:users].map! {|i|
+					(i == oldnick) ? newnick : i
+				}
+				info[:modes].map! {|m, target|
+					(target == oldnick) ? [m, newnick] : [m, target]
+				}
+			end
+		end
+	end
+
+	# For managing channel
+	def on_mode(m)
+		channel = m[0]
+		@channels.synchronize do
+			init_channel(channel)
+
+			mode = @server_config.mode_parser.parse(m)
+			mode[:negative].each do |m|
+				@channels[channel][:modes].delete(m)
+			end
+
+			mode[:positive].each do |m|
+				@channels[channel][:modes] << m
+			end
+
+			@channels[channel][:modes].uniq!
+			[mode[:negative], mode[:positive]]
+		end
+	end
+
+	# For managing channel
+	def init_channel(channel)
+		@channels[channel] ||= {
+			:modes => [],
+			:users => [],
+		}
+	end
+
+end
+

data/lib/net/irc/constants.rb

@@ -3,7 +3,7 @@ module Net::IRC::Constants # :nodoc:
 	RPL_YOURHOST          = '002'
 	RPL_CREATED           = '003'
 	RPL_MYINFO            = '004'
-	RPL_BOUNCE            = '005'
+	RPL_ISUPPORT          = '005'
 	RPL_USERHOST          = '302'
 	RPL_ISON              = '303'
 	RPL_AWAY              = '301'

data/lib/net/irc/message.rb

@@ -76,7 +76,7 @@ class Net::IRC::Message
 
 	# Same as params.
 	def to_a
-		@params
+		@params.dup
 	end
 
 	# If the message is CTCP, return true.
@@ -96,5 +96,7 @@ class Net::IRC::Message
 	end
 
 	autoload :ModeParser, "net/irc/message/modeparser"
+	autoload :ServerConfig, "net/irc/message/serverconfig"
+	autoload :ISupportModeParser, "net/irc/message/isupportmodeparser"
 end # Message
 

data/lib/net/irc/message/modeparser.rb

@@ -1,44 +1,85 @@
 class Net::IRC::Message::ModeParser
 
-	def initialize(require_arg, definition)
-		@require_arg = require_arg.map {|i| i.to_sym }
-		@definition  = definition
+	ONE_PARAM_MASK         = 0
+	ONE_PARAM              = 1
+	ONE_PARAM_FOR_POSITIVE = 2
+	NO_PARAM               = 3
+
+	def initialize
+		@modes    = {}
+		@op_to_mark_map = {}
+		@mark_to_op_map = {}
+
+		# Initialize for ircd 2.11 (RFC2812+)
+		set(:CHANMODES, 'beIR,k,l,imnpstaqr')
+		set(:PREFIX, '(ov)@+')
+	end
+	
+	def mark_to_op(mark)
+		mark.empty? ? nil : @mark_to_op_map[mark.to_sym]
+	end
+
+	def set(key, value)
+		case key
+		when :PREFIX
+			if value =~ /^\(([a-zA-Z]+)\)(.+)$/
+				@op_to_mark_map = {}
+				key, value = Regexp.last_match[1], Regexp.last_match[2]
+				key.scan(/./).zip(value.scan(/./)) {|pair|
+					@op_to_mark_map[pair[0].to_sym] = pair[1].to_sym
+				}
+				@mark_to_op_map = @op_to_mark_map.invert
+			end
+		when :CHANMODES
+			@modes = {}
+			value.split(/,/).each_with_index do |s,kind|
+				s.scan(/./).each {|c|
+					@modes[c.to_sym] = kind
+				}
+			end
+		end
 	end
 
 	def parse(arg)
 		params = arg.kind_of?(Net::IRC::Message) ? arg.to_a : arg.split(/\s+/)
+		params.shift
 
-		ret =  {
+		ret = {
 			:positive => [],
 			:negative => [],
 		}
 
-		current = nil, arg_pos = 0
-		params[1].each_byte do |c|
-			sym = c.chr.to_sym
-			case sym
-			when :+
-				current = ret[:positive]
-			when :-
-				current = ret[:negative]
-			else
-				case
-				when @require_arg.include?(sym)
-					current << [sym, params[arg_pos + 2]]
-					arg_pos += 1
-				when @definition.key?(sym)
-					current << [sym, nil]
+		current = ret[:positive]
+		until params.empty?
+			s = params.shift
+			s.scan(/./).each do |c|
+				c = c.to_sym
+				case c
+				when :+
+					current = ret[:positive]
+				when :-
+					current = ret[:negative]
 				else
-					# fallback, should raise exception
-					# but not for convenience
-					current << [sym, nil]
+					case @modes[c]
+					when ONE_PARAM_MASK,ONE_PARAM
+						current << [c, params.shift]
+					when ONE_PARAM_FOR_POSITIVE
+						if current.equal?(ret[:positive])
+							current << [c, params.shift]
+						else
+							current << [c, nil]
+						end
+					when NO_PARAM
+						current << [c, nil]
+					else
+						if @op_to_mark_map[c]
+							current << [c, params.shift]
+						end
+					end
 				end
 			end
 		end
 
 		ret
 	end
-
-	autoload :RFC1459,  "net/irc/message/modeparser/rfc1459"
-	autoload :Hyperion, "net/irc/message/modeparser/hyperion"
 end