net-irc 0.0.7 → 0.0.8

data/examples/wig.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: UTF-8 -*-
+# vim:fileencoding=UTF-8:
 =begin
 
 # wig.rb
@@ -93,7 +93,7 @@ Ruby's by cho45
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"
 
-$KCODE = "u" # json use this
+$KCODE = "u" if RUBY_VERSION < "1.9" # json use this
 
 require "rubygems"
 require "net/irc"
@@ -145,7 +145,6 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		super
 		@channels   = {}
 		@user_agent = "#{self.class}/#{server_version} (wig.rb)"
-		@map        = nil
 		@counters   = {} # for jabber fav
 	end
 
@@ -182,7 +181,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		log "Client Options: #{@opts.inspect}"
 		@log.info "Client Options: #{@opts.inspect}"
 
-		@ratio  = Struct.new(:timeline, :friends, :channel).new(*(@opts["ratio"] || "10:3:5").split(":").map {|ratio| ratio.to_f })
+		@ratio   = Struct.new(:timeline, :friends, :channel).new(*(@opts["ratio"] || "10:3:5").split(":").map {|ratio| ratio.to_f })
 		@footing = @ratio.inject {|r,i| r + i }
 
 		@timeline = []
@@ -251,7 +250,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 	end
 
 	def on_privmsg(m)
-		return on_ctcp(m[0], ctcp_decoding(m[1])) if m.ctcp?
+		return m[1].ctcps.each {|ctcp| on_ctcp(m[0], ctcp) } if m.ctcp?
 		retry_count = 3
 		ret = nil
 		target, message = *m.params
@@ -259,7 +258,10 @@ class WassrIrcGateway < Net::IRC::Server::Session
 			if target =~ /^#(.+)/
 				channel = Regexp.last_match[1]
 				reply   = message[/\s+>(.+)$/, 1]
-				message = Iconv.iconv("UTF-7", "UTF-8", message).join.force_encoding("ASCII-8BIT") if @utf7
+				if @utf7
+					message = Iconv.iconv("UTF-7", "UTF-8", message).join
+					message = message.force_encoding("ASCII-8BIT") if message.respond_to?(:force_encoding)
+				end
 				if !reply && @opts.key?("alwaysim") && @im && @im.connected? # in jabber mode, using jabber post
 					message = "##{channel} #{message}" unless "##{channel}" == main_channel
 					ret = @im.deliver(jabber_bot_id, message)
@@ -314,8 +316,8 @@ class WassrIrcGateway < Net::IRC::Server::Session
 			end
 		when "fav"
 			target = args[0]
-			st  = @tmap[target]
-			id  = rid_for(target)
+			st     = @tmap[target]
+			id     = rid_for(target)
 			if st || id
 				unless id
 					if @im && @im.connected?
@@ -357,7 +359,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		end
 	rescue ApiFailed => e
 		log e.inspect
-	end
+	end; private :on_ctcp
 
 	def on_whois(m)
 		nick = m.params[0]
@@ -482,8 +484,8 @@ class WassrIrcGateway < Net::IRC::Server::Session
 
 		begin
 			require 'iconv'
-			mesg    = mesg.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
-			mesg    = "[utf7]: #{mesg}" if body =~ /[^a-z0-9\s]/i
+			mesg = mesg.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
+			mesg = "[utf7]: #{mesg}" if mesg =~ /[^a-z0-9\s]/i
 		rescue LoadError
 		rescue Iconv::IllegalSequence
 		end
@@ -575,8 +577,8 @@ class WassrIrcGateway < Net::IRC::Server::Session
 								body = CGI.unescapeHTML(body)
 								begin
 									require 'iconv'
-									body    = body.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
-									body    = "[utf7]: #{body}" if body =~ /[^a-z0-9\s]/i
+									body = body.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
+									body = "[utf7]: #{body}" if body =~ /[^a-z0-9\s]/i
 								rescue LoadError
 								rescue Iconv::IllegalSequence
 								end
@@ -646,7 +648,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 
 		case ret
 		when Net::HTTPOK # 200
-			ret = JSON.parse(ret.body.gsub(/'(y(?:es)?|no?|true|false|null)'/, '"\1"'))
+			ret = JSON.parse(ret.body)
 			raise ApiFailed, "Server Returned Error: #{ret["error"]}" if ret.kind_of?(Hash) && ret["error"]
 			ret
 		when Net::HTTPNotModified # 304
@@ -700,20 +702,18 @@ class WassrIrcGateway < Net::IRC::Server::Session
 	end
 
 	class TypableMap < Hash
