Changeset 2916 for lang/ruby/ssb

Timestamp:

12/09/07 03:17:17 (13 months ago)

Author:

lchin

Message:

lang/ruby/ssb: (refactor) moved exception handling into Request#execute

Location:

lang/ruby/ssb/trunk/libs

Files:

• ssb.rb (modified) (1 diff)
• ssb/request.rb (modified) (1 diff)

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

@@ -92 +92 @@
       # リクエスト
       source = ''
-      response = nil
-      begin
-        response = @request.execute
-      rescue =>e
-        response = e.to_s + '<hr />' + e.backtrace.to_s
-      end
+      response = @request.execute
+
       # リクエスト終了
       @time_stamp.stamp(:request_finish)

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

@@ -55 +55 @@
     def execute
       return nil if @uri.to_s == 'about:blank'
-
-      response = nil
-      http = http_class(@http_proxy).new(@uri.host, @uri.port)
-      if @uri.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      begin
+        http = http_class(@http_proxy).new(@uri.host, @uri.port)
+        if @uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        http.start do
+          case method
+          when 'GET'
+            http.get(@uri.request_uri, request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
+                                                              'x-ssb' => 'server-side-browser'}))
+          when 'POST'
+            http.post(@uri.request_uri,
+                      @post_params,
+                      request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
+                                             'Content-Type' => 'application/x-www-form-urlencoded',
+                                             'x-ssb' => 'server-side-browser'
+                                             }))
+          else
+            nil
+          end
+        end
+      rescue =>e
+        e.to_s + '<hr />' + e.backtrace.to_s
       end
-      http.start do
-        case method
-        when 'GET'
-          response = http.get(@uri.request_uri, request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
-                                                      'x-ssb' => 'server-side-browser'}))
-        when 'POST'
-          response = http.post(@uri.request_uri,
-                               @post_params,
-                               request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
-                                                       'Content-Type' => 'application/x-www-form-urlencoded',
-                                                       'x-ssb' => 'server-side-browser'
-                                                     }))
-        end
-      end
-      response
     end