Changeset 19622 for lang/ruby

Timestamp:

09/19/08 21:10:15 (2 months ago)

Author:

drry

Message:

• HTTP 応答の判定を変更しました。
  

Location:

lang/ruby/citrus/trunk/plugins

Files:

• aa.rb (modified) (1 diff)
• auto_uri_escape.rb (modified) (1 diff)
• http/default.rb (modified) (3 diffs)

lang/ruby/citrus/trunk/plugins/aa.rb

@@ -59 +59 @@
                         begin
                                 r = http.get("/?quality=8&size=8&color=on&html=1&url=#{URI.encode(keyword, /[^-.!~*'()\w]/n)}")
-                                case r.code.to_i
-                                when 200
+                                case r
+                                when Net::HTTPOK # 200
                                         xml = Hpricot(r.body)
                                         m = xml.at('pre').inner_html

lang/ruby/citrus/trunk/plugins/auto_uri_escape.rb

@@ -45 +45 @@
                         res = http.head uri.request_uri, { 'User-Agent' => @ua }
                 end
-                case res.code.to_i
-                when 200 .. 299
+                case res
+                when Net::HTTPSuccess # 2xx
                         uri.to_s
-                when 300 .. 399
+                when Net::HTTPRedirection # 3xx
                         return uri.to_s unless res.key?('Location')
                         follow_uri(res['Location'], limit - 1)

lang/ruby/citrus/trunk/plugins/http/default.rb

@@ -33 +33 @@
                         r = http.head(uri.request_uri, headers)
                         log r.code.inspect
-                        case r.code.to_i
-                        when 200
+                        case r
+                        when Net::HTTPOK # 200
                                 case r["Content-Type"]
                                 when /html/
@@ -50 +50 @@
                                         end
                                 end
-                        when 401
+                        when Net::HTTPUnauthorized # 401
                                 realm = r["WWW-Authenticate"][/Basic realm="([^"]+)"/, 1]
                                 auth  = (@parent.config["http_auth"] || []).find {|e| e["host"] == uri.host and e["realm"] == realm }
@@ -59 +59 @@
                                         ret = realm
                                 end
-                        when 300 .. 399
+                        when Net::HTTPRedirection # 300 .. 399
                                 loc = URI(r["Location"])
                                 loc = uri + loc if loc.relative?