-		Roma = %w|k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q|.unshift("").map {|consonant|
-			case
-			when consonant.size > 1, consonant == "y"
-				%w|a u o|
-			when consonant == "q"
-				%w|a i e o|
-			else
-				%w|a i u e o|
+		Roman = %w[
+			k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q
+		].unshift("").map do |consonant|
+			case consonant
+			when "y", /\A.{2}/ then %w|a u o|
+			when "q"           then %w|a i e o|
+			else                    %w|a i u e o|
 			end.map {|vowel| "#{consonant}#{vowel}" }
-		}.flatten
+		end.flatten
 
-		def initialize(size=1)
-			@seq  = Roma
-			@map  = {}
+		def initialize(size = 1)
+			@seq  = Roman
 			@n    = 0
 			@size = size
 		end
@@ -731,7 +731,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 			id = generate(@n)
 			self[id] = obj
 			@n += 1
-			@n = @n % (@seq.size ** @size)
+			@n %= @seq.size ** @size
 			id
 		end
 		alias << push

data/lib/net/irc.rb

@@ -2,22 +2,21 @@
 
 require "ostruct"
 require "socket"
-require "thread"
 require "logger"
 require "monitor"
 
 module Net; end
 
 module Net::IRC
-	VERSION = "0.0.7"
+	VERSION = "0.0.8".freeze
 	class IRCException < StandardError; end
 
 	require "net/irc/constants"
 	require "net/irc/pattern"
 
-	autoload :Message,   "net/irc/message"
-	autoload :Client,    "net/irc/client"
-	autoload :Server,    "net/irc/server"
+	autoload :Message, "net/irc/message"
+	autoload :Client,  "net/irc/client"
+	autoload :Server,  "net/irc/server"
 
 	class Prefix < String
 		def nick
@@ -32,28 +31,44 @@ module Net::IRC
 			extract[2]
 		end
 
-		# Extract prefix string to [nick, user, host] Array.
+		# Extract Prefix String to [nick, user, host] Array.
 		def extract
-			_, *ret = *self.match(/^([^\s!]+)(?:!([^\s@]+)@(\S+))?$/)
+			_, *ret = *self.match(/\A([^\s!]+)(?:!([^\s@]+)@(\S+))?\z/)
 			ret
 		end
 	end
 
-	# Encoding to CTCP message. Prefix and postfix \x01.
-	def ctcp_encoding(str)
-		str = str.gsub(/\\/, "\\\\\\\\").gsub(/\x01/, '\a')
-		str = str.gsub(/\x10/, "\x10\x10").gsub(/\x00/, "\x10\x30").gsub(/\x0d/, "\x10r").gsub(/\x0a/, "\x10n")
-		"\x01#{str}\x01"
+	# Encode to CTCP message. Prefix and postfix \x01.
+	def ctcp_encode(str)
+		"\x01#{ctcp_quote(str)}\x01"
 	end
-	module_function :ctcp_encoding
-
-	# Decoding to CTCP message. Remove \x01.
-	def ctcp_decoding(str)
-		str = str.gsub(/\x01/, "")
-		str = str.gsub(/\x10n/, "\x0a").gsub(/\x10r/, "\x0d").gsub(/\x10\x30/, "\x00").gsub(/\x10\x10/, "\x10")
-		str = str.gsub(/\\a/, "\x01").gsub(/\\\\/, "\\")
-		str
+	#alias :ctcp_encoding :ctcp_encode
+	module_function :ctcp_encode #, :ctcp_encoding
+
+	# Decode from CTCP message delimited with \x01.
+	def ctcp_decode(str)
+		ctcp_dequote(str.delete("\x01"))
+	end
+	#alias :ctcp_decoding :ctcp_decode
+	module_function :ctcp_decode #, :ctcp_decoding
+
+	def ctcp_quote(str)
+		low_quote(str.gsub("\\", "\\\\\\\\").gsub("\x01", "\\a"))
+	end
+	module_function :ctcp_quote
+
+	def ctcp_dequote(str)
+		low_dequote(str).gsub("\\a", "\x01").gsub(/\\(.|\z)/m, "\\1")
+	end
+	module_function :ctcp_dequote
+
+	private
+	def low_quote(str)
+		str.gsub("\x10", "\x10\x10").gsub("\x00", "\x10\x30").gsub("\r", "\x10r").gsub("\n", "\x10n")
+	end
+
+	def low_dequote(str)
+		str.gsub("\x10n", "\n").gsub("\x10r", "\r").gsub("\x10\x30", "\x00").gsub("\x10\x10", "\x10")
 	end
-	module_function :ctcp_decoding
 end
 

