poltergeist 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.2 ##
+
+* First version considered 'ready', hopefully fewer problems.
+
+## 0.1 ##
+
+* First version, various problems.

data/README.md

@@ -1,6 +1,6 @@
 # Poltergeist - A PhantomJS driver for Capybara #
 
-Version: 0.1.0
+Version: 0.2.0
 
 Poltergeist is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to
 run your Capybara tests on a headless [WebKit](http://webkit.org) browser,
@@ -8,29 +8,84 @@ provided by [PhantomJS](http://www.phantomjs.org/).
 
 ## Installation ##
 
-Add `poltergeist` to your Gemfile, and add `Capybara.javascript_driver = :poltergeist`
-in your test setup.
+Add `poltergeist` to your Gemfile, and add in your test setup add:
 
-You will also need PhantomJS 1.3+ on your system.
-[Here's how to do that](http://code.google.com/p/phantomjs/wiki/BuildInstructions).
+    require 'capybara/poltergeist'
+    Capybara.javascript_driver = :poltergeist
 
 Currently PhantomJS is not 'truly headless', so to run it on a continuous integration
 server you will need to use [Xvfb](http://en.wikipedia.org/wiki/Xvfb). You can either use the
 [headless gem](https://github.com/leonid-shevtsov/headless) for this,
 or make sure that Xvfb is running and the `DISPLAY` environment variable is set.
 
+## Installing PhantomJS ##
+
+You need PhantomJS 1.4.1+, built against Qt 4.8, on your system.
+
+### Mac users ##
+
+By far the easiest, most reliable thing to do is to [install the
+pre-built static binary](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.4.1-macosx-static-x86.zip&can=2&q=).
+Try this first.
+
+### Linux users, or if the pre-built Mac binary doesn't work ###
+
+You need to build PhantomJS manually. Unfortunately, this not
+currently straightforward, for two reasons:
+
+1. Using Poltergeist with PhantomJS built against Qt 4.7 causes
+   segfaults in WebKit's Javascript engine. Fortunately, this problem
+   doesn't occur under the recently released Qt 4.8. But if you don't
+   have Qt 4.8 on your system (check with `qmake --version`), you'll
+   need to build it.
+
+2. A change in the version of WebKit bundled with Qt 4.8 means that in order
+   to be able to attach files to file `<input>` elements, we must apply
+   a patch to the Qt source tree that PhantomJS is built against.
+
+So, you basically have two options:
+
+1. **If you have Qt 4.8 on your system, and don't need to use file
+   inputs**, [follow the standard PhantomJS build instructions](http://code.google.com/p/phantomjs/wiki/BuildInstructions).
+
+2. **Otherwise**, [download the PhantomJS tarball](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.4.1-source.tar.gz&can=2&q=),
+   `cd deploy/` and run either `./build-linux.sh --qt-4.8` or `./build-mac.sh`.
+   The script will
+   download Qt, apply some patches, build it, and then build PhantomJS
+   against the patched build of Qt. It takes quite a while, around 30
+   minutes on a modern computer with two hyperthreaded cores. Afterwards,
+   you should copy the `bin/phantomjs` binary into your `PATH`.
+
+PhantomJS 1.5 plans to bundle a stripped-down version of Qt, which will
+reduce the build time a bit (although most of the time is spent building
+WebKit) and make it easier to apply patches. When it is possible to make
+static builds for Linux, those may be provided too, so most users will
+avoid having to build it themselves.
+
 ## What's supported? ##
 
 Poltergeist supports basically everything that is supported by the stock Selenium driver,
 including Javascript, drag-and-drop, etc.
 
-Additionally, you can grab screenshots of the page at any point by calling
+There are some additional features:
+
+### Taking screenshots ###
+
+You can grab screenshots of the page at any point by calling
 `page.driver.render('/path/to/file.png')` (this works the same way as the PhantomJS
 render feature, so you can specify other extensions like `.pdf`, `.gif`, etc.)
 
-## Customisation ##
+By default, only the viewport will be rendered (the part of the page that is in view). To render
+the entire page, use `page.driver.render('/path/to/file.png', :full => true)`.
+
+### Resizing the window ###
 
-You can customise the way that Capybara sets up Poltegeist via the following code in your
+Sometimes the window size is important to how things are rendered. Poltergeist sets the window
+size to 1024x768 by default, but you can set this yourself with `page.driver.resize(width, height)`.
+
+## Customization ##
+
+You can customize the way that Capybara sets up Poltegeist via the following code in your
 test setup:
 
     Capybara.register_driver :poltergeist do |app|
@@ -46,7 +101,8 @@ test setup:
 ## Bugs ##
 
 Please file bug reports on Github and include example code to reproduce the problem wherever
-possible. (Tests are even better.)
+possible. (Tests are even better.) Please also provide the output with
+`:debug` turned on, and screenshots if you think it's relevant.
 
 ## Why not use [capybara-webkit](https://github.com/thoughtbot/capybara-webkit)? ##
 
@@ -54,13 +110,36 @@ If capybara-webkit works for you, then by all means carry on using it.
 
 However, I have had some trouble with it, and Poltergeist basically started
 as an experiment to see whether a PhantomJS driver was possible. (It turned out it
-was, but only thanks to some new features in the recent 1.3.0 release.)
+was, but only thanks to some new features since the 1.3 release.)
 
 In the long term, I think having a PhantomJS driver makes sense, because that allows
 PhantomJS to concentrate on being an awesome headless browser, while the capybara driver
 (Poltergeist) is able to be the minimal amount of glue code necessary to drive the
 browser.
 
+I also find it more pleasant to hack in CoffeeScript than C++,
+particularly as my C++ experience only goes as far as trying to make
+PhantomJS/Qt/WebKit work with Poltergeist :)
+
+## Hacking ##
+
+Contributions are very welcome and I will happily give commit access to
+anyone who does a few good pull requests.
+
+To get setup, run `bundle install`. You can run the full test suite with
+`rspec spec/` or `rake`.
+
+I previously set up the repository on [Travis CI](http://travis-ci.org/)
+but unfortunately given they need a custom-built Qt+PhantomJS in order
+to pass, it can't be used for now. When static Linux PhantomJS builds
+are working this can be revisited.
+
+While PhantomJS is capable of compiling and running CoffeeScript code
+directly, I prefer to compile the code myself and distribute that (it
+makes debugging easier). Running `rake autocompile` will watch the
+`.coffee` files for changes, and compile them into
+`lib/capybara/client/compiled`.
+
 ## License ##
 
 Copyright (c) 2011 Jonathan Leighton

data/lib/capybara/poltergeist.rb

@@ -9,9 +9,7 @@ module Capybara
     autoload :Server,        'capybara/poltergeist/server'
     autoload :Client,        'capybara/poltergeist/client'
 
-    autoload :Error,        'capybara/poltergeist/errors'
-    autoload :BrowserError, 'capybara/poltergeist/errors'
-    autoload :ObsoleteNode, 'capybara/poltergeist/errors'
+    require 'capybara/poltergeist/errors'
   end
 end
 

data/lib/capybara/poltergeist/browser.rb

@@ -101,8 +101,12 @@ module Capybara::Poltergeist
       command 'reset'
     end
 
-    def render(path)
-      command 'render', path
+    def render(path, options = {})
+      command 'render', path, !!options[:full]
+    end
+
+    def resize(width, height)
+      command 'resize', width, height
     end
 
     def logger
@@ -125,6 +129,10 @@ module Capybara::Poltergeist
       else
         json['response']
       end
+
+    rescue DeadClient
+      restart
+      raise
     end
   end
 end

data/lib/capybara/poltergeist/client.rb

@@ -1,10 +1,10 @@
-require 'open3'
+require 'sfl'
 
 module Capybara::Poltergeist
   class Client
     PHANTOM_SCRIPT = File.expand_path('../client/compiled/main.js', __FILE__)
 
-    attr_reader :pid, :port, :path
+    attr_reader :thread, :pid, :err, :port, :path
 
     def initialize(port, path = nil)
       @port = port
@@ -15,38 +15,11 @@ module Capybara::Poltergeist
     end
 
     def start
-      @pid = Process.fork do
-        Open3.popen3("#{path} #{PHANTOM_SCRIPT} #{port}") do |stdin, stdout, stderr|
-          loop do
-            select = IO.select([stdout, stderr])
-            stream = select.first.first
-
-            break if stream.eof?
-
-            if stream == stdout
-              STDOUT.puts stdout.readline
-            elsif stream == stderr
-              line = stderr.readline
-
-              # QtWebkit seems to throw this error all the time when using WebSockets, but
-              # it doesn't appear to actually stop anything working, so filter it out.
-              #
-              # This isn't the nicest solution I know :( Hopefully it will be fixed in
-              # QtWebkit (if you search for this string, you'll see it's been reported in
-              # various places).
-              unless line.include?('WebCore::SocketStreamHandlePrivate::socketSentData()')
-                STDERR.puts line
-              end
-            end
-          end
-        end
-      end
+      @pid = Kernel.spawn("#{path} #{PHANTOM_SCRIPT} #{port}")
     end
 
     def stop
       Process.kill('TERM', pid)
-    rescue Errno::ESRCH
-      # Bovvered, I ain't
     end
 
     def restart

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

@@ -76,7 +76,7 @@ class Poltergeist.Browser
     @owner.sendResponse @page.evaluate("function() { return #{script} }")
 
   execute: (script) ->
-    @page.execute("function() { return #{script} }")
+    @page.execute("function() { #{script} }")
     @owner.sendResponse(true)
 
   push_frame: (id) ->
@@ -88,9 +88,13 @@ class Poltergeist.Browser
     @owner.sendResponse(true)
 
   click: (id) ->
+    load_detected = false
+
     # Detect if the click event triggers a page load. If it does, don't send
     # a response here, because the response will be sent once the page has loaded.
-    @page.onLoadStarted = => @awaiting_response = true
+    @page.onLoadStarted = =>
+      @awaiting_response = true
+      load_detected      = true
 
     @page.get(id).click()
 
@@ -99,9 +103,9 @@ class Poltergeist.Browser
     setTimeout(
       =>
         @page.onLoadStarted = null
-        @owner.sendResponse(true) unless @awaiting_response
+        @owner.sendResponse(true) unless load_detected
       ,
-      0
+      10
     )
 
   drag: (id, other_id) ->
@@ -116,6 +120,25 @@ class Poltergeist.Browser
     this.resetPage()
     @owner.sendResponse(true)
 
-  render: (path) ->
-    @page.render(path)
+  render: (path, full) ->
+    dimensions = @page.validatedDimensions()
+    document   = dimensions.document
+    viewport   = dimensions.viewport
+
+    if full
+      @page.setScrollPosition(left: 0, top: 0)
+      @page.setClipRect(left: 0, top: 0, width: document.width, height: document.height)
+      @page.render(path)
+      @page.setScrollPosition(left: dimensions.left, top: dimensions.top)
+    else
+      @page.setClipRect(left: 0, top: 0, width: viewport.width, height: viewport.height)
+      @page.render(path)
+
+    @owner.sendResponse(true)
+
+  resize: (width, height) ->
+    @page.setViewportSize(width: width, height: height)
     @owner.sendResponse(true)
+
+  exit: ->
+    phantom.exit()

data/lib/capybara/poltergeist/client/compiled/browser.js

@@ -74,7 +74,7 @@ Poltergeist.Browser = (function() {
     return this.owner.sendResponse(this.page.evaluate("function() { return " + script + " }"));
   };
   Browser.prototype.execute = function(script) {
-    this.page.execute("function() { return " + script + " }");
+    this.page.execute("function() { " + script + " }");
     return this.owner.sendResponse(true);
   };
   Browser.prototype.push_frame = function(id) {
@@ -86,16 +86,19 @@ Poltergeist.Browser = (function() {
     return this.owner.sendResponse(true);
   };
   Browser.prototype.click = function(id) {
+    var load_detected;
+    load_detected = false;
     this.page.onLoadStarted = __bind(function() {
-      return this.awaiting_response = true;
+      this.awaiting_response = true;
+      return load_detected = true;
     }, this);
     this.page.get(id).click();
     return setTimeout(__bind(function() {
       this.page.onLoadStarted = null;
-      if (!this.awaiting_response) {
+      if (!load_detected) {
         return this.owner.sendResponse(true);
       }
-    }, this), 0);
+    }, this), 10);
   };
   Browser.prototype.drag = function(id, other_id) {
     this.page.get(id).dragTo(this.page.get(other_id));
@@ -109,9 +112,47 @@ Poltergeist.Browser = (function() {
     this.resetPage();
     return this.owner.sendResponse(true);
   };
-  Browser.prototype.render = function(path) {
-    this.page.render(path);
+  Browser.prototype.render = function(path, full) {
+    var dimensions, document, viewport;
+    dimensions = this.page.validatedDimensions();
+    document = dimensions.document;
+    viewport = dimensions.viewport;
+    if (full) {
+      this.page.setScrollPosition({
+        left: 0,
+        top: 0
+      });
+      this.page.setClipRect({
+        left: 0,
+        top: 0,
+        width: document.width,
+        height: document.height
+      });
+      this.page.render(path);
+      this.page.setScrollPosition({
+        left: dimensions.left,
+        top: dimensions.top
+      });
+    } else {
+      this.page.setClipRect({
+        left: 0,
+        top: 0,
+        width: viewport.width,
+        height: viewport.height
+      });
+      this.page.render(path);
+    }
+    return this.owner.sendResponse(true);
+  };
+  Browser.prototype.resize = function(width, height) {
+    this.page.setViewportSize({
+      width: width,
+      height: height
+    });
     return this.owner.sendResponse(true);
   };
+  Browser.prototype.exit = function() {
+    return phantom.exit();
+  };
   return Browser;
 })();

data/lib/capybara/poltergeist/client/compiled/main.js

@@ -1,6 +1,6 @@
 var Poltergeist;
-if (phantom.version.major < 1 || phantom.version.minor < 3) {
-  console.log("Poltergeist requires a PhantomJS version of at least 1.3");
+if (phantom.version.major < 1 || phantom.version.minor < 4 || phantom.version.patch < 1) {
+  console.log("Poltergeist requires a PhantomJS version of at least 1.4.1");
   phantom.exit(1);
 }
 Poltergeist = (function() {
@@ -35,4 +35,4 @@ phantom.injectJs('web_page.js');
 phantom.injectJs('node.js');
 phantom.injectJs('connection.js');
 phantom.injectJs('browser.js');
-new Poltergeist(phantom.args[0]);
+new Poltergeist(phantom.args[0]);

data/lib/capybara/poltergeist/client/compiled/node.js

@@ -29,21 +29,22 @@ Poltergeist.Node = (function() {
     _fn(name);
   }
   Node.prototype.scrollIntoView = function() {
-    var pos, scroll, size, viewport, _ref2, _ref3;
-    viewport = this.page.viewport();
-    size = this.page.documentSize();
+    var dimensions, document, pos, scroll, viewport, _ref2, _ref3;
+    dimensions = this.page.validatedDimensions();
+    document = dimensions.document;
+    viewport = dimensions.viewport;
     pos = this.position();
     scroll = {
-      left: viewport.left,
-      top: viewport.top
+      left: dimensions.left,
+      top: dimensions.top
     };
-    if (!((viewport.left <= (_ref2 = pos.x) && _ref2 < viewport.right))) {
-      scroll.left = Math.min(pos.x, size.width - viewport.width);
+    if (!((dimensions.left <= (_ref2 = pos.x) && _ref2 < dimensions.right))) {
+      scroll.left = Math.min(pos.x, document.width - viewport.width);
     }
-    if (!((viewport.top <= (_ref3 = pos.y) && _ref3 < viewport.bottom))) {
-      scroll.top = Math.min(pos.y, size.height - viewport.height);
+    if (!((dimensions.top <= (_ref3 = pos.y) && _ref3 < dimensions.bottom))) {
+      scroll.top = Math.min(pos.y, document.height - viewport.height);
     }
-    if (scroll.left !== viewport.left || scroll.top !== viewport.top) {
+    if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
       this.page.setScrollPosition(scroll);
     }
     return {

data/lib/capybara/poltergeist/client/compiled/web_page.js

@@ -9,6 +9,10 @@ Poltergeist.WebPage = (function() {
     this["native"] = require('webpage').create();
     this.nodes = {};
     this._source = "";
+    this.setViewportSize({
+      width: 1024,
+      height: 768
+    });
     _ref = WebPage.CALLBACKS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       callback = _ref[_i];
@@ -74,25 +78,57 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.viewportSize = function() {
     return this["native"].viewportSize;
   };
+  WebPage.prototype.setViewportSize = function(size) {
+    return this["native"].viewportSize = size;
+  };
   WebPage.prototype.scrollPosition = function() {
     return this["native"].scrollPosition;
   };
   WebPage.prototype.setScrollPosition = function(pos) {
     return this["native"].scrollPosition = pos;
   };
-  WebPage.prototype.viewport = function() {
-    var scroll, size;
+  WebPage.prototype.clipRect = function() {
+    return this["native"].clipRect;
+  };
+  WebPage.prototype.setClipRect = function(rect) {
+    return this["native"].clipRect = rect;
+  };
+  WebPage.prototype.dimensions = function() {
+    var scroll, viewport;
     scroll = this.scrollPosition();
-    size = this.viewportSize();
+    viewport = this.viewportSize();
     return {
       top: scroll.top,
-      bottom: scroll.top + size.height,
+      bottom: scroll.top + viewport.height,
       left: scroll.left,
-      right: scroll.left + size.width,
-      width: size.width,
-      height: size.height
+      right: scroll.left + viewport.width,
+      viewport: viewport,
+      document: this.documentSize()
     };
   };
+  WebPage.prototype.validatedDimensions = function() {
+    var changed, dimensions, document;
+    dimensions = this.dimensions();
+    document = dimensions.document;
+    changed = false;
+    if (dimensions.right > document.width) {
+      dimensions.left -= dimensions.right - document.width;
+      dimensions.right = document.width;
+      changed = true;
+    }
+    if (dimensions.bottom > document.height) {
+      dimensions.top -= dimensions.bottom - document.height;
+      dimensions.bottom = document.height;
+      changed = true;
+    }
+    if (changed) {
+      this.setScrollPosition({
+        left: dimensions.left,
+        top: dimensions.top
+      });
+    }
+    return dimensions;
+  };
   WebPage.prototype.get = function(id) {
     var _base;
     return (_base = this.nodes)[id] || (_base[id] = new Poltergeist.Node(this, id));

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

@@ -1,5 +1,7 @@
-if phantom.version.major < 1 || phantom.version.minor < 3
-  console.log "Poltergeist requires a PhantomJS version of at least 1.3"
+if phantom.version.major < 1 ||
+   phantom.version.minor < 4 ||
+   phantom.version.patch < 1
+  console.log "Poltergeist requires a PhantomJS version of at least 1.4.1"
   phantom.exit(1)
 
 class Poltergeist

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

@@ -21,19 +21,20 @@ class Poltergeist.Node
           @page.nodeCall(@id, name, arguments)
 
   scrollIntoView: ->
-    viewport = @page.viewport()
-    size     = @page.documentSize()
-    pos      = this.position()
+    dimensions = @page.validatedDimensions()
+    document   = dimensions.document
+    viewport   = dimensions.viewport
+    pos        = this.position()
 
-    scroll = { left: viewport.left, top: viewport.top }
+    scroll = { left: dimensions.left, top: dimensions.top }
 
-    unless viewport.left <= pos.x < viewport.right
-      scroll.left = Math.min(pos.x, size.width - viewport.width)
+    unless dimensions.left <= pos.x < dimensions.right
+      scroll.left = Math.min(pos.x, document.width - viewport.width)
 
-    unless viewport.top <= pos.y < viewport.bottom
-      scroll.top = Math.min(pos.y, size.height - viewport.height)
+    unless dimensions.top <= pos.y < dimensions.bottom
+      scroll.top = Math.min(pos.y, document.height - viewport.height)
 
-    if scroll.left != viewport.left || scroll.top != viewport.top
+    if scroll.left != dimensions.left || scroll.top != dimensions.top
       @page.setScrollPosition(scroll)
 
     position: this.relativePosition(pos, scroll),

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

@@ -9,6 +9,8 @@ class Poltergeist.WebPage
     @nodes   = {}
     @_source = ""
 
+    this.setViewportSize(width: 1024, height: 768)
+
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
 
@@ -27,7 +29,7 @@ class Poltergeist.WebPage
   onInitializedNative: ->
     @_source = null
     this.injectAgent()
-    this.setScrollPosition({ left: 0, top: 0})
+    this.setScrollPosition({ left: 0, top: 0 })
 
   injectAgent: ->
     if this.evaluate(-> typeof __poltergeist) == "undefined"
@@ -53,19 +55,50 @@ class Poltergeist.WebPage
   viewportSize: ->
     @native.viewportSize
 
+  setViewportSize: (size) ->
+    @native.viewportSize = size
+
   scrollPosition: ->
     @native.scrollPosition
 
   setScrollPosition: (pos) ->
     @native.scrollPosition = pos
 
-  viewport: ->
-    scroll = this.scrollPosition()
-    size   = this.viewportSize()
+  clipRect: ->
+    @native.clipRect
+
+  setClipRect: (rect) ->
+    @native.clipRect = rect
+
+  dimensions: ->
+    scroll   = this.scrollPosition()
+    viewport = this.viewportSize()
+
+    top:    scroll.top,  bottom: scroll.top  + viewport.height,
+    left:   scroll.left, right:  scroll.left + viewport.width,
+    viewport: viewport
+    document: this.documentSize()
+
+  # A work around for http://code.google.com/p/phantomjs/issues/detail?id=277
+  validatedDimensions: ->
+    dimensions = this.dimensions()
+    document   = dimensions.document
+    changed    = false
+
+    if dimensions.right > document.width
+      dimensions.left -= dimensions.right - document.width
+      dimensions.right = document.width
+      changed = true
+
+    if dimensions.bottom > document.height
+      dimensions.top -= dimensions.bottom - document.height
+      dimensions.bottom = document.height
+      changed = true
+
+    if changed
+      this.setScrollPosition(left: dimensions.left, top: dimensions.top)
 
-    top:    scroll.top,  bottom: scroll.top + size.height,
-    left:   scroll.left, right:  scroll.left + size.width,
-    width:  size.width,  height: size.height
+    dimensions
 
   get: (id) ->
     @nodes[id] or= new Poltergeist.Node(this, id)

data/lib/capybara/poltergeist/driver.rb

@@ -64,8 +64,12 @@ module Capybara::Poltergeist
       browser.reset
     end
 
-    def render(path)
-      browser.render(path)
+    def render(path, options = {})
+      browser.render(path, options)
+    end
+
+    def resize(width, height)
+      browser.resize(width, height)
     end
 
     def wait?

data/lib/capybara/poltergeist/errors.rb

@@ -22,5 +22,25 @@ module Capybara
         @node = node
       end
     end
+
+    class TimeoutError < Error
+      def initialize(message)
+        @message = message
+      end
+
+      def message
+        "Timed out waiting for response to #{@message}"
+      end
+    end
+
+    class DeadClient < Error
+      def initialize(message)
+        @message = message
+      end
+
+      def message
+        "The PhantomJS client died while processing #{@message}"
+      end
+    end
   end
 end

data/lib/capybara/poltergeist/node.rb

@@ -34,15 +34,12 @@ module Capybara::Poltergeist
 
     def set(value)
       if tag_name == 'input'
-        type = self[:type]
-
-        if type == 'radio'
+        case self[:type]
+        when 'radio'
           click
-        elsif type == 'checkbox'
-          if value && !checked? || !value && checked?
-            click
-          end
-        elsif type == 'file'
+        when 'checkbox'
+          click if value != checked?
+        when 'file'
           command :select_file, value
         else
           command :set, value

data/lib/capybara/poltergeist/server_manager.rb

@@ -11,14 +11,12 @@ module Capybara::Poltergeist
   class ServerManager
     include Singleton
 
-    TIMEOUT = 30
-
-    class TimeoutError < StandardError
-      def initialize(message)
-        super "Server timed out waiting for response to #{@message}"
-      end
+    class << self
+      attr_accessor :timeout
     end
 
+    self.timeout = 30
+
     attr_reader :sockets
 
     def initialize
@@ -45,7 +43,7 @@ module Capybara::Poltergeist
     def send(port, message)
       @message = nil
 
-      Timeout.timeout(TIMEOUT, TimeoutError.new(message)) do
+      Timeout.timeout(self.class.timeout) do
         # Ensure there is a socket before trying to send a message on it.
         Thread.pass until sockets[port]
 
@@ -53,10 +51,16 @@ module Capybara::Poltergeist
         thread_execute { sockets[port].send(message) }
 
         # Wait for the response message
-        Thread.pass until @message
+        Thread.pass until @message || sockets[port].nil?
       end
 
-      @message
+      if sockets[port]
+        @message
+      else
+        raise DeadClient.new(message)
+      end
+    rescue Timeout::Error
+      raise TimeoutError.new(message)
     end
 
     def thread_execute(&instruction)
@@ -77,13 +81,9 @@ module Capybara::Poltergeist
 
     def start_websocket_server(port)
       EventMachine.start_server('127.0.0.1', port, EventMachine::WebSocket::Connection, {}) do |socket|
-        socket.onopen do
-          connection_opened(port, socket)
-        end
-
-        socket.onmessage do |message|
-          message_received(message)
-        end
+        socket.onopen    { connection_opened(port, socket)     }
+        socket.onclose   { connection_closed(port)             }
+        socket.onmessage { |message| message_received(message) }
       end
     end
 
@@ -92,6 +92,10 @@ module Capybara::Poltergeist
       await_instruction
     end
 
+    def connection_closed(port)
+      sockets[port] = nil
+    end
+
     def message_received(message)
       @message = message
       await_instruction

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &20250700 !ruby/object:Gem::Requirement
+  requirement: &17036740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20250700
+  version_requirements: *17036740
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &20220020 !ruby/object:Gem::Requirement
+  requirement: &17036240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *20220020
+  version_requirements: *17036240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20216800 !ruby/object:Gem::Requirement
+  requirement: &17024280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,62 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *20216800
+  version_requirements: *17024280
+- !ruby/object:Gem::Dependency
+  name: sfl
+  requirement: &17023220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17023220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &17022640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *17022640
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &17021400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *17021400
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &17020760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *17020760
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: &17020260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *17020260
 description: PhantomJS driver for Capybara
 email:
 - j@jonathanleighton.com
@@ -95,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: PhantomJS driver for Capybara