selenium-webdriver 0.0.20 → 0.0.21

data/common/src/rb/CHANGES

@@ -1,3 +1,11 @@
+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
 ==========
 

data/firefox/src/extension/components/nsCommandProcessor.js

@@ -133,7 +133,7 @@ Response.prototype = {
   set status(newStatus) { this.json_.status = newStatus; },
   get status()          { return this.json_.status; },
   set value(val)     { this.json_.value = val; },
-  get value()        { return this.json_.value; },
+  get value()        { return this.json_.value; }
 };
 
 
@@ -540,7 +540,9 @@ nsCommandProcessor.prototype.getSessionCapabilities = function(response) {
     'browserName': 'firefox',
     'version': appInfo.version,
     'javascriptEnabled': true,
-    'platform': xulRuntime.OS          // same as Platform.valueOf("name");
+    'platform': xulRuntime.OS,          // same as Platform.valueOf("name");
+    'cssSelectorsEnabled': true,
+    'takesScreenshot': true
   };
   response.send();
 };

data/firefox/src/extension/components/webdriverserver.js

@@ -44,7 +44,7 @@ WebDriverServer.prototype.newDriver = function(window) {
     var prefs =
         Utils.getService("@mozilla.org/preferences-service;1", "nsIPrefBranch");
     if (!prefs.prefHasUserValue("webdriver_enable_native_events")) {
-      Utils.dumpn('webdriver_enable_native_events not set; defaulting to true');
+      Utils.dumpn('webdriver_enable_native_events not set; defaulting to false');
     }
     this.enableNativeEvents =
     prefs.prefHasUserValue("webdriver_enable_native_events") ?

data/firefox/src/rb/lib/selenium/webdriver/firefox/bridge.rb

@@ -13,12 +13,22 @@ module Selenium
             opts.delete(:profile) || DEFAULT_PROFILE_NAME
           )
 
+          http_client = opts.delete(:http_client)
+
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
           @launcher.launch
-          super :url => @launcher.url, :desired_capabilities => :firefox
+
+          remote_opts = {
+            :url                  => @launcher.url,
+            :desired_capabilities => :firefox
+          }
+
+          remote_opts.merge!(:http_client => http_client) if http_client
+
+          super(remote_opts)
         end
 
         def browser

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

@@ -1,9 +1,12 @@
+require "uri"
+
 require "selenium/webdriver/remote/capabilities"
-require "selenium/webdriver/remote/default_http_client"
 require "selenium/webdriver/remote/bridge"
 require "selenium/webdriver/remote/server_error"
 require "selenium/webdriver/remote/response"
 require "selenium/webdriver/remote/commands"
+require "selenium/webdriver/remote/http/common"
+require "selenium/webdriver/remote/http/default"
 
 module Selenium
   module WebDriver
@@ -15,4 +18,4 @@ module Selenium
   end
 end
 
-require "uri"
+

data/remote/client/src/rb/lib/selenium/webdriver/remote/bridge.rb

@@ -395,21 +395,12 @@ module Selenium
         def default_options
           {
             :url                  => "http://localhost:4444/wd/hub",
-            # TODO(jari): enable Patron when http://github.com/toland/patron/issues/issue/13 is fixed
-            :http_client          => DefaultHttpClient,
+            :http_client          => Http::Default,
             :desired_capabilities => Capabilities.firefox
           }
         end
 
-        def http_client_class
-          require "selenium/webdriver/remote/patron_http_client"
-          PatronHttpClient
-        rescue LoadError
-          # patron not available
-          DefaultHttpClient
-        end
-
       end # Bridge
     end # Remote
   end # WebDriver
-end # Selenium
+end # Selenium

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

@@ -0,0 +1,56 @@
+module Selenium
+  module WebDriver
+    module Remote
+      module Http
+        class Common
+          MAX_REDIRECTS   = 20 # same as chromium/gecko
+          CONTENT_TYPE    = "application/json"
+          DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE, "Content-Length" => "0" }
+
+          def initialize(url)
+            @server_url = url
+          end
+
+          def call(verb, url, command_hash)
+            url      = @server_url.merge(url) unless url.kind_of?(URI)
+            headers  = DEFAULT_HEADERS.dup
+
+            if command_hash
+              payload                   = command_hash.to_json
+              headers["Content-Type"]   = "#{CONTENT_TYPE}; charset=utf-8"
+              headers["Content-Length"] = payload.bytesize.to_s if [:post, :put].include?(verb)
+
+              if $DEBUG
+                puts "   >>> #{payload}"
+                puts "     > #{headers.inspect}"
+              end
+            end
+
+            request verb, url, headers, payload
+          end
+
+          private
+
+          def request(verb, url, headers, payload)
+            raise NotImplementedError, "subclass responsibility"
+          end
+
+          def create_response(code, body, content_type)
+            code, body, content_type = code.to_i, body.to_s.strip, content_type.to_s
+            puts "<- #{body}\n" if $DEBUG
+
+            if content_type.include? CONTENT_TYPE
+              raise Error::WebDriverError, "empty body: #{content_type.inspect} (#{code})\n#{body}" if body.empty?
+              Response.new(code, JSON.parse(body))
+            elsif code == 204
+              Response.new(code)
+            else
+              raise Error::WebDriverError, "unexpected content type: #{content_type.inspect} (#{code})\n#{body}"
+            end
+          end
+
+        end # Common
+      end # Http
+    end # Remote
+  end # WebDriver
+end # Selenium

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