data/lib/net/irc/client.rb

@@ -66,7 +66,7 @@ class Net::IRC::Client
 	# Default RPL_WELCOME callback.
 	# This sets @prefix from the message.
 	def on_rpl_welcome(m)
-		@prefix = Prefix.new(m[1][/\S+$/])
+		@prefix = Prefix.new(m[1][/\S+\z/])
 	end
 
 	# Default RPL_ISUPPORT callback.
@@ -102,7 +102,13 @@ class Net::IRC::Client
 	#     post PRIVMSG, "#channel", "foobar"
 	def post(command, *params)
 		m = Message.new(nil, command, params.map {|s|
-			s ? s.gsub(/[\r\n]/, " ") : ""
+			if s
+				s.force_encoding("ASCII-8BIT") if s.respond_to? :force_encoding
+				#s.gsub(/\r\n|[\r\n]/, " ")
+				s.tr("\r\n", " ")
+			else
+				""
+			end
 		})
 
 		@log.debug "SEND: #{m.to_s.chomp}"

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

@@ -7,12 +7,12 @@ module Net::IRC::Client::ChannelManager
 		init_channel(channel)
 
 		@channels.synchronize do
-			m[3].split(/\s+/).each do |u|
-				_, mode, nick = *u.match(/^([@+]?)(.+)/)
+			m[3].split(" ").each do |u|
+				_, mode, nick = *u.match(/\A([@+]?)(.+)/)
 
 				@channels[channel][:users] << nick
 				@channels[channel][:users].uniq!
-				
+
 				op = @server_config.mode_parser.mark_to_op(mode)
 				if op
 					@channels[channel][:modes] << [op, nick]
@@ -64,10 +64,10 @@ module Net::IRC::Client::ChannelManager
 
 	# For managing channel
 	def on_kick(m)
-		users = m[1].split(/,/)
+		users = m[1].split(",")
 
 		@channels.synchronize do
-			m[0].split(/,/).each do |chan|
+			m[0].split(",").each do |chan|
 				init_channel(chan)
 				info = @channels[chan]
 				if info
@@ -105,8 +105,8 @@ module Net::IRC::Client::ChannelManager
 				info[:users].map! {|i|
 					(i == oldnick) ? newnick : i
 				}
