Changeset 38384 for platform

Timestamp:

08/30/10 22:57:15 (3 years ago)

Author:

kayakaya

Message:

using Net::HTTP substitute for open-uri to avoid error in ruby-1.9.2

Files:

• platform/tdiary/plugin/search-yahoo.rb (modified) (2 diffs)

platform/tdiary/plugin/search-yahoo.rb

@@ -12 +12 @@
 #
 
-require 'open-uri'
 require 'timeout'
 require 'rexml/document'
+require 'net/http'
+Net::HTTP.version_1_2
 
 def search_title
@@ -38 +39 @@
         proxy = @conf['proxy']
         proxy = 'http://' + proxy if proxy
-        timeout( 20 ) do
-                open( url, :proxy => proxy ) {|f| f.read }
+        
+        proxy_host, proxy_port = nil
+        if proxy
+                proxy_host = proxy_uri.host
+                proxy_port = proxy_uri.port
         end
+        proxy_class = Net::HTTP::Proxy(proxy_host, proxy_port)
+
+        query = URI.parse(url)
+        req = Net::HTTP::Get.new(query.request_uri)
+        http = proxy_class.new(query.host, query.port)
+        http.open_timeout = 20
+        http.read_timeout = 20
+        res = http.start do
+                http.request(req)
+        end
+        res.body
 end