selenium-webdriver 0.0.21 → 0.0.22

data/common/src/rb/CHANGES

@@ -1,18 +1,25 @@
-2010-06-11
-==========
+0.0.22 (2010-06-11)
+===================
+
+* Bugfix: Workaround for http://github.com/taf2/curb/issues/issue/33 - curb would sometimes use DELETE for GET requests.
+* Minor doc fix
+* Add ability to set timeout for HTTP clients
+
+0.0.21 (2010-06-11)
+===================
 
 * User can specify :http_client for the Firefox driver.
 * Refactor HTTP client code
 * Add Remote::Http::Curb as an alternative to the default (net/http) client.
 
 
-2010-06-03
-==========
+0.0.20 (2010-06-03)
+===================
 
 * Fix bug where Firefox would hang on quit().
 
-2010-05-31
-==========
+0.0.19 (2010-05-31)
+===================
 
 * Add a max redirect check to the remote driver
 * Add Firefox::Profile#assume_untrusted_certificate_issuer=

data/remote/client/src/rb/lib/selenium/webdriver/remote/http/common.rb

@@ -7,6 +7,10 @@ module Selenium
           CONTENT_TYPE    = "application/json"
           DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE, "Content-Length" => "0" }
 
+          class << self
+            attr_accessor :timeout
+          end
+
           def initialize(url)
             @server_url = url
           end

data/remote/client/src/rb/lib/selenium/webdriver/remote/http/curb.rb

@@ -4,20 +4,20 @@ module Selenium
   module WebDriver
     module Remote
       module Http
-        
+
+        #
+        # An alternative to the default Net::HTTP client.
         #
-        # An alternative to the default Net::HTTP client. 
-        # 
         # This can be used for the Firefox and Remote drivers if you have Curb
         # installed.
-        # 
+        #
         # @example Using Curb
-        # 
+        #   require 'selenium/webdriver/remote/http/curb'
         #   include Selenium
-        # 
+        #
         #   driver = WebDriver.for :firefox, :http_client => WebDriver::Remote::Http::Curb
-        # 
-        
+        #
+
         class Curb < Common
 
           private
@@ -26,6 +26,10 @@ module Selenium
             client.url     = url.to_s
             client.headers = headers
 
+            # http://github.com/taf2/curb/issues/issue/33
+            client.head   = false
+            client.delete = false
+
             case verb
             when :get
               client.http_get
@@ -37,6 +41,8 @@ module Selenium
               client.http_put
             when :delete
               client.http_delete
+            when :head
+              client.http_head
             else
               raise Error::WebDriverError, "unknown HTTP verb: #{verb.inspect}"
             end
@@ -47,8 +53,10 @@ module Selenium
           def client
             @client ||= (
               c = Curl::Easy.new
-              c.max_redirects = MAX_REDIRECTS
+
+              c.max_redirects   = MAX_REDIRECTS
               c.follow_location = true
+              c.timeout         = self.class.timeout if self.class.timeout
 
               c
             )

data/remote/client/src/rb/lib/selenium/webdriver/remote/http/default.rb

@@ -11,7 +11,16 @@ module Selenium
 
           def http
             # ignoring SSL for now
-            @http ||= Net::HTTP.new @server_url.host, @server_url.port
+            @http ||= (
+              http = Net::HTTP.new @server_url.host, @server_url.port
+
+              if self.class.timeout
+                http.connect_timeout = self.class.timeout
+                http.read_timeout    = self.class.timeout
+              end
+
+              http
+            )
           end
 
           def request(verb, url, headers, payload, redirects = 0)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 21
-  version: 0.0.21
+    - 22
+  version: 0.0.22
 platform: ruby
 authors: 
   - Jari Bakken