poltergeist 0.4.0 → 0.5.0

data/lib/capybara/poltergeist/inspector.rb

@@ -0,0 +1,35 @@
+module Capybara::Poltergeist
+  class Inspector
+    BROWSERS = %w(chromium chromium-browser google-chrome safari)
+
+    def self.detect_browser
+      @browser ||= BROWSERS.find { |name| system("which #{name} &>/dev/null") }
+    end
+
+    def initialize(browser = nil)
+      @browser = browser.respond_to?(:to_str) ? browser : nil
+    end
+
+    def browser
+      @browser ||= self.class.detect_browser
+    end
+
+    def port
+      @port ||= Util.find_available_port
+    end
+
+    def url
+      "http://localhost:#{port}/"
+    end
+
+    def open
+      if browser
+        Spawn.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'` " \
+                     "as a configuration option for Poltergeist."
+      end
+    end
+  end
+end

data/lib/capybara/poltergeist/node.rb

@@ -1,5 +1,12 @@
 module Capybara::Poltergeist
   class Node < Capybara::Driver::Node
+    attr_reader :page_id
+
+    def initialize(driver, page_id, id)
+      super(driver, id)
+      @page_id = page_id
+    end
+
     alias id native
 
     def browser
@@ -7,17 +14,20 @@ module Capybara::Poltergeist
     end
 
     def command(name, *args)
-      browser.send(name, id, *args)
+      browser.send(name, page_id, id, *args)
     rescue BrowserError => error
-      if error.text == 'Poltergeist.ObsoleteNode'
-        raise ObsoleteNode.new(self)
+      case error.name
+      when 'Poltergeist.ObsoleteNode'
+        raise ObsoleteNode.new(self, error.response)
+      when 'Poltergeist.ClickFailed'
+        raise ClickFailed.new(self, error.response)
       else
-        raise error
+        raise
       end
     end
 
     def find(selector)
-      browser.find(selector, id).map { |node| self.class.new(driver, node) }
+      command(:find_within, selector).map { |id| self.class.new(driver, page_id, id) }
     end
 
     def text

data/lib/capybara/poltergeist/server.rb

@@ -3,7 +3,7 @@ module Capybara::Poltergeist
     attr_reader :port, :socket, :timeout
 
     def initialize(timeout = nil)
-      @port    = find_available_port
+      @port    = Util.find_available_port
       @timeout = timeout
       start
     end
@@ -16,22 +16,17 @@ module Capybara::Poltergeist
       @socket = WebSocketServer.new(port, timeout)
     end
 
-    def restart
+    def stop
       @socket.close
-      @socket = WebSocketServer.new(port, timeout)
     end
 
-    def send(message)
-      @socket.send(message) or raise DeadClient.new(message)
+    def restart
+      stop
+      start
     end
 
-    private
-
-    def find_available_port
-      server = TCPServer.new('127.0.0.1', 0)
-      server.addr[1]
-    ensure
-      server.close if server
+    def send(message)
+      @socket.send(message) or raise DeadClient.new(message)
     end
   end
 end

data/lib/capybara/poltergeist/spawn.rb

@@ -0,0 +1,17 @@
+require 'childprocess'
+
+module Capybara::Poltergeist
+  module Spawn
+    def self.spawn(*args)
+      args = args.map(&:to_s)
+
+      if RUBY_VERSION >= "1.9"
+        Process.spawn(*args)
+      else
+        process = ChildProcess.build(*args)
+        process.start
+        process.pid
+      end
+    end
+  end
+end

data/lib/capybara/poltergeist/util.rb

@@ -0,0 +1,12 @@
+require 'socket'
+
+module Capybara::Poltergeist
+  module Util
+    def self.find_available_port
+      server = TCPServer.new('127.0.0.1', 0)
+      server.addr[1]
+    ensure
+      server.close if server
+    end
+  end
+end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -54,16 +54,34 @@ module Capybara::Poltergeist
     # just keep reading until we've received a full frame)
     RECV_SIZE = 1024
 
+    # How many seconds to try to bind to the port for before failing
+    BIND_TIMEOUT = 5
+
     attr_reader :port, :parser, :socket, :handler, :server
     attr_accessor :timeout
 
     def initialize(port, timeout = nil)
       @port    = port
       @parser  = Http::Parser.new
-      @server  = TCPServer.open(port)
+      @server  = start_server
       @timeout = timeout
     end
 
+    def start_server
+      time = Time.now
+
+      begin
+        TCPServer.open(port)
+      rescue Errno::EADDRINUSE
+        if (Time.now - time) < BIND_TIMEOUT
+          sleep(0.01)
+          retry
+        else
+          raise
+        end
+      end
+    end
+
     def connected?
       !socket.nil?
     end
@@ -104,11 +122,12 @@ module Capybara::Poltergeist
       end
     end
 
-    # Block until the next message is available from the Web Socket
+    # Block until the next message is available from the Web Socket.
+    # Raises Errno::EWOULDBLOCK if timeout is reached.
     def receive
       until handler.message?
-        IO.select([socket], [], [], timeout)
-        data = socket.recv_nonblock(RECV_SIZE)
+        IO.select([socket], [], [], timeout) or raise Errno::EWOULDBLOCK
+        data = socket.recv(RECV_SIZE)
         break if data.empty?
         handler.parse(data)
       end
@@ -121,12 +140,12 @@ module Capybara::Poltergeist
       accept unless connected?
       socket.write handler.encode(message)
       receive
-    rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+    rescue Errno::EWOULDBLOCK
       raise TimeoutError.new(message)
     end
 
     def close
-      [server, socket].each do |s|
+      [server, socket].compact.each do |s|
         s.close_read
         s.close_write
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &16526020 !ruby/object:Gem::Requirement
+  requirement: &20962640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,32 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16526020
+  version_requirements: *20962640
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &16525520 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &20960260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16525520
+  version_requirements: *20960260
 - !ruby/object:Gem::Dependency
-  name: sfl
-  requirement: &16525060 !ruby/object:Gem::Requirement
+  name: childprocess
+  requirement: &20958720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *16525060
+  version_requirements: *20958720
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &16524600 !ruby/object:Gem::Requirement
+  requirement: &20957520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,24 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *16524600
+  version_requirements: *20957520
 - !ruby/object:Gem::Dependency
   name: faye-websocket
-  requirement: &16524140 !ruby/object:Gem::Requirement
+  requirement: &21890060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *16524140
+  version_requirements: *21890060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16523680 !ruby/object:Gem::Requirement
+  requirement: &21888340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +79,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *16523680
+  version_requirements: *21888340
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16523220 !ruby/object:Gem::Requirement
+  requirement: &21886720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *16523220
+  version_requirements: *21886720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16522760 !ruby/object:Gem::Requirement
+  requirement: &21886100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +101,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *16522760
+  version_requirements: *21886100
 - !ruby/object:Gem::Dependency
   name: image_size
-  requirement: &16522300 !ruby/object:Gem::Requirement
+  requirement: &21212360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +112,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *16522300
+  version_requirements: *21212360
 description: PhantomJS driver for Capybara
 email:
 - j@jonathanleighton.com
@@ -121,9 +124,12 @@ files:
 - lib/capybara/poltergeist/client.rb
 - lib/capybara/poltergeist/server.rb
 - 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/version.rb
+- lib/capybara/poltergeist/spawn.rb
 - lib/capybara/poltergeist/driver.rb
 - lib/capybara/poltergeist/client/connection.coffee
 - lib/capybara/poltergeist/client/node.coffee