Changeset 33440 for lang/ruby

Timestamp:

05/20/09 14:15:35 (4 years ago)

Author:

drry

Message:

• (tig.rb) NAMES 応答が長くなり過ぎる問題を修正しました。
  
• (tig.rb) 短縮偽装された URL が HTTPS スキームの場合にタイムラインがエラーで次回の取得まで停止し、つぶやきそのものがなかったことになってしまうバグを修正しました。
  
• (tig.rb) ほか。
  

Location:

lang/ruby/net-irc/trunk

Files:

• examples/tig.rb (modified) (14 diffs)
• lib/net/irc/server.rb (modified) (2 diffs)

lang/ruby/net-irc/trunk/examples/tig.rb

@@ -171 +171 @@
 require "rubygems"
 require "net/irc"
-require "net/https"
+require "net/http"
 require "uri"
 require "socket"
@@ -178 +178 @@
 require "yaml"
 require "pathname"
-require "cgi"
 require "json"
 
@@ -240 +239 @@
                 @real, *@opts = (@opts.name || @real).split(/\s+/)
                 @opts = @opts.inject({}) do |r, i|
-                        key, value = i.split("=")
+                        key, value = i.split("=", 2)
                         key = "mentions" if key == "replies" # backcompat
                         r.update key => case value
@@ -295 +294 @@
                 @ratio = (@opts["ratio"] || "77:1").split(":")
                 @ratio = Struct.new(:timeline, :friends, :mentions).new(*@ratio)
-                @ratio[:mentions] ||= @opts["mentions"] == true ? 12 : @opts["mentions"]
+                @ratio.mentions ||= @opts["mentions"] == true ? 12 : @opts["mentions"]
 
                 @check_friends_thread = Thread.start do
@@ -309 +308 @@
                                         end
                                 end
-                                sleep interval(@ratio[:friends])
+                                sleep interval(@ratio.friends)
                         end
                 end
@@ -333 +332 @@
                                         end
                                 end
-                                sleep interval(@ratio[:timeline])
+                                sleep interval(@ratio.timeline)
                         end
                 end
@@ -340 +339 @@
 
                 @check_mentions_thread = Thread.start do
-                        sleep interval(@ratio[:timeline]) / 2
+                        sleep interval(@ratio.timeline) / 2
 
                         loop do
@@ -353 +352 @@
                                         end
                                 end
-                                sleep interval(@ratio[:mentions])
+                                sleep interval(@ratio.mentions)
                         end
                 end
@@ -529 +528 @@
                                         return
                                 end
-                                @ratio[:timeline] = ratios[0]
-                                @ratio[:friends]  = ratios[1]
-                                @ratio[:mentions] = ratios[2] if @opts["mentions"]
+                                @ratio.timeline = ratios[0]
+                                @ratio.friends  = ratios[1]
+                                @ratio.mentions = ratios[2] if @opts["mentions"]
                         end
                         log "Intervals: " << @ratio.map {|ratio| interval(ratio).round }.join(", ")
@@ -890 +889 @@
                 first   = @friends.nil?
                 athack  = @opts["athack"]
-                friends = api("statuses/friends")
+                friends = []
+
+                1.upto(1) do |page|
+                        friends += api("statuses/friends", { :page => page })
+                        c ||= friends.size
+                        break if c * page >= @me["friends_count"]
+                        #sleep 0.5
+                end
+
                 if first and not athack
-                        names_list = friends.map do |i|
+                        rest = friends.map do |i|
                                 name   = i["screen_name"]
-                                #prefix = @drones.include?(i["id"]) ? "%" : "+" # FIXME
+                                #prefix = @drones.include?(i["id"]) ? "%" : "+" # FIXME ~&%
                                 prefix = "+"
                                 "#{prefix}#{name}"
-                        end
-                        names_list = names_list.push("@#{@nick}").reverse.join(" ")
-                        post server_name, RPL_NAMREPLY,   @nick, "=", main_channel, names_list
+                        end.reverse.inject("@#{@nick}") do |r, nick|
+                                if r.size < 400
+                                        r << " " << nick
+                                else
+                                        post server_name, RPL_NAMREPLY, @nick, "=", main_channel, r
+                                        nick
+                                end
+                        end
+                        post server_name, RPL_NAMREPLY, @nick, "=", main_channel, rest
                         post server_name, RPL_ENDOFNAMES, @nick, main_channel, "End of NAMES list"
                 else
@@ -944 +957 @@
                         loop do
                                 begin
+                                        require "cgi"
                                         @im.received_messages.each do |msg|
                                                 @log.debug [msg.from, msg.body]
@@ -1016 +1030 @@
                 @log.debug uri.inspect
 
+                require "net/https" if @opts["secure"]
+
                 http = case
                         when RE_HTTPPROXY === @opts["httpproxy"]
@@ -1123 +1139 @@
 
         def fetch_location_header(uri, limit = 3)
-                return uri if limit == 0 or uri.nil?
+                return uri if limit == 0 or uri.nil? or uri.is_a? URI::HTTPS
                 req = Net::HTTP::Head.new uri.request_uri
                 req.add_field "User-Agent", user_agent
@@ -1189 +1205 @@
         def http_get(uri)
                 accepts = ["*/*;q=0.1"]
-                #require 'mime/types'; accepts.unshift MIME::Types.of(uri.path).first.simplified
+                #require "mime/types"; accepts.unshift MIME::Types.of(uri.path).first.simplified
                 types   = { "json" => "application/json", "txt" => "text/plain" }
                 ext     = uri.path[/[^.]+\z/]

lang/ruby/net-irc/trunk/lib/net/irc/server.rb

@@ -80 +80 @@
                 def initialize(server, socket, logger, opts={})
                         @server, @socket, @log, @opts = server, socket, logger, opts
-                        @prefix = nil
                 end
 
@@ -128 +127 @@
                 def on_nick(m)
                         @nick = m.params[0]
-                        @prefix &&= Prefix.new("#{@nick}!#{@user}@#{@host}")
+                        @prefix = Prefix.new("#{@nick}!#{@user}@#{@host}") if defined? @prefix
                 end