nadoka 0.8.1 → 0.8.2

data/ndk/config.rb

@@ -420,7 +420,7 @@ module Nadoka
       # use 4 gsub() because of the compatibility of RFC2813(3.2)
       ch = ch.toeuc.downcase.tr('[]\\~', '{}|^').tojis
       if ch.respond_to?(:force_encoding)
-        ch.force_encoding('ASCII-8BIT')
+        ch.force_encoding(Encoding::ASCII_8BIT)
       end
       ch
     end
@@ -478,11 +478,18 @@ module Nadoka
       if format.kind_of? Proc
         text = format.call(params)
       elsif format
+        if format.respond_to?(:force_encoding)
+          format.force_encoding(Encoding::ASCII_8BIT)
+        end
         text = format.gsub(/\{([a-z]+)\}|\{prefix\:([a-z]+)\}/){|key|
           if $2
             method = $2.intern
             if msgobj[:orig].respond_to?(:prefix)
-              (msgobj[:orig].prefix || '') =~ /^(.+?)\!(.+?)@(.+)/
+              prefix = msgobj[:orig].prefix || ''
+              if prefix.respond_to?(:force_encoding)
+                prefix.force_encoding(Encoding::ASCII_8BIT)
+              end
+              /^(.+?)\!(.+?)@(.+)/ =~ prefix
               case method
               when :nick
                 $1
@@ -496,6 +503,9 @@ module Nadoka
             end
           else
             if m = msgobj[$1.intern]
+              if m.respond_to?(:force_encoding)
+                m.force_encoding(Encoding::ASCII_8BIT)
+              end
               m
             else
               "!!unknown attribute: #{$1}!!"

data/ndk/server.rb

@@ -93,7 +93,7 @@ module Nadoka
           @logger.slog "Connection closed by server. Trying to reconnect."
           
           sleep @config.reconnect_delay
-          retry
+          retry unless @exitting
           
         rescue NDK_ReconnectToServer
           @connected = false
@@ -107,7 +107,7 @@ module Nadoka
           @logger.slog "Reconnect request (no server response, or client request)."
           
           sleep @config.reconnect_delay
-          retry
+          retry unless @exitting
           
         rescue Exception => e
           ndk_error e
@@ -173,6 +173,8 @@ module Nadoka
         when 'ERROR'
           msg = "Server login fail!(#{q})"
           @server_thread.raise NDK_ReconnectToServer
+        when '020'
+          # ignore
         else
           msg = "Server login fail!(#{q})"
           @logger.slog msg
@@ -419,9 +421,12 @@ module Nadoka
       }
       
       begin
-        @server_thread.join
+        sleep
       rescue Interrupt
         @exitting = true
+      rescue Nadoka::NDK_Error
+        @exitting = true
+        raise
       ensure
         @server_thread.kill  if @server_thread  && @server_thread.alive?
         @clients_thread.kill if @clients_thread && @clients_thread.alive?

data/ndk/version.rb

@@ -11,7 +11,7 @@
 #
 
 module Nadoka
-  VERSION  = '0.8.1'
+  VERSION  = '0.8.2'
   NDK_Version  = VERSION.dup
   NDK_Created  = Time.now
 

data/plugins/dictbot.nb

@@ -1,3 +1,4 @@
+# -*- ruby; coding: utf-8 -*- vim:set ft=ruby:
 =begin
 
 This plugin is test version.
@@ -11,15 +12,16 @@ require 'kconv'
 class DictBot < Nadoka::NDK_Bot
   def bot_initialize
     @available_channel = @bot_config[:ch] || /.*/
-    
+    @nkf = @bot_config[:nkf] || "-Wj"
   end
   
   
   def on_privmsg prefix, ch, msg
     if @available_channel === ch
+      msg = msg.toutf8
       if /\Adic(.)>\s*(.+)\s*/ =~ msg
-        res = yahoo_dict $1, $2.toeuc
-        send_notice(ch, res)
+        res = yahoo_dict $1, $2
+        send_notice(ch, NKF.nkf(@nkf, res))
       end
     end
   end
@@ -36,10 +38,10 @@ class DictBot < Nadoka::NDK_Bot
     "dict bot> " +
     if type = YAHOO_DICT_TYPE[type]
       word = URI.encode(word)
