poltergeist 0.2.0 → 0.3.0

data/README.md

@@ -1,6 +1,8 @@
 # Poltergeist - A PhantomJS driver for Capybara #
 
-Version: 0.2.0
+Version: 0.3.0
+
+[![Build Status](https://secure.travis-ci.org/jonleighton/poltergeist.png)](http://travis-ci.org/jonleighton/poltergeist)
 
 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,
@@ -13,54 +15,62 @@ Add `poltergeist` to your Gemfile, and add in your test setup add:
     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 ##
+### Pre-built binaries ##
+
+There are [pre-built
+binaries](http://code.google.com/p/phantomjs/downloads/list) of
+PhantomJS for Linux, Mac and Windows. This is the easiest and best way
+to install it. The binaries including a patched version of Qt 4.8 so you
+don't need to install that separately.
+
+Note that if you have a 'dynamic' package, it's important to maintain
+the relationship between `bin/phantomjs` and `lib/`. This is because the
+`bin/phantomjs` binary looks in `../lib/` for its library files. So the
+best thing to do is to link (rather than copy) it into your `PATH`:
 
-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.
+```
+ln -s /path/to/phantomjs/bin/phantomjs /usr/local/bin/phantomjs
+```
 
-### Linux users, or if the pre-built Mac binary doesn't work ###
+### Compiling PhantomJS ###
 
-You need to build PhantomJS manually. Unfortunately, this not
-currently straightforward, for two reasons:
+If you're having trouble with a pre-built binary package, you can
+compile PhantomJS yourself. PhantomJS must be built against Qt 4.8, and
+some patches must be applied, so note that you cannot build it against
+your system install of Qt.
 
-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.
+[Download the tarball](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.4.1-source.tar.gz&can=2&q=)
+and run either `deploy/build-linux.sh --qt-4.8` or `cd deploy; ./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 (or link) the `bin/phantomjs` binary into your `PATH`.
 
-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.
+## Running on a CI ##
 
-So, you basically have two options:
+Currently PhantomJS is not 'truly headless', so to run it on a continuous integration
+server you will need to install [Xvfb](http://en.wikipedia.org/wiki/Xvfb).
+
+### On any generic server ###
+
+Install PhantomJS and invoke your tests with `xvfb-run`, (e.g. `xvfb-run
+rake`).
 
-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).
+### Using [Travis CI](http://travis-ci.org/) ###
 
-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`.
+Travis CI has PhantomJS installed already! So all you need to do is add
+the following to your `.travis.yml`:
 
-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.
+``` yaml
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+```
 
 ## What's supported? ##
 
@@ -97,6 +107,9 @@ test setup:
   * `:phantomjs` (String) - A custom path to the phantomjs executable
   * `:debug` (Boolean) - When true, debug output is logged to `STDERR`
   * `:logger` (Object responding to `puts`) - When present, debug output is written to this object
+  * `:timeout` (Numeric) - The number of seconds we'll wait for a response
+    when communicating with PhantomJS. `nil` means wait forever. Default
+    is 30.
 
 ## Bugs ##
 
@@ -140,6 +153,36 @@ makes debugging easier). Running `rake autocompile` will watch the
 `.coffee` files for changes, and compile them into
 `lib/capybara/client/compiled`.
 
+## Changes ##
+
+### 0.3 ###
+
+*   There was a bad bug to do with clicking elements in a page where the
+    page is smaller than the window. The incorrect position would be
+    calculated, and so the click would happen in the wrong place. This is
+    fixed. [Issue #8]
+
+*   Poltergeist didn't work in conjunction with the Thin web server,
+    because that server uses Event Machine, and Poltergeist was assuming
+    that it was the only thing in the process using EventMachine.
+
+    To solve this, EventMachine usage has been completely removed, which
+    has the welcome side-effect of being more efficient because we
+    no longer have the overhead of running a mostly-idle event loop.
+
+    [Issue #6]
+
+*   Added the `:timeout` option to configure the timeout when talking to
+    PhantomJS.
+
+### 0.2 ###
+
+*   First version considered 'ready', hopefully fewer problems.
+
+### 0.1 ###
+
+*   First version, various problems.
+
 ## License ##
 
 Copyright (c) 2011 Jonathan Leighton

data/lib/capybara/poltergeist.rb

@@ -2,12 +2,13 @@ require 'capybara'
 
 module Capybara
   module Poltergeist
-    autoload :Driver,        'capybara/poltergeist/driver'
-    autoload :Browser,       'capybara/poltergeist/browser'
-    autoload :Node,          'capybara/poltergeist/node'
-    autoload :ServerManager, 'capybara/poltergeist/server_manager'
-    autoload :Server,        'capybara/poltergeist/server'
-    autoload :Client,        'capybara/poltergeist/client'
+    autoload :Driver,          'capybara/poltergeist/driver'
+    autoload :Browser,         'capybara/poltergeist/browser'
+    autoload :Node,            'capybara/poltergeist/node'
+    autoload :ServerManager,   'capybara/poltergeist/server_manager'
+    autoload :Server,          'capybara/poltergeist/server'
+    autoload :WebSocketServer, 'capybara/poltergeist/web_socket_server'
+    autoload :Client,          'capybara/poltergeist/client'
 
     require 'capybara/poltergeist/errors'
   end

data/lib/capybara/poltergeist/browser.rb

@@ -4,12 +4,22 @@ module Capybara::Poltergeist
   class Browser
     attr_reader :options, :server, :client
 
+    DEFAULT_TIMEOUT = 30
+
     def initialize(options = {})
       @options = options
-      @server  = Server.new
+      @server  = Server.new(options.fetch(:timeout, DEFAULT_TIMEOUT))
       @client  = Client.new(server.port, options[:phantomjs])
     end
 
+    def timeout
+      server.timeout
+    end
+
+    def timeout=(sec)
+      server.timeout = sec
+    end
+
     def restart
       server.restart
       client.restart

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

@@ -81,8 +81,25 @@ class PoltergeistAgent.Node
     event.initEvent("change", true, false)
     @element.dispatchEvent(event)
 
+  insideBody: ->
+    @element == @agent.document.body ||
+    @agent.document.evaluate('ancestor::body', @element, null, XPathResult.BOOLEAN_TYPE, null).booleanValue
+
   text: ->
-    @element.textContent
+    return '' unless this.isVisible()
+
+    if this.insideBody()
+      el = @element
+    else
+      el = @agent.document.body
+
+    results = @agent.document.evaluate('.//text()[not(ancestor::script)]', el, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
+    text    = ''
+
+    for i in [0...results.snapshotLength]
+      node = results.snapshotItem(i)
+      text += node.textContent if this.isVisible(node.parentNode)
+    text
 
   getAttribute: (name) ->
     if name == 'checked' || name == 'selected'
@@ -123,19 +140,17 @@ class PoltergeistAgent.Node
   tagName: ->
     @element.tagName
 
-  elementVisible: (element) ->
+  isVisible: (element) ->
+    element = @element unless element
 
-  isVisible: (id) ->
-    visible = (element) ->
-      if @window.getComputedStyle(element).display == 'none'
-        false
-      else if element.parentElement
-        visible element.parentElement
-      else
-        true
-    visible @element
+    if @agent.window.getComputedStyle(element).display == 'none'
+      false
+    else if element.parentElement
+      this.isVisible element.parentElement
+    else
+      true
 
-  position: (id) ->
+  position: ->
     pos = (element) ->
       x = element.offsetLeft
       y = element.offsetTop
@@ -170,6 +185,3 @@ document.addEventListener(
   'DOMContentLoaded',
   -> console.log('__DOMContentLoaded')
 )
-
-# Important to return true here - Phantom seems to choke otherwise
-true

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

@@ -142,3 +142,6 @@ class Poltergeist.Browser
 
   exit: ->
     phantom.exit()
+
+  noop: ->
+    # NOOOOOOP!

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

@@ -90,8 +90,28 @@ PoltergeistAgent.Node = (function() {
     event.initEvent("change", true, false);
     return this.element.dispatchEvent(event);
   };
+  Node.prototype.insideBody = function() {
+    return this.element === this.agent.document.body || this.agent.document.evaluate('ancestor::body', this.element, null, XPathResult.BOOLEAN_TYPE, null).booleanValue;
+  };
   Node.prototype.text = function() {
-    return this.element.textContent;
+    var el, i, node, results, text, _ref;
+    if (!this.isVisible()) {
+      return '';
+    }
+    if (this.insideBody()) {
+      el = this.element;
+    } else {
+      el = this.agent.document.body;
+    }
+    results = this.agent.document.evaluate('.//text()[not(ancestor::script)]', el, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    text = '';
+    for (i = 0, _ref = results.snapshotLength; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {
+      node = results.snapshotItem(i);
+      if (this.isVisible(node.parentNode)) {
+        text += node.textContent;
+      }
+    }
+    return text;
   };
   Node.prototype.getAttribute = function(name) {
     if (name === 'checked' || name === 'selected') {
@@ -144,21 +164,19 @@ PoltergeistAgent.Node = (function() {
   Node.prototype.tagName = function() {
     return this.element.tagName;
   };
-  Node.prototype.elementVisible = function(element) {};
-  Node.prototype.isVisible = function(id) {
-    var visible;
-    visible = function(element) {
-      if (this.window.getComputedStyle(element).display === 'none') {
-        return false;
-      } else if (element.parentElement) {
-        return visible(element.parentElement);
-      } else {
-        return true;
-      }
-    };
-    return visible(this.element);
+  Node.prototype.isVisible = function(element) {
+    if (!element) {
+      element = this.element;
+    }
+    if (this.agent.window.getComputedStyle(element).display === 'none') {
+      return false;
+    } else if (element.parentElement) {
+      return this.isVisible(element.parentElement);
+    } else {
+      return true;
+    }
   };
-  Node.prototype.position = function(id) {
+  Node.prototype.position = function() {
     var pos;
     pos = function(element) {
       var parentPos, x, y;
@@ -194,5 +212,4 @@ PoltergeistAgent.Node = (function() {
 window.__poltergeist = new PoltergeistAgent;
 document.addEventListener('DOMContentLoaded', function() {
   return console.log('__DOMContentLoaded');
-});
-true;
+});

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

@@ -154,5 +154,6 @@ Poltergeist.Browser = (function() {
   Browser.prototype.exit = function() {
     return phantom.exit();
   };
+  Browser.prototype.noop = function() {};
   return Browser;
 })();

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

@@ -1,5 +1,5 @@
 var Poltergeist;
-if (phantom.version.major < 1 || phantom.version.minor < 4 || phantom.version.patch < 1) {
+if (("" + phantom.version.major + "." + phantom.version.minor + "." + phantom.version.patch) < "1.4.1") {
   console.log("Poltergeist requires a PhantomJS version of at least 1.4.1");
   phantom.exit(1);
 }

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

@@ -107,21 +107,21 @@ Poltergeist.WebPage = (function() {
     };
   };
   WebPage.prototype.validatedDimensions = function() {
-    var changed, dimensions, document;
+    var changed, dimensions, document, orig_left, orig_top;
     dimensions = this.dimensions();
     document = dimensions.document;
     changed = false;
+    orig_left = dimensions.left;
+    orig_top = dimensions.top;
     if (dimensions.right > document.width) {
-      dimensions.left -= dimensions.right - document.width;
+      dimensions.left = Math.max(0, dimensions.left - (dimensions.right - document.width));
       dimensions.right = document.width;
-      changed = true;
     }
     if (dimensions.bottom > document.height) {
-      dimensions.top -= dimensions.bottom - document.height;
+      dimensions.top = Math.max(0, dimensions.top - (dimensions.bottom - document.height));
       dimensions.bottom = document.height;
-      changed = true;
     }
-    if (changed) {
+    if (dimensions.left !== orig_left || dimensions.top !== orig_top) {
       this.setScrollPosition({
         left: dimensions.left,
         top: dimensions.top

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

@@ -1,6 +1,4 @@
-if phantom.version.major < 1 ||
-   phantom.version.minor < 4 ||
-   phantom.version.patch < 1
+if "#{phantom.version.major}.#{phantom.version.minor}.#{phantom.version.patch}" < "1.4.1"
   console.log "Poltergeist requires a PhantomJS version of at least 1.4.1"
   phantom.exit(1)
 

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

@@ -85,17 +85,18 @@ class Poltergeist.WebPage
     document   = dimensions.document
     changed    = false
 
+    orig_left = dimensions.left
+    orig_top  = dimensions.top
+
     if dimensions.right > document.width
-      dimensions.left -= dimensions.right - document.width
+      dimensions.left  = Math.max(0, dimensions.left - (dimensions.right - document.width))
       dimensions.right = document.width
-      changed = true
 
     if dimensions.bottom > document.height
-      dimensions.top -= dimensions.bottom - document.height
+      dimensions.top    = Math.max(0, dimensions.top - (dimensions.bottom - document.height))
       dimensions.bottom = document.height
-      changed = true
 
-    if changed
+    if dimensions.left != orig_left || dimensions.top != orig_top
       this.setScrollPosition(left: dimensions.left, top: dimensions.top)
 
     dimensions

data/lib/capybara/poltergeist/driver.rb

@@ -40,7 +40,7 @@ module Capybara::Poltergeist
     end
 
     def source
-      browser.source
+      browser.source.to_s
     end
 
     def find(selector)

data/lib/capybara/poltergeist/node.rb

@@ -21,7 +21,7 @@ module Capybara::Poltergeist
     end
 
     def text
-      command :text
+      command(:text).strip.gsub(/\s+/, ' ')
     end
 
     def [](name)

data/lib/capybara/poltergeist/server.rb

@@ -1,30 +1,32 @@
 module Capybara::Poltergeist
   class Server
-    attr_reader :port
+    attr_reader :port, :socket, :timeout
 
-    def initialize
-      @port = find_available_port
+    def initialize(timeout = nil)
+      @port    = find_available_port
+      @timeout = timeout
       start
     end
 
+    def timeout=(sec)
+      @timeout = @socket.timeout = sec
+    end
+
     def start
-      server_manager.start(port)
+      @socket = WebSocketServer.new(port, timeout)
     end
 
     def restart
-      server_manager.restart(port)
+      @socket.close
+      @socket = WebSocketServer.new(port, timeout)
     end
 
     def send(message)
-      server_manager.send(port, message)
+      @socket.send(message) or raise DeadClient.new(message)
     end
 
     private
 
-    def server_manager
-      ServerManager.instance
-    end
-
     def find_available_port
       server = TCPServer.new('127.0.0.1', 0)
       server.addr[1]

data/lib/capybara/poltergeist/version.rb

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

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -0,0 +1,135 @@
+require 'socket'
+require 'stringio'
+require 'http/parser'
+require 'faye/websocket'
+
+module Capybara::Poltergeist
+  # This is a 'custom' Web Socket server that is designed to be synchronous. What
+  # this means is that it sends a message, and then waits for a response. It does
+  # not expect to receive a message at any other time than right after it has sent
+  # a message. So it is basically operating a request/response cycle (which is not
+  # how Web Sockets are usually used, but it's what we want here, as we want to
+  # send a message to PhantomJS and then wait for it to respond).
+  class WebSocketServer
+    class FayeHandler
+      attr_reader :owner, :env, :parser
+
+      def initialize(owner, env)
+        @owner    = owner
+        @env      = env
+        @parser   = Faye::WebSocket.parser(env).new(self)
+        @messages = []
+      end
+
+      def url
+        "ws://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}/"
+      end
+
+      def handshake_response
+        parser.handshake_response
+      end
+
+      def parse(data)
+        parser.parse(data)
+      end
+
+      def encode(message)
+        parser.frame(Faye::WebSocket.encode(message))
+      end
+
+      def receive(message)
+        @messages << message
+      end
+
+      def message?
+        @messages.any?
+      end
+
+      def next_message
+        @messages.shift
+      end
+    end
+
+    # How much to try to read from the socket at once (it's kinda arbitrary because we
+    # just keep reading until we've received a full frame)
+    RECV_SIZE = 1024
+
+    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)
+      @timeout = timeout
+    end
+
+    def connected?
+      !socket.nil?
+    end
+
+    # Accept a client on the TCP server socket, then receive its initial HTTP request
+    # and use that to initialize a Web Socket.
+    def accept
+      @socket = server.accept
+
+      while msg = socket.gets
+        parser << msg
+        break if msg == "\r\n"
+      end
+
+      @handler = FayeHandler.new(self, env)
+      socket.write handler.handshake_response
+    end
+
+    # Note that the socket.read(8) assumes we're using the hixie-76 parser. This is
+    # fine for now as it corresponds to the version of Web Sockets that the version of
+    # WebKit in PhantomJS uses, but it might need to change in the future.
+    def env
+      @env ||= begin
+        env = {
+          'REQUEST_METHOD' => parser.http_method,
+          'SCRIPT_NAME'    => '',
+          'PATH_INFO'      => '',
+          'QUERY_STRING'   => '',
+          'SERVER_NAME'    => '127.0.0.1',
+          'SERVER_PORT'    => port.to_s,
+          'HTTP_ORIGIN'    => 'http://127.0.0.1:2000/',
+          'rack.input'     => StringIO.new(socket.read(8))
+        }
+        parser.headers.each do |header, value|
+          env['HTTP_' + header.upcase.gsub('-', '_')] = value
+        end
+        env
+      end
+    end
+
+    # Block until the next message is available from the Web Socket
+    def receive
+      until handler.message?
+        IO.select([socket], [], [], timeout)
+        data = socket.recv_nonblock(RECV_SIZE)
+        break if data.empty?
+        handler.parse(data)
+      end
+
+      handler.next_message
+    end
+
+    # Send a message and block until there is a response
+    def send(message)
+      accept unless connected?
+      socket.write handler.encode(message)
+      receive
+    rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+      raise TimeoutError.new(message)
+    end
+
+    def close
+      [server, socket].each do |s|
+        s.close_read
+        s.close_write
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17036740 !ruby/object:Gem::Requirement
+  requirement: &17990880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,43 +21,54 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17036740
+  version_requirements: *17990880
 - !ruby/object:Gem::Dependency
-  name: em-websocket
-  requirement: &17036240 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &17990000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *17036240
+  version_requirements: *17990000
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &17024280 !ruby/object:Gem::Requirement
+  name: sfl
+  requirement: &17988720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17024280
+  version_requirements: *17988720
 - !ruby/object:Gem::Dependency
-  name: sfl
-  requirement: &17023220 !ruby/object:Gem::Requirement
+  name: http_parser.rb
+  requirement: &17987320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *17987320
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: &17986640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *17023220
+  version_requirements: *17986640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17022640 !ruby/object:Gem::Requirement
+  requirement: &17985780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *17022640
+  version_requirements: *17985780
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17021400 !ruby/object:Gem::Requirement
+  requirement: &17984960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *17021400
+  version_requirements: *17984960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17020760 !ruby/object:Gem::Requirement
+  requirement: &17967380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *17020760
+  version_requirements: *17967380
 - !ruby/object:Gem::Dependency
   name: image_size
-  requirement: &17020260 !ruby/object:Gem::Requirement
+  requirement: &17966680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *17020260
+  version_requirements: *17966680
 description: PhantomJS driver for Capybara
 email:
 - j@jonathanleighton.com
@@ -111,6 +122,7 @@ files:
 - lib/capybara/poltergeist/server.rb
 - lib/capybara/poltergeist/browser.rb
 - lib/capybara/poltergeist/errors.rb
+- lib/capybara/poltergeist/web_socket_server.rb
 - lib/capybara/poltergeist/version.rb
 - lib/capybara/poltergeist/driver.rb
 - lib/capybara/poltergeist/client/connection.coffee
@@ -125,11 +137,9 @@ files:
 - lib/capybara/poltergeist/client/web_page.coffee
 - lib/capybara/poltergeist/client/browser.coffee
 - lib/capybara/poltergeist/client/agent.coffee
-- lib/capybara/poltergeist/server_manager.rb
 - lib/capybara/poltergeist/node.rb
 - LICENSE
 - README.md
-- CHANGELOG.md
 homepage: http://github.com/jonleighton/poltergeist
 licenses: []
 post_install_message: 
@@ -155,3 +165,4 @@ signing_key:
 specification_version: 3
 summary: PhantomJS driver for Capybara
 test_files: []
+has_rdoc: 

data/CHANGELOG.md

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

data/lib/capybara/poltergeist/server_manager.rb

@@ -1,122 +0,0 @@
-require 'em-websocket'
-require 'timeout'
-require 'singleton'
-
-module Capybara::Poltergeist
-  # The reason for the lolzy thread code is because the EM reactor blocks the thread, so
-  # we have to put it in its own thread.
-  #
-  # The reason we are using EM, is because it has a WebSocket library. If there's a decent
-  # WebSocket library that doesn't require an event loop, we can use that.
-  class ServerManager
-    include Singleton
-
-    class << self
-      attr_accessor :timeout
-    end
-
-    self.timeout = 30
-
-    attr_reader :sockets
-
-    def initialize
-      @instruction = nil
-      @response    = nil
-      @sockets     = {}
-      @waiting     = false
-
-      @main   = Thread.current
-      @thread = Thread.new { start_event_loop }
-      @thread.abort_on_exception = true
-    end
-
-    def start(port)
-      thread_execute { start_websocket_server(port) }
-    end
-
-    # This isn't a 'proper' restart. It's more like 'wait for the client to connect again'.
-    def restart(port)
-      sockets[port] = nil
-      @thread.run
-    end
-
-    def send(port, message)
-      @message = nil
-
-      Timeout.timeout(self.class.timeout) do
-        # Ensure there is a socket before trying to send a message on it.
-        Thread.pass until sockets[port]
-
-        # Send the message
-        thread_execute { sockets[port].send(message) }
-
-        # Wait for the response message
-        Thread.pass until @message || sockets[port].nil?
-      end
-
-      if sockets[port]
-        @message
-      else
-        raise DeadClient.new(message)
-      end
-    rescue Timeout::Error
-      raise TimeoutError.new(message)
-    end
-
-    def thread_execute(&instruction)
-      # Ensure that the thread is waiting for an instruction before we wake it up
-      # to receive the instruction
-      Thread.pass until @waiting
-
-      @instruction = instruction
-      @waiting     = false
-
-      # Bring the EM thread out of its sleep so that it can execute the instruction.
-      @thread.run
-    end
-
-    def start_event_loop
-      EM.run { await_instruction }
-    end
-
-    def start_websocket_server(port)
-      EventMachine.start_server('127.0.0.1', port, EventMachine::WebSocket::Connection, {}) do |socket|
-        socket.onopen    { connection_opened(port, socket)     }
-        socket.onclose   { connection_closed(port)             }
-        socket.onmessage { |message| message_received(message) }
-      end
-    end
-
-    def connection_opened(port, socket)
-      sockets[port] = socket
-      await_instruction
-    end
-
-    def connection_closed(port)
-      sockets[port] = nil
-    end
-
-    def message_received(message)
-      @message = message
-      await_instruction
-    end
-
-    # Stop the thread so that it can be manually scheduled by the parent once there is
-    # something to do
-    def await_instruction
-      # Sleep this thread. The main thread will wake us up when there is an instruction
-      # to perform.
-      @waiting = true
-      Thread.stop
-
-      # Main thread has woken us up, so execute the current instruction.
-      if @instruction
-        @instruction.call
-        @instruction = nil
-      end
-
-      # Continue execution of the thread until a socket callback fires, which will
-      # trigger then method again and send us back to sleep.
-    end
-  end
-end