Changeset 2867 for lang/ruby/ssb

Timestamp:

12/08/07 17:20:07 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: fix some bugs. use WEBrick::HTTPUtils instaed of CGI.encode, form regexp

Location:

lang/ruby/ssb/trunk/libs

Files:

• ssb.rb (modified) (3 diffs)
• ssb/request.rb (modified) (2 diffs)

lang/ruby/ssb/trunk/libs/ssb.rb

@@ -152 +152 @@
 
       # form action と a href と img src のURLを書き換え
-      page = page.gsub(/ (action|href|src|data)[ ]*=[ ]*[\"']?([^>\"' ]+)[\"']?([^>]*)>/im) { |s|
+      page = page.gsub(/ (action|href|src|data)\s*=\s*[\"']?([^>\"'\s]+)[\"']?([^>]*)>/im) { |s|
         begin
           tag = $1.downcase
@@ -161 +161 @@
               %Q! #{tag}="#{$2}"#{$3} target="_top" >!
             when '/'
-              %Q! #{tag}="./?ssb_q=#{CGI.escape(('http://' + request_uri.host + ':' + request_uri.port.to_s + $2).to_s)}"#{$3} target="_top" >!
+              %Q! #{tag}="./?ssb_q=#{WEBrick::HTTPUtils.escape_form(('http://' + request_uri.host + ':' + request_uri.port.to_s + $2).to_s)}"#{$3} target="_top" >!
             else
-              %Q! #{tag}="./?ssb_q=#{CGI.escape((request_uri + $2).to_s)}"#{$3} target="_top" >!
+              %Q! #{tag}="./?ssb_q=#{WEBrick::HTTPUtils.escape_form((request_uri + $2).to_s)}"#{$3} target="_top" >!
             end
           when 'action'
@@ -174 +174 @@
 
       # xx-small/xx-large を手加減
-      page.gsub!(/xx-small/im,'small')
+      page.gsub!(/xx-small/im, 'small')
       page.gsub!(/xx-large/im, 'large')
       # 絵文字を <img> に変換

lang/ruby/ssb/trunk/libs/ssb/request.rb

@@ -54 +54 @@
 
     def execute
+      return nil if @uri.to_s == 'about:blank'
+
       response = nil
-      return nil if @uri.scheme == 'about'
-
       http = http_class(@http_proxy).new(@uri.host, @uri.port)
       if @uri.scheme == 'https'
@@ -89 +89 @@
         else
           uri_params << in_query[key].list.map do |value|
-            "#{NKF::nkf('-s', key.dup.untaint)}=#{CGI.escape(NKF::nkf('-s', value.dup.untaint))}"
+            "#{NKF::nkf('-s', key.dup.untaint)}=#{WEBrick::HTTPUtils.escape(NKF::nkf('-s', value.dup.untaint))}"
           end
         end