@@ -0,0 +1,61 @@
+require 'curb'
+
+module Selenium
+  module WebDriver
+    module Remote
+      module Http
+        
+        #
+        # 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
+        # 
+        #   include Selenium
+        # 
+        #   driver = WebDriver.for :firefox, :http_client => WebDriver::Remote::Http::Curb
+        # 
+        
+        class Curb < Common
+
+          private
+
+          def request(verb, url, headers, payload)
+            client.url     = url.to_s
+            client.headers = headers
+
+            case verb
+            when :get
+              client.http_get
+            when :post
+              client.post_body = payload || ""
+              client.http_post
+            when :put
+              client.put_data = payload || ""
+              client.http_put
+            when :delete
+              client.http_delete
+            else
+              raise Error::WebDriverError, "unknown HTTP verb: #{verb.inspect}"
+            end
+
+            create_response client.response_code, client.body_str, client.content_type
+          end
+
+          def client
+            @client ||= (
+              c = Curl::Easy.new
+              c.max_redirects = MAX_REDIRECTS
+              c.follow_location = true
+
+              c
+            )
+          end
+
+        end # Curb
+      end # Http
+    end # Remote
+  end # WebDriver
+end # Selenium

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

@@ -0,0 +1,42 @@
+require "net/http"
+
+module Selenium
+  module WebDriver
+    module Remote
+      module Http
+        # @private
+        class Default < Common
+
+          private
+
+          def http
+            # ignoring SSL for now
+            @http ||= Net::HTTP.new @server_url.host, @server_url.port
+          end
+
+          def request(verb, url, headers, payload, redirects = 0)
+            request = Net::HTTP.const_get(verb.to_s.capitalize).new(url.path, headers)
+
+            retried = false
+            begin
+              response = http.request(request, payload)
+            rescue Errno::ECONNABORTED, Errno::ECONNRESET
+              # this happens sometimes on windows?!
+              raise if retried
+              retried  = true
+              retry
+            end
+
+            if response.kind_of? Net::HTTPRedirection
+              raise Error::WebDriverError, "too many redirects" if redirects >= MAX_REDIRECTS
+              request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)
+            else
+              create_response response.code, response.body, response.content_type
+            end
+          end
+
+        end # Default
+      end # Http
+    end # Remote
+  end # WebDriver
+end # Selenium

data/remote/client/src/rb/lib/selenium/webdriver/remote/response.rb

@@ -5,28 +5,26 @@ module Selenium
       # @private
       class Response
 
-        attr_accessor :code
-        attr_writer   :payload
+        attr_reader :code, :payload
+        attr_writer :payload
+
+        def initialize(code, payload = nil)
+          @code    = code
+          @payload = payload || {}
 
-        def initialize
-          yield self if block_given?
           assert_ok
         end
 
         def error
-          Error.for_code(payload['status'])
+          Error.for_code @payload['status']
         end
 
         def error_message
-          payload['value']['message']
+          @payload['value']['message']
         end
 
         def [](key)
-          payload[key]
-        end
-
-        def payload
-          @payload ||= {}
+          @payload[key]
         end
 
         private
@@ -44,4 +42,4 @@ module Selenium
       end # Response
     end # Remote
   end # WebDriver
-end # Selenium
+end # Selenium

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 20
-  version: 0.0.20
+    - 21
+  version: 0.0.21
 platform: ruby
 authors: 
   - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 +02:00
+date: 2010-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -271,10 +271,11 @@ files:
   - remote/client/src/rb/lib/selenium/webdriver/remote/bridge.rb
   - remote/client/src/rb/lib/selenium/webdriver/remote/capabilities.rb
   - remote/client/src/rb/lib/selenium/webdriver/remote/commands.rb
-  - remote/client/src/rb/lib/selenium/webdriver/remote/default_http_client.rb
-  - remote/client/src/rb/lib/selenium/webdriver/remote/patron_http_client.rb
   - remote/client/src/rb/lib/selenium/webdriver/remote/response.rb
   - remote/client/src/rb/lib/selenium/webdriver/remote/server_error.rb
