Changeset 5857

Timestamp:

01/30/08 10:18:53 (5 years ago)

Author:

drry

Message:

lang/ruby/chokan/trunk/plugins/auto_uri_escape.rb:

• use Net::HTTP 1.2
  
• add REVISION constant and User-Agent HTTP header
  
• use URI, URI.regexp instead of regexps
  
• change the sorting order of the encodings
  
• fix the scope of a status code to consider that URL exists
  

Files:

• lang/ruby/chokan/trunk/plugins/auto_uri_escape.rb (modified) (1 diff)

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

@@ -4 +4 @@
 require 'net/http'
 
+Net::HTTP.version_1_2
+
 class AutoUriEscape < Chokan::PluginBase
+        REVISION = '$Rev: $'.gsub(/\D+/, '').to_i
+        def initialize(config, chokan)
+                super
+                @shunirr    = @config['shunirr'] || ' x shunirr'
+                @user_agent = @config['user_agent'] || "#{self.class}/#{REVISION} (chokan#{@shunirr})"
+        end
+
         def on_privmsg(prefix, channel, message)
-                if  @config['channel'].include?(channel) && /^http/ =~ message
-                        uri = message
-                        mes = nil
-                        f   = false
-                        if uri == URI.escape(uri) || uri.include?('%')
-                                return
-                        end
-                        [Iconv.conv('Shift_JIS', 'UTF-8', uri), 
-                                Iconv.conv('EUC-JP', 'UTF-8', uri),
-                                uri].each do |u|
-                                mes = URI.escape u
-                                if uri_exist? mes
-                                        f = true
+                unless @config['channel'].include?(channel) &&
+                       URI.regexp(['http']).match(message) # message[/^http/]
+                        return
+                end
+                res = []
+                message.split.each do |m|
+                        next if m == URI.escape(m) || m.include?('%')
+                        [
+                                m,
+                                Iconv.conv('EUC-JP',    'UTF-8', m),
+                                Iconv.conv('Shift_JIS', 'UTF-8', m),
+                        ].each do |u|
+                                u   = URI.escape u
+                                uri = URI.extract(u, ['http']).first
+                                if uri && uri_exist?(uri)
+                                        res << uri
                                         break
                                 end
-                                end
-                        unless f
-                                return
                         end
-                        notice channel, mes
                 end
+                res.uniq!
+                return if res.empty?
+                notice channel, res.join(' ')
         end
 
         private
         def uri_exist?(uri)
-                uri = /^http:\/\/([-_.a-zA-Z0-9]+)\/(.+)$/.match(uri).to_a
+                uri = URI.parse uri
                 res = nil
-                Net::HTTP.start(uri[1], 80) do |http|
+                Net::HTTP.start(uri.host, uri.port) do |http|
+                        #uri.open_timeout = 1
                         begin
-                                res = http.head "/#{uri[2]}"
+                                res = http.head uri.request_uri, { 'User-Agent' => @user_agent }
                         rescue
                                 return false
                         end
                 end
-                return (res.code == '200') ? true : false
+                return (200 .. 399).include?(res.code.to_i)
         end
 end