-      uri = "http://dic.yahoo.co.jp/dsearch?p=#{word}&stype=0&dtype=#{type}"
+      uri = "http://dic.yahoo.co.jp/dsearch?ei=UTF-8&p=#{word}&stype=0&dtype=#{type}"
       open(uri){|f|
         if /<meta name="description" content=\"(.+?)\">/ =~ f.read
-          "#{$1.tosjis.tojis} - #{uri}"
+          "#{$1} - #{uri}"
         else
           uri
         end
@@ -49,5 +51,3 @@ class DictBot < Nadoka::NDK_Bot
     end
   end
 end
-
-

data/plugins/googlebot.nb

@@ -1,4 +1,4 @@
-# -*-ruby-*-
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
 #
 # Copyright (c) 2004-2005 SASADA Koichi <ko1 at atdot.net>
 # Copyright (c) 2009, 2010 Kazuhiro NISHIYAMA
@@ -82,8 +82,9 @@ class GoogleBot < Nadoka::NDK_Bot
   def on_privmsg prefix, ch, msg
     return unless @available_channel === ch
     return if same_bot?(ch)
+    msg = NKF.nkf('-w', msg)
     if response = dispatch_command(msg)
-      send_notice(ch, response)
+      send_notice(ch, response.send(@ch_kcode))
     end
   end
 
@@ -181,7 +182,7 @@ class GoogleBot < Nadoka::NDK_Bot
       result.gsub!(/<sup>(.+?)<\/sup>/u) { "^(#{$1})" }
       result.gsub!(/<.+?>/u, '')
       result.gsub!(/&\#215;/u, "\303\227")
-      result.send(@ch_kcode) # NKF.nkf('-j', result)
+      result
     else
       "response error"
     end
@@ -201,7 +202,7 @@ class GoogleBot < Nadoka::NDK_Bot
     result = open(uri, @headers) do |f|
       JSON.parse(f.read)
     end
-    result[1].join(", ").send(@ch_kcode)
+    result[1].join(", ")
   end
 
   def google_code key
@@ -310,15 +311,18 @@ class GoogleBot < Nadoka::NDK_Bot
   end
 
   def show_char_code_and_erase_tag str
-    return CGI.unescapeHTML(erase_tag(str.toeuc)).send(@ch_kcode)
+    if str.respond_to?(:encode)
+      return CGI.unescapeHTML(erase_tag(str.toutf8))
+    end
+    return CGI.unescapeHTML(erase_tag(str.toeuc))
 
     case $KCODE
     when 'EUC', 'SJIS'
-      CGI.unescapeHTML(str.gsub(/\<.+?\>/, '')).send(@ch_kcode)
+      CGI.unescapeHTML(str.gsub(/\<.+?\>/, ''))
     when 'NONE', 'UTF-8'
       begin
         str = Iconv.conv("EUC-JP", "UTF-8", str)
-        CGI.unescapeHTML(str.gsub(/\<.+?\>/, '')).send(@ch_kcode)
+        CGI.unescapeHTML(str.gsub(/\<.+?\>/, ''))
       rescue => e
         "(char code problem: #{e.class}[#{e.message.dump}])"
       end
@@ -328,6 +332,9 @@ class GoogleBot < Nadoka::NDK_Bot
   end
 
   def search_char_code str
+    if str.respond_to?(:encode)
+      return str.toutf8
+    end
     case $KCODE
     when 'EUC', 'SJIS'
       str.toeuc

data/plugins/messagebot.nb

@@ -1,4 +1,4 @@
-# -*-ruby-*-
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
 #
 # Copyright (C) 2004 Kazuhiro NISHIYAMA
 #     All rights reserved.
@@ -14,6 +14,7 @@ BotConfig = [
   :message_file => 'message.yaml',
   :root_key     => Setting_name,
   :channels     => %w[#nadoka #Ruby:*.jp],
+  :nkf => "-Ww",
 },
 ]
 =end
@@ -29,6 +30,7 @@ class MessageBot < Nadoka::NDK_Bot
     @store = YAML::Store.new(@bot_config[:message_file])
     @root_key = @bot_config[:root_key]
     @channels = @bot_config[:channels].collect{|ch| ch.downcase }
+    @nkf = @bot_config[:nkf] || "-WjXm0"
     load_message
   end
 
@@ -56,7 +58,7 @@ class MessageBot < Nadoka::NDK_Bot
 
   def on_privmsg prefix, ch, msg
     user = prefix.nick
-    c = NKF.nkf('-e', ch.to_s).downcase
+    c = NKF.nkf('-w', ch.to_s).downcase
     return unless @channels.include?(c)
     u = user.downcase
     now = Time.now
@@ -67,14 +69,14 @@ class MessageBot < Nadoka::NDK_Bot
       message_id_list.each do |message_id|
         h = @message[message_id]
         next if h.key?('delivered')
-        message = "#{h['from']}���󤫤�#{h['to']}�����������#{h['body']}��"
-        send_notice(ch, NKF.nkf('-Ej -m0', message))
+        message = "#{h['from']}さんから#{h['to']}さんへ伝言「#{h['body']}」"
+        send_notice(ch, NKF.nkf(@nkf, message))
         @message[message_id]['delivered'] = now
       end
       @list.delete(key)
       save_message
     end
-    if /^���� (\S+) (.+)$/e =~ NKF.nkf('-e -m0', msg.to_s)
+    if /^伝言 (\S+) (.+)$/ =~ NKF.nkf('-w', msg.to_s)
       to_nick, body = $1, $2
       @message[message_id] = {
         'from' => user,
@@ -87,10 +89,8 @@ class MessageBot < Nadoka::NDK_Bot
       @list[key] ||= []
       @list[key].push(message_id)
       save_message
-      send_notice(ch, NKF.nkf('-Ej -m0', "#{$1}����ؤ������򾵤�ޤ��� > #{u}����"))
+      send_notice(ch, NKF.nkf(@nkf, "#{$1}さんへの伝言を承りました > #{u}さん"))
     end
   end
   
 end
-
-

data/plugins/rss_checkbot.nb

@@ -1,4 +1,4 @@
-# -*-ruby-*-
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
 #
 # Copyright (c) 2004-2005 SASADA Koichi <ko1 at atdot.net>
 #
@@ -58,11 +58,11 @@ class RSS_CheckBot < Nadoka::NDK_Bot
   def send_notice(ch, msg)
     if ch.respond_to? :each
       ch.each{|c|
-        super(c, msg)
+        super(c, msg.tojis)
         sleep 5 # Flood Protection
       }
     else
-      super(ch, msg)
+      super(ch, msg.tojis)
       sleep 5 # Flood Protection
     end
   end
@@ -97,14 +97,15 @@ class RSS_CheckBot < Nadoka::NDK_Bot
         items.each{|e|
           if e[:ccode] == 'UTF-8'
             begin
+              # convert from U+FF5E FULLWIDTH TILDE to U+301C WAVE DASH
               title = e[:title].gsub(/\357\275\236/u, "\343\200\234")
-              title = @ic.iconv(title).tojis
+              title = @ic.iconv(title)
             rescue Exception
               # maybe, char code translation error
               next
             end
           else
-            title = e[:title].tojis
+            title = e[:title]
           end
 
           send_notice(@ch, "rss bot: #{title} - #{e[:about]}")
@@ -118,4 +119,3 @@ class RSS_CheckBot < Nadoka::NDK_Bot
   end
   
 end
-

data/plugins/tenkibot.nb

@@ -1,4 +1,4 @@
-# -*-ruby-*-
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
 #
 # Copyright (c) 2004-2006 SASADA Koichi <ko1 at atdot.net>
 #
@@ -45,18 +45,14 @@ require 'kconv'
 require 'rexml/document'
 require 'date'
 
-
-class TenkiBot < Nadoka::NDK_Bot
-
+module Tenki
   CityIDs = {}
 
-  def bot_initialize
-    bot_init_utils
-
+  def init_tenki
     open('http://weather.livedoor.com/forecast/rss/forecastmap.xml'){|f|
       f.each{|line|
         if /city title="(.+?)" id="(\d+)"/ =~ line
-          CityIDs[$1.toeuc] = $2.to_i
+          CityIDs[$1.toutf8] = $2.to_i
         end
       }
     }
@@ -69,10 +65,10 @@ class TenkiBot < Nadoka::NDK_Bot
       REXML::Document.new f.read
     }
 
-    title = doc.elements['/lwws/title/'].text.toeuc
-    telop = doc.elements['/lwws/telop/'].text.toeuc
-    link = doc.elements['/lwws/link/'].text.toeuc
-    desc = doc.elements['/lwws/description/'].text.toeuc
+    title = doc.elements['/lwws/title/'].text.toutf8
+    telop = doc.elements['/lwws/telop/'].text.toutf8
+    link = doc.elements['/lwws/link/'].text.toutf8
+    desc = doc.elements['/lwws/description/'].text.toutf8
     max = doc.elements['/lwws/temperature/max/celsius/'].text
     min = doc.elements['/lwws/temperature/min/celsius/'].text
     date = Date.parse(doc.elements['/lwws/forecastdate/'].text)
@@ -86,15 +82,42 @@ class TenkiBot < Nadoka::NDK_Bot
     unless celsius.empty?
       celsius = "(#{celsius.join(', ')}) "
     end
-    "#{title} (#{datestr}): #{telop} - #{celsius}#{desc} - #{link}".tojis
+    "#{title} (#{datestr}): #{telop} - #{celsius}#{desc} - #{link}"
+  end
+end
+
+if __FILE__ == $0
+  include Tenki
+  city = ARGV.shift
+  timing = ARGV.shift || 'today'
+  if city.nil?
+    puts "#$0 city [today|tomorrow|dayaftertomorrow]"
+  else
+    init_tenki
+    begin
+      puts tenki(city, timing)
+    rescue IndexError
+      puts "Unknown city.  Check city title on http://weather.livedoor.com/forecast/rss/forecastmap.xml"
+    end
+  end
+  exit
+end
+
+class TenkiBot < Nadoka::NDK_Bot
+  include Tenki
+
+  def bot_initialize
+    bot_init_utils
+    init_tenki
+    @nkf = @bot_config[:nkf] || "-Wj"
   end
 
   def on_privmsg prefix, ch, msg
     return unless @available_channel === ch
     return if same_bot?(ch)
-
+    msg = NKF.nkf('-w', msg)
     if /\Atenki(|:(today|tomorrow|dayaftertomorrow))>(.+)/ =~ msg
-      city = $3.strip.toeuc
+      city = $3.strip.toutf8
       timing = ($2 || 'today').strip
       begin
         result = tenki(city, timing).gsub(/\n/, ' ')
@@ -103,9 +126,7 @@ class TenkiBot < Nadoka::NDK_Bot
       rescue => e
         result = "#{e}"
       end
-      send_notice ch, "tenki bot: #{result}"
+      send_notice ch, NKF.nkf(@nkf, "tenki bot: #{result}")
     end
   end
 end
-
-

data/rice/irc.rb

@@ -555,15 +555,17 @@ module RICE
       str << @command
 
       if @params
-        f = false
         @params.each do |param|
           str << ' '
-          if (param == @params[-1]) && (param.size == 0 || /(^:)|(\s)/ =~ param)
+          param_s = param.to_s
+          if param_s.respond_to?(:force_encoding)
+            param_s = param_s.dup.force_encoding(Encoding::ASCII_8BIT)
+          end
+          if (param == @params[-1]) && (param_s.size == 0 || /\A:|\s/ =~ param_s)
             str << ':'
-            str << param.to_s
-            f = true
+            str << param_s
           else
-            str << param.to_s
+            str << param_s
           end
         end
       end
@@ -658,7 +660,13 @@ E
         str << @params[0]
 
         str << ' :'
-        str << @params[1..-1].join(' ')
+        if "".respond_to?(:force_encoding)
+          str << @params[1..-1].map{|param|
+            param.force_encoding(Encoding::ASCII_8BIT)
+          }.join(' ')
+        else
+          str << @params[1..-1].join(' ')
+        end
 
         str << "\x0D\x0A"
         str
@@ -695,7 +703,11 @@ E
        003,RPL_CREATED
        004,RPL_MYINFO
        005,RPL_BOUNCE
+       010,RPL_REDIR
+       015,RPL_MAP 016,RPL_MAPMORE 017,RPL_MAPEND 018,RPL_MAPSTART
+       020,RPL_HELLO 042,RPL_YOURID 043,RPL_SAVENICK
        302,RPL_USERHOST 303,RPL_ISON 301,RPL_AWAY
+       304,RPL_TEXT
        305,RPL_UNAWAY 306,RPL_NOWAWAY 311,RPL_WHOISUSER
        312,RPL_WHOISSERVER 313,RPL_WHOISOPERATOR
        317,RPL_WHOISIDLE 318,RPL_ENDOFWHOIS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nadoka
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Nadoka is a tool for monitoring and logging IRC conversations and responding
   to specially formatted requests. You define and customize these responses in Ruby.