+  - remote/client/src/rb/lib/selenium/webdriver/remote/http/common.rb
+  - remote/client/src/rb/lib/selenium/webdriver/remote/http/curb.rb
+  - remote/client/src/rb/lib/selenium/webdriver/remote/http/default.rb
 has_rdoc: true
 homepage: http://selenium.googlecode.com
 licenses: []

data/remote/client/src/rb/lib/selenium/webdriver/remote/default_http_client.rb

@@ -1,81 +0,0 @@
-require "net/http"
-
-module Selenium
-  module WebDriver
-    module Remote
-
-      # @private
-      class DefaultHttpClient
-        MAX_REDIRECTS   = 20 # same as chromium/gecko
-        CONTENT_TYPE    = "application/json"
-        DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE, "Content-Length" => "0" }
-
-        def initialize(url)
-          @server_url = url
-        end
-
-        def call(verb, url, command_hash)
-          response = nil
-          url      = @server_url.merge(url) unless url.kind_of?(URI)
-          headers  = DEFAULT_HEADERS.dup
-
-          if command_hash
-            payload = command_hash.to_json
-            headers["Content-Type"] = "#{CONTENT_TYPE}; charset=utf-8"
-            headers["Content-Length"] = payload.bytesize.to_s if [:post, :put].include?(verb)
-
-            if $DEBUG
-              puts "   >>> #{payload}"
-              puts "     > #{headers.inspect}"
-            end
-          end
-
-          request verb, url, headers, payload
-        end
-
-        private
-
-        def http
-          # ignoring SSL for now
-          @http ||= Net::HTTP.new @server_url.host, @server_url.port
-        end
-
-        def request(verb, url, headers, payload, redirects = 0)
-          request  = Net::HTTP.const_get(verb.to_s.capitalize).new(url.path, headers)
-
-          retried = false
-          begin
-            response = http.request(request, payload)
-          rescue Errno::ECONNABORTED
-            # this happens sometimes on windows?!
-            raise if retried
-            retried = true
-            retry
-          end
-
-          if response.kind_of? Net::HTTPRedirection
-            raise Error::WebDriverError, "too many redirects" if redirects >= MAX_REDIRECTS
-            request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)
-          else
-            create_response response
-          end
-        end
-
-        def create_response(res)
-          puts "<- #{res.body}\n" if $DEBUG
-          if res.content_type == CONTENT_TYPE
-            Response.new do |r|
-              r.code         = res.code.to_i
-              r.payload      = JSON.parse(res.body.strip)
-            end
-          elsif res.code == '204'
-            Response.new { |r| r.code = res.code.to_i }
-          else
-            raise Error::WebDriverError, "unexpected content type: #{res.content_type.inspect} (#{res.code})\n#{res.body}"
-          end
-        end
-
-      end # DefaultHttpClient
-    end # Remote
-  end # WebDriver
-end # Selenium

data/remote/client/src/rb/lib/selenium/webdriver/remote/patron_http_client.rb

@@ -1,58 +0,0 @@
-require "patron"
-
-module Selenium
-  module WebDriver
-    module Remote
-
-      # @private
-      class PatronHttpClient
-        CONTENT_TYPE    = "application/json"
-        DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE, "Content-Length" => "0" }
-
-        def initialize(url)
-          @session = Patron::Session.new
-          @session.base_url = url
-        end
-
-        def call(verb, url, command_hash)
-          DEFAULT_HEADERS.each do |key, val|
-            @session.headers[key] = val
-          end
-
-          if command_hash
-            payload = command_hash.to_json
-            @session.headers['Content-Type'] = "#{CONTENT_TYPE}; charset=utf-8;"
-            @session.headers['Content-Length'] = payload.bytesize.to_s if [:post, :put].include?(verb)
-            if $DEBUG
-              puts "   >>> #{payload}"
-              puts "     > #{@session.headers.inspect}"
-            end
-          end
-
-          if [:post, :put].include?(verb)
-            create_response @session.send(verb, url, payload || '')
-          else
-            create_response @session.send(verb, url)
-          end
-        end
-
-        private
-
-        def create_response(res)
-          puts "<- #{res.body}\n" if $DEBUG
-          if res.headers['Content-Type'].include? CONTENT_TYPE
-            Response.new do |r|
-              r.code         = res.status.to_i
-              r.payload      = JSON.parse(res.body.strip)
-            end
-          elsif res.status == '204'
-            Response.new { |r| r.code = res.code.to_i }
-          else
-            raise "Unexpected content type: #{res.headers.inspect} (#{res.status})\n#{res.body}"
-          end
-        end
-
-      end # PatronHttpClient
-    end # Remote
-  end # WebDriver
-end # Selenium