Changeset 6490

Timestamp:

02/10/08 15:18:03 (5 years ago)

Author:

drry

Message:

lang/ruby/chokan/trunk/plugins/uri_information.rb
lang/ruby/chokan/trunk/config.yaml.sample: citrus ブランチとだいたい同じ。

Location:

lang/ruby/chokan/trunk

Files:

• config.yaml.sample (modified) (1 diff)
• plugins/uri_information.rb (modified) (7 diffs)

lang/ruby/chokan/trunk/config.yaml.sample

@@ -19 +19 @@
 
   UriInformation:
-    accept_scheme:
+    accept_schemes:
       - http
       - https

lang/ruby/chokan/trunk/plugins/uri_information.rb

@@ -10 +10 @@
 class UriInformation < Chokan::PluginBase
         MAX_REDIRECT = 10
-        HEADER       = {
-                "User-Agent" => "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",
+        HEADERS      = {
+                "User-Agent" => "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12",
                 "Accept"     => "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
         }
 
-        def initialize(config, chokan)
-                super
-                @uri = /(#{URI.regexp(@config['accept_scheme']).to_s})/
-        end
-
         def on_privmsg(prefix, channel, message)
                 @channel = channel
-                message.scan(@uri) do |uri|
+                URI.extract(messages, @config['accept_schemes'] ||
+                                      @config['accept_scheme']) do |uri|
                         begin
-                                uri = uri[0]
                                 uri = URI(uri)
                                 mes = nil
@@ -95 +90 @@
                         }
                         data = data.collect {|k,v| "#{k}=#{URI.escape(v, /[^-.!~*'()\w]/n)}" }.join("&")
-                        res = http.post(login_uri.request_uri, data, HEADER)
+                        res = http.post(login_uri.request_uri, data, HEADERS)
                         if res.key?("set-cookie")
                                 res["set-cookie"].split(/\s*,\s*/).each do |c|
@@ -146 +141 @@
         end
 
-        def http(uri, header=HEADER, limit=MAX_REDIRECT)
+        def http(uri, headers=HEADERS, limit=MAX_REDIRECT)
                 return "Redirect loop?: last:#{uri}" if limit <= 0
 
@@ -154 +149 @@
                 http.use_ssl = (uri.scheme == "https")
                 http.start do |http|
-                        r = http.head(uri.request_uri, header)
+                        r = http.head(uri.request_uri, headers)
                         log r.code.inspect
                         case r.code
@@ -160 +155 @@
                                 case r["Content-Type"]
                                 when /html/
-                                        ret = html(http.get(uri.request_uri, header.merge({
+                                        ret = html(http.get(uri.request_uri, headers.merge({
                                                 "Range" => "0-5000"
                                         })))
                                 when /image/
-                                        ret = image(http.get(uri.request_uri, header))
+                                        ret = image(http.get(uri.request_uri, headers))
                                 else
                                         if r["Content-Length"]
@@ -178 +173 @@
                                 if auth
                                         auth = "Basic " + ["#{auth["user"]}:#{auth["pass"]}"].pack("m")
-                                        ret = http(uri, header.update({'Authorization' => auth}), limit-1)
+                                        ret = http(uri, headers.update({'Authorization' => auth}), limit-1)
                                 else
                                         ret = realm
@@ -185 +180 @@
                                 loc = URI(r["Location"])
                                 loc = uri + loc if loc.relative?
-                                ret = http(loc, header, limit-1)
+                                ret = http(loc, headers, limit-1)
                         else
                                 ret = "[#{r.code} #{r.message}]"