selenium-webdriver 2.27.0.rc1 → 2.27.0

data/lib/selenium/webdriver/common.rb

@@ -4,6 +4,7 @@ require 'selenium/webdriver/common/core_ext/base64'
 require 'selenium/webdriver/common/error'
 require 'selenium/webdriver/common/platform'
 require 'selenium/webdriver/common/proxy'
+require 'selenium/webdriver/common/log_entry'
 require 'selenium/webdriver/common/file_reaper'
 require 'selenium/webdriver/common/socket_poller'
 require 'selenium/webdriver/common/port_prober'

data/lib/selenium/webdriver/common/log_entry.rb

@@ -0,0 +1,29 @@
+module Selenium
+  module WebDriver
+    class LogEntry
+      attr_reader :level, :timestamp, :message
+
+      def initialize(level, timestamp, message)
+        @level      = level
+        @timestamp = timestamp
+        @message    = message
+      end
+
+      def as_json(opts = nil)
+        {
+          'level'     => level,
+          'timestamp' => timestamp,
+          'message'   => message
+        }
+      end
+
+      def to_s
+        "#{level} #{time}: #{message}"
+      end
+
+      def time
+        Time.at timestamp / 1000
+      end
+    end
+  end
+end

data/lib/selenium/webdriver/phantomjs.rb

@@ -0,0 +1,22 @@
+require 'net/http'
+
+require 'selenium/webdriver/phantomjs/service'
+require 'selenium/webdriver/phantomjs/bridge'
+
+module Selenium
+  module WebDriver
+
+    module PhantomJS
+
+      def self.path=(path)
+        Platform.assert_executable path
+        @path = path
+      end
+
+      def self.path
+        @path ||= Platform.find_binary("phantomjs")
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/phantomjs/bridge.rb

@@ -0,0 +1,56 @@
+module Selenium
+  module WebDriver
+    module PhantomJS
+
+      # @api private
+      class Bridge < Remote::Bridge
+
+        def initialize(opts = {})
+          http_client = opts.delete(:http_client)
+
+          if opts.has_key?(:url)
+            url = opts.delete(:url)
+          else
+            @service = Service.default_service
+            @service.start
+
+            url = @service.uri
+          end
+
+          caps = Remote::Capabilities.phantomjs
+
+          remote_opts = {
+            :url                  => url,
+            :desired_capabilities => caps
+          }
+
+          remote_opts.merge!(:http_client => http_client) if http_client
+
+          super(remote_opts)
+        end
+
+        def browser
+          :phantomjs
+        end
+
+        def driver_extensions
+          [
+            DriverExtensions::TakesScreenshot,
+            DriverExtensions::HasInputDevices
+          ]
+        end
+
+        def capabilities
+          @capabilities ||= Remote::Capabilities.phantomjs
+        end
+
+        def quit
+          super
+        ensure
+          @service.stop if @service
+        end
+
+      end # Bridge
+    end # PhantomJS
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/phantomjs/service.rb

@@ -0,0 +1,70 @@
+module Selenium
+  module WebDriver
+    module PhantomJS
+
+      #
+      # @api private
+      #
+
+      class Service
+        START_TIMEOUT = 20
+        STOP_TIMEOUT  = 5
+        DEFAULT_PORT  = 8910
+        MISSING_TEXT  = "Unable to find phantomjs executable."
+
+        attr_reader :uri
+
+        def self.executable_path
+          @executable_path ||= (
+            path = PhantomJS.path
+            path or raise Error::WebDriverError, MISSING_TEXT
+            Platform.assert_executable path
+
+            path
+          )
+        end
+
+        def self.default_service
+          new executable_path, PortProber.above(DEFAULT_PORT)
+        end
+
+        def initialize(executable_path, port)
+          @uri           = URI.parse "http://#{Platform.localhost}:#{port}"
+          server_command = [executable_path, "--webdriver=#{port}"]
+
+          @process       = ChildProcess.build(*server_command)
+          @socket_poller = SocketPoller.new Platform.localhost, port, START_TIMEOUT
+
+          @process.io.inherit! if $DEBUG == true
+        end
+
+        def start
+          @process.start
+
+          unless @socket_poller.connected?
+            raise Error::WebDriverError, "unable to connect to phantomjs @ #{@uri} after #{START_TIMEOUT} seconds"
+          end
+
+          Platform.exit_hook { stop } # make sure we don't leave the server running
+        end
+
+        def stop
+          return if @process.nil? || @process.exited?
+
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            http.open_timeout = STOP_TIMEOUT / 2
+            http.read_timeout = STOP_TIMEOUT / 2
+
+            http.get("/shutdown")
+          end
+
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          # ok, force quit
+          @process.stop STOP_TIMEOUT
+        end
+      end # Service
+
+    end # PhantomJS
+  end # WebDriver
+end # Service

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

@@ -467,6 +467,23 @@ module Selenium
 
         end
 
+        #
+        # logs
+        #
+
+        def getAvailableLogTypes
+          types = execute :getAvailableLogTypes
+          Array(types).map { |e| e.to_sym }
+        end
+
+        def getLog(type)
+          data = execute :getLog, {}, :type => type.to_s
+
+          Array(data).map do |l|
+            LogEntry.new l.fetch('level'), l.fetch('timestamp'), l.fetch('message')
+          end
+        end
+
         #
         # element properties
         #

data/lib/selenium/webdriver/remote/commands.rb

@@ -182,4 +182,11 @@ class Selenium::WebDriver::Remote::Bridge
   command :touchMove,                              :post,   "session/:session_id/touch/move"
   command :touchScroll,                            :post,   "session/:session_id/touch/scroll"
   command :touchFlick,                             :post,   "session/:session_id/touch/flick"
+
+  #
+  # logs
+  #
+
+  command :getAvailableLogTypes,                   :get,    "session/:session_id/log/types"
+  command :getLog,                                 :post,   "session/:session_id/log"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 7
-  version: 2.27.0.rc1
+  prerelease: 
+  version: 2.27.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-02 00:00:00 +01:00
+date: 2012-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -134,6 +134,7 @@ files:
   - lib/selenium/webdriver/ie.rb
   - lib/selenium/webdriver/iphone.rb
   - lib/selenium/webdriver/opera.rb
+  - lib/selenium/webdriver/phantomjs.rb
   - lib/selenium/webdriver/remote.rb
   - lib/selenium/webdriver/safari.rb
   - lib/selenium/webdriver/support.rb
@@ -151,6 +152,7 @@ files:
   - lib/selenium/webdriver/common/json_helper.rb
   - lib/selenium/webdriver/common/keyboard.rb
   - lib/selenium/webdriver/common/keys.rb
+  - lib/selenium/webdriver/common/log_entry.rb
   - lib/selenium/webdriver/common/mouse.rb
   - lib/selenium/webdriver/common/navigation.rb
   - lib/selenium/webdriver/common/options.rb
@@ -199,6 +201,8 @@ files:
   - lib/selenium/webdriver/iphone/bridge.rb
   - lib/selenium/webdriver/opera/bridge.rb
   - lib/selenium/webdriver/opera/service.rb
+  - lib/selenium/webdriver/phantomjs/bridge.rb
+  - lib/selenium/webdriver/phantomjs/service.rb
   - lib/selenium/webdriver/remote/bridge.rb
   - lib/selenium/webdriver/remote/capabilities.rb
   - lib/selenium/webdriver/remote/commands.rb
@@ -237,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: