poltergeist 1.0.3 → 1.1.0

data/lib/capybara/poltergeist/client/node.coffee

@@ -28,14 +28,14 @@ class Poltergeist.Node
       y: middle(pos.top,  pos.bottom, viewport.height)
     }
 
-  click: ->
+  click: (event = 'click') ->
     this.scrollIntoView()
 
     pos  = this.clickPosition()
     test = this.clickTest(pos.x, pos.y)
 
     if test.status == 'success'
-      @page.mouseEvent('click', pos.x, pos.y)
+      @page.mouseEvent(event, pos.x, pos.y)
       pos
     else
       throw new Poltergeist.ClickFailed(test.selector, pos)

data/lib/capybara/poltergeist/client/web_page.coffee

@@ -5,7 +5,9 @@ class Poltergeist.WebPage
 
   @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render']
 
-  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize']
+  @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload']
+
+  @EXTENSIONS = []
 
   constructor: (@native) ->
     @native or= require('webpage').create()
@@ -19,8 +21,6 @@ class Poltergeist.WebPage
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
 
-    this.injectAgent()
-
   for command in @COMMANDS
     do (command) =>
       this.prototype[command] =
@@ -33,12 +33,18 @@ class Poltergeist.WebPage
 
   onInitializedNative: ->
     @_source = null
-    this.injectAgent()
+    @injectAgent()
     this.setScrollPosition(left: 0, top: 0)
 
   injectAgent: ->
     if @native.evaluate(-> typeof __poltergeist) == "undefined"
-      @native.injectJs("#{phantom.libraryPath}/agent.js")
+      @native.injectJs "#{phantom.libraryPath}/agent.js"
+      for extension in WebPage.EXTENSIONS
+        @native.injectJs extension
+
+  injectExtension: (file) ->
+    WebPage.EXTENSIONS.push file
+    @native.injectJs file
 
   onConsoleMessageNative: (message) ->
     if message == '__DOMContentLoaded'
@@ -141,10 +147,11 @@ class Poltergeist.WebPage
     @native.customHeaders = headers
 
   pushFrame: (name) ->
-    @frames.push(name)
-    res = @native.switchToFrame(name)
-    this.injectAgent()
-    res
+    if @native.switchToFrame(name)
+      @frames.push(name)
+      true
+    else
+      false
 
   popFrame: ->
     @frames.pop()
@@ -197,6 +204,7 @@ class Poltergeist.WebPage
     this.sendEvent(name, x, y)
 
   evaluate: (fn, args...) ->
+    this.injectAgent()
     JSON.parse @native.evaluate("function() { return PoltergeistAgent.stringify(#{this.stringifyCall(fn, args)}) }")
 
   execute: (fn, args...) ->
@@ -234,6 +242,6 @@ class Poltergeist.WebPage
       if result.error.message == 'PoltergeistAgent.ObsoleteNode'
         throw new Poltergeist.ObsoleteNode
       else
-        throw new Poltergeist.JavascriptError([result.error])
+        throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
     else
       result.value

data/lib/capybara/poltergeist/cookie.rb

@@ -29,7 +29,7 @@ module Capybara::Poltergeist
     end
 
     def expires
-      Time.parse @attributes['expires']
+      Time.at @attributes['expiry'] if @attributes['expiry']
     end
   end
 end

data/lib/capybara/poltergeist/driver.rb

@@ -4,7 +4,7 @@ module Capybara::Poltergeist
   class Driver < Capybara::Driver::Base
     DEFAULT_TIMEOUT = 30
 
-    attr_reader :app, :app_server, :server, :client, :browser, :options
+    attr_reader :app, :server, :client, :browser, :options
 
     def initialize(app, options = {})
       @app       = app
@@ -13,13 +13,21 @@ module Capybara::Poltergeist
       @inspector = nil
       @server    = nil
       @client    = nil
+      @started   = false
+    end
 
-      @app_server = Capybara::Server.new(app)
-      @app_server.boot if Capybara.run_server
+    def needs_server?
+      true
     end
 
     def browser
-      @browser ||= Browser.new(server, client, logger, js_errors)
+      @browser ||= begin
+        browser = Browser.new(server, client, logger)
+        browser.js_errors  = options[:js_errors] if options.key?(:js_errors)
+        browser.extensions = options.fetch(:extensions, [])
+        browser.debug      = true if options[:debug]
+        browser
+      end
     end
 
     def inspector
@@ -27,17 +35,15 @@ module Capybara::Poltergeist
     end
 
     def server
-      @server ||= Server.new(
-        options.fetch(:port)    { Util.find_available_port },
-        options.fetch(:timeout) { DEFAULT_TIMEOUT          }
-      )
+      @server ||= Server.new(options[:port], options.fetch(:timeout) { DEFAULT_TIMEOUT })
     end
 
     def client
-      @client ||= Client.start(server.port,
+      @client ||= Client.start(server,
         :path              => options[:phantomjs],
         :window_size       => options[:window_size],
-        :phantomjs_options => phantomjs_options
+        :phantomjs_options => phantomjs_options,
+        :phantomjs_logger  => phantomjs_logger
       )
     end
 
@@ -73,12 +79,14 @@ module Capybara::Poltergeist
       options[:logger] || (options[:debug] && STDERR)
     end
 
-    def js_errors
-      options.fetch(:js_errors, true)
+    # logger should be an object that behaves like IO or nil
+    def phantomjs_logger
+      options.fetch(:phantomjs_logger, nil)
     end
 
-    def visit(path)
-      browser.visit app_server.url(path)
+    def visit(url)
+      @started = true
+      browser.visit(url)
     end
 
     def current_url
@@ -89,9 +97,10 @@ module Capybara::Poltergeist
       browser.status_code
     end
 
-    def body
+    def html
       browser.body
     end
+    alias_method :body, :html
 
     def source
       browser.source.to_s
@@ -101,6 +110,10 @@ module Capybara::Poltergeist
       browser.find(selector).map { |page_id, id| Capybara::Poltergeist::Node.new(self, page_id, id) }
     end
 
+    def click(x, y)
+      browser.click_coordinates(x, y)
+    end
+
     def evaluate_script(script)
       browser.evaluate(script)
     end
@@ -120,11 +133,13 @@ module Capybara::Poltergeist
 
     def reset!
       browser.reset
+      @started = false
     end
 
-    def render(path, options = {})
+    def save_screenshot(path, options = {})
       browser.render(path, options)
     end
+    alias_method :render, :save_screenshot
 
     def resize(width, height)
       browser.resize(width, height)
@@ -148,11 +163,16 @@ module Capybara::Poltergeist
     end
 
     def set_cookie(name, value, options = {})
-      browser.set_cookie({
-        :name   => name,
-        :value  => value,
-        :domain => URI.parse(app_server.url('')).host
-      }.merge(options))
+      options[:name]  ||= name
+      options[:value] ||= value
+
+      if @started
+        options[:domain] = URI.parse(browser.current_url).host
+      else
+        options[:domain] = Capybara.app_host || "127.0.0.1"
+      end
+
+      browser.set_cookie(options)
     end
 
     def remove_cookie(name)

data/lib/capybara/poltergeist/errors.rb

@@ -34,7 +34,9 @@ module Capybara
       end
 
       def message
-        "There was an error inside the PhantomJS portion of Poltergeist:\n\n#{javascript_error}"
+        "There was an error inside the PhantomJS portion of Poltergeist. " \
+          "This is probably a bug, so please report it. " \
+          "\n\n#{javascript_error}"
       end
     end
 
@@ -44,8 +46,11 @@ module Capybara
       end
 
       def message
-        "One or more errors were raised in the Javascript code on the page:\n\n" +
-          javascript_errors.map(&:to_s).join("\n")
+        "One or more errors were raised in the Javascript code on the page. " \
+          "If you don't care about these errors, you can ignore them by " \
+          "setting js_errors: false in your Poltergeist configuration (see " \
+          "documentation for details)." \
+          "\n\n#{javascript_errors.map(&:to_s).join("\n")}"
       end
     end
 
@@ -59,6 +64,13 @@ module Capybara
     end
 
     class ObsoleteNode < NodeError
+      def message
+        "The element you are trying to interact with is either not part of the DOM, or is " \
+          "not currently visible on the page (perhaps display: none is set). " \
+          "It's possible the element has been replaced by another element and you meant to interact with " \
+          "the new element. If so you need to do a new 'find' in order to get a reference to the " \
+          "new element."
+      end
     end
 
     class ClickFailed < NodeError
@@ -83,7 +95,11 @@ module Capybara
       end
 
       def message
-        "Timed out waiting for response to #{@message}"
+        "Timed out waiting for response to #{@message}. It's possible that this happened " \
+          "because something took a very long time (for example a page load was slow). " \
+          "If so, setting the Poltergeist :timeout option to a higher value will help " \
+          "(see the docs for details). If increasing the timeout does not help, this is " \
+          "probably a bug in Poltergeist - please report it to the issue tracker."
       end
     end
 
@@ -93,7 +109,7 @@ module Capybara
       end
 
       def message
-        "The PhantomJS client died while processing #{@message}"
+        "PhantomJS client died while processing #{@message}"
       end
     end
 

data/lib/capybara/poltergeist/inspector.rb

@@ -24,7 +24,7 @@ module Capybara::Poltergeist
 
     def open
       if browser
-        Spawn.spawn(browser, url)
+        Process.spawn(browser, url)
       else
         raise Error, "Could not find a browser executable to open #{url}. " \
                      "You can specify one manually using e.g. `:inspector => 'chromium'` " \

data/lib/capybara/poltergeist/node.rb

@@ -1,5 +1,8 @@
 module Capybara::Poltergeist
   class Node < Capybara::Driver::Node
+    NBSP = "\xC2\xA0"
+    NBSP.force_encoding("UTF-8") if NBSP.respond_to?(:force_encoding)
+
     attr_reader :page_id, :id
 
     def initialize(driver, page_id, id)
@@ -31,7 +34,7 @@ module Capybara::Poltergeist
     end
 
     def text
-      command(:text).strip.gsub(/\s+/, ' ')
+      command(:text).gsub(NBSP, ' ').gsub(/\s+/u, ' ').strip
     end
 
     def [](name)
@@ -50,7 +53,8 @@ module Capybara::Poltergeist
         when 'checkbox'
           click if value != checked?
         when 'file'
-          command :select_file, value
+          files = value.respond_to?(:to_ary) ? value.to_ary.map(&:to_s) : value.to_s
+          command :select_file, files
         else
           command :set, value.to_s
         end
@@ -88,6 +92,10 @@ module Capybara::Poltergeist
       command :click
     end
 
+    def double_click
+      command :double_click
+    end
+
     def drag_to(other)
       command :drag, other.id
     end

data/lib/capybara/poltergeist/server.rb

@@ -1,19 +1,23 @@
 module Capybara::Poltergeist
   class Server
-    attr_reader :port, :socket, :timeout
+    attr_reader :socket, :fixed_port, :timeout
 
-    def initialize(port, timeout = nil)
-      @port    = port
-      @timeout = timeout
+    def initialize(fixed_port = nil, timeout = nil)
+      @fixed_port = fixed_port
+      @timeout    = timeout
       start
     end
 
+    def port
+      @socket.port
+    end
+
     def timeout=(sec)
       @timeout = @socket.timeout = sec
     end
 
     def start
-      @socket = WebSocketServer.new(port, timeout)
+      @socket = WebSocketServer.new(fixed_port, timeout)
     end
 
     def stop

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -57,21 +57,26 @@ module Capybara::Poltergeist
     # How many seconds to try to bind to the port for before failing
     BIND_TIMEOUT = 5
 
+    HOST = '127.0.0.1'
+
     attr_reader :port, :parser, :socket, :handler, :server
     attr_accessor :timeout
 
-    def initialize(port, timeout = nil)
-      @port    = port
-      @parser  = Http::Parser.new
-      @server  = start_server
+    def initialize(port = nil, timeout = nil)
       @timeout = timeout
+      @parser  = Http::Parser.new
+      @server  = start_server(port)
+    end
+
+    def port
+      server.addr[1]
     end
 
-    def start_server
+    def start_server(port)
       time = Time.now
 
       begin
-        TCPServer.open(port)
+        TCPServer.open(HOST, port || 0)
       rescue Errno::EADDRINUSE
         if (Time.now - time) < BIND_TIMEOUT
           sleep(0.01)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -18,23 +18,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,23 +29,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +55,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
@@ -89,6 +66,9 @@ dependencies:
     none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
@@ -98,7 +78,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +86,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -216,13 +196,10 @@ files:
 - lib/capybara/poltergeist/browser.rb
 - lib/capybara/poltergeist/inspector.rb
 - lib/capybara/poltergeist/errors.rb
-- lib/capybara/poltergeist/util.rb
 - lib/capybara/poltergeist/web_socket_server.rb
-- lib/capybara/poltergeist/json.rb
 - lib/capybara/poltergeist/network_traffic/request.rb
 - lib/capybara/poltergeist/network_traffic/response.rb
 - lib/capybara/poltergeist/version.rb
-- lib/capybara/poltergeist/spawn.rb
 - lib/capybara/poltergeist/driver.rb
 - lib/capybara/poltergeist/client/connection.coffee
 - lib/capybara/poltergeist/client/node.coffee
@@ -252,10 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 302073789104605833
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 302073789104605833
+      hash: -2568328545236952505
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24