-				info[:modes].map! {|m, target|
-					(target == oldnick) ? [m, newnick] : [m, target]
+				info[:modes].map! {|mode, target|
+					(target == oldnick) ? [mode, newnick] : [mode, target]
 				}
 			end
 		end
@@ -118,17 +118,17 @@ module Net::IRC::Client::ChannelManager
 		@channels.synchronize do
 			init_channel(channel)
 
-			mode = @server_config.mode_parser.parse(m)
-			mode[:negative].each do |m|
-				@channels[channel][:modes].delete(m)
+			modes = @server_config.mode_parser.parse(m)
+			modes[:negative].each do |mode|
+				@channels[channel][:modes].delete(mode)
 			end
 
-			mode[:positive].each do |m|
-				@channels[channel][:modes] << m
+			modes[:positive].each do |mode|
+				@channels[channel][:modes] << mode
 			end
 
 			@channels[channel][:modes].uniq!
-			[mode[:negative], mode[:positive]]
+			[modes[:negative], modes[:positive]]
 		end
 	end
 

data/lib/net/irc/constants.rb

@@ -208,7 +208,7 @@ module Net::IRC::Constants # :nodoc:
 	ISON                  = 'ISON'
 end
 
-Net::IRC::COMMANDS = Net::IRC::Constants.constants.inject({}) {|r,i| # :nodoc:
-	r.update(Net::IRC::Constants.const_get(i).to_s => i.to_s)
+Net::IRC::COMMANDS = Net::IRC::Constants.constants.inject({}) {|r, i| # :nodoc:
+	r.update(Net::IRC::Constants.const_get(i).to_s => i.to_s.freeze)
 }
 

data/lib/net/irc/message.rb

@@ -58,13 +58,10 @@ class Net::IRC::Message
 		if @params
 			f = false
 			@params.each do |param|
+				f = !f && (param.empty? || param[0] == ?: || param.include?(" "))
 				str << " "
-				if !f && (param.size == 0 || / / =~ param || /^:/ =~ param)
-					str << ":#{param}"
-					f = true
-				else
-					str << param
-				end
+				str << ":" if f
+				str << param
 			end
 		end
 
@@ -81,12 +78,22 @@ class Net::IRC::Message
 
 	# If the message is CTCP, return true.
 	def ctcp?
-		message = @params[1]
-		message[0] == ?\01 && message[message.length-1] == ?\01
+		#message = @params[1]
+		#message[0] == ?\01 && message[-1] == ?\01
+		/\x01(?>[^\x00\x01\r\n]*)\x01/ === @params[1]
+	end
+
+	def ctcps
+		messages = []
+		@params[1].gsub!(/\x01(?>[^\x00\x01\r\n]*)\x01/) do
+			messages << ctcp_decode($&)
+			""
+		end
+		messages
 	end
 
 	def inspect
-		'#<%s:0x%x prefix:%s command:%s params:%s>' % [
+		"#<%s:0x%x prefix:%s command:%s params:%s>" % [
 			self.class,
 			self.object_id,
 			@prefix,
@@ -97,6 +104,6 @@ class Net::IRC::Message
 
 	autoload :ModeParser, "net/irc/message/modeparser"
 	autoload :ServerConfig, "net/irc/message/serverconfig"
-	autoload :ISupportModeParser, "net/irc/message/isupportmodeparser"
+	#autoload :ISupportModeParser, "net/irc/message/isupportmodeparser"
 end # Message
 

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

@@ -6,7 +6,7 @@ class Net::IRC::Message::ModeParser
 	NO_PARAM               = 3
 
 	def initialize
-		@modes    = {}
+		@modes          = {}
 		@op_to_mark_map = {}
 		@mark_to_op_map = {}
 
@@ -14,7 +14,7 @@ class Net::IRC::Message::ModeParser
 		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
@@ -22,7 +22,7 @@ class Net::IRC::Message::ModeParser
 	def set(key, value)
 		case key
 		when :PREFIX
-			if value =~ /^\(([a-zA-Z]+)\)(.+)$/
+			if value =~ /\A\(([a-zA-Z]+)\)(.+)\z/
 				@op_to_mark_map = {}
 				key, value = Regexp.last_match[1], Regexp.last_match[2]
 				key.scan(/./).zip(value.scan(/./)) {|pair|
@@ -32,7 +32,7 @@ class Net::IRC::Message::ModeParser
 			end
 		when :CHANMODES
 			@modes = {}
-			value.split(/,/).each_with_index do |s,kind|
+			value.split(",").each_with_index do |s, kind|
 				s.scan(/./).each {|c|
 					@modes[c.to_sym] = kind
 				}
@@ -41,7 +41,7 @@ class Net::IRC::Message::ModeParser
 	end
 
 	def parse(arg)
-		params = arg.kind_of?(Net::IRC::Message) ? arg.to_a : arg.split(/\s+/)
+		params = arg.kind_of?(Net::IRC::Message) ? arg.to_a : arg.split(" ")
 		params.shift
 
 		ret = {

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

@@ -7,13 +7,13 @@ class Net::IRC::Message::ServerConfig
 	end
 
 	def set(arg)
-		params = arg.kind_of?(Net::IRC::Message) ? arg.to_a : arg.split(/\s+/)
+		params = arg.kind_of?(Net::IRC::Message) ? arg.to_a : arg.split(" ")
 
 		params[1..-1].each do |s|
 			case s
-			when /^:?are supported by this server$/
+			when /\A:?are supported by this server\z/
 				# Ignore
-			when /^([^=]+)=(.*)$/
+			when /\A([^=]+)=(.*)\z/
 				key = Regexp.last_match[1].to_sym
 				value = Regexp.last_match[2]
 				@config[key] = value

data/lib/net/irc/pattern.rb

@@ -6,7 +6,7 @@ module Net::IRC::PATTERN # :nodoc:
 	# special    =  %x5B-60 / %x7B-7D
 	#                  ; "[", "]", "\", "`", "_", "^", "{", "|", "}"
 	LETTER   = 'A-Za-z'
-	DIGIT    = '\d'
+	DIGIT    = '0-9'
 	HEXDIGIT = "#{DIGIT}A-Fa-f"
 	SPECIAL  = '\x5B-\x60\x7B-\x7D'
 
@@ -21,7 +21,7 @@ module Net::IRC::PATTERN # :nodoc:
 	SERVERNAME = HOSTNAME
 
 	# nickname   =  ( letter / special ) *8( letter / digit / special / "-" )
-	#NICKNAME = "[#{LETTER}#{SPECIAL}\\w][-#{LETTER}#{DIGIT}#{SPECIAL}]*"
+	#NICKNAME = "[#{LETTER}#{SPECIAL}#{DIGIT}_][-#{LETTER}#{DIGIT}#{SPECIAL}]*"
 	NICKNAME = "\\S+" # for multibytes
 
 	# user       =  1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF )