poltergeist 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd4a7dfd79219a924c01ec792ce5baf8e9d78a6e
-  data.tar.gz: 5c6c3687f0e65c19cd2247b3ce77302ba7c408ea
+  metadata.gz: a65b5bdad64852e243d1097f272634b945bf2c09
+  data.tar.gz: 3f79fd0d9e6ea7c32667f278941cd6f394078092
 SHA512:
-  metadata.gz: 28abc4905c9818ea5b286bdc4472cfacbc7095a73959052c515b5bd7cb663d03545e1036a3285a0a85f1c6be5521b941a0ffeb0c70728e91531b280d6ab1d131
-  data.tar.gz: 4655a8ec8cf83b6b2dba829fec3f6b429a5729c841e9ee4361304c70586fe2fe704a6d8f6a7f9f1fef92ce214e1749d41467ce3ae83d2b568e372ec814d96e18
+  metadata.gz: 416b123a2ab427a59e681dbc1a9c34cc904649f80f5da67dce666a3c27074f42153840471ceadb0d25ecb0cf57429762b6e37244cd0cab4489edc024f86094cb
+  data.tar.gz: 02a445954d2ee06aeb89db30ebcfcfa1da0201f0211c4762caab67d17d0ac852a5ccf1a75d1ec109783fc34c79fe9d3e261c24efaa6140d4086d0dfb1711d2d8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jonathan Leighton
+Copyright (c) 2011-2013 Jonathan Leighton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,7 +9,7 @@ provided by [PhantomJS](http://www.phantomjs.org/).
 **If you're viewing this at https://github.com/jonleighton/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.4.1).](https://github.com/jonleighton/poltergeist/tree/v1.4.1)**
+(1.5.0).](https://github.com/jonleighton/poltergeist/tree/v1.5.0)**
 
 ## Getting help ##
 
@@ -43,26 +43,25 @@ dependencies* (you don't need Qt, or a running X server, etc.)
 
 * *Homebrew*: `brew install phantomjs`
 * *MacPorts*: `sudo port install phantomjs`
-* *Manual install*: [Download this](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.8.1-macosx.zip&can=2&q=)
+* *Manual install*: [Download this](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-macosx.zip)
 
 ### Linux ###
 
-* Download the [32
-bit](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.8.1-linux-i686.tar.bz2&can=2&q=)
-or [64
-bit](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.8.1-linux-x86_64.tar.bz2&can=2&q=)
+* Download the [32 bit](https://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-i686.tar.bz2)
+or [64 bit](https://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-x86_64.tar.bz2)
 binary.
 * Extract the tarball and copy `bin/phantomjs` into your `PATH`
 
 ### Windows ###
-* Download the [precompiled binary](http://phantomjs.org/download.html) for Windows
+* Download the [precompiled binary](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-windows.zip)
+for Windows
 
 ### Manual compilation ###
 
 Do this as a last resort if the binaries don't work for you. It will
 take quite a long time as it has to build WebKit.
 
-* Download [the source tarball](http://code.google.com/p/phantomjs/downloads/detail?name=phantomjs-1.8.1-source.zip&can=2&q=)
+* Download [the source tarball](http://phantomjs.googlecode.com/files/phantomjs-1.9.2-source.zip)
 * Extract and cd in
 * `./build.sh`
 
@@ -83,10 +82,7 @@ was 1.0.2, so you should use that if you still need Ruby 1.8 support.
 There are no special steps to take. You don't need Xvfb or any running X
 server at all.
 
-[Travis CI](https://travis-ci.org/) has PhantomJS pre-installed, but it
-might not be the latest version. If you need to install the latest
-version, [check out the .travis.yml that Poltergeist
-uses](https://github.com/jonleighton/poltergeist/blob/master/.travis.yml).
+[Travis CI](https://travis-ci.org/) has PhantomJS pre-installed.
 
 Depending on your tests, one thing that you may need is some fonts. If
 you're getting errors on a CI that don't occur during development then
@@ -105,8 +101,10 @@ and the following optional features:
 * `page.status_code`
 * `page.response_headers`
 * `page.save_screenshot`
-* `page.render_base64`
-* `page.scroll_to`
+* `page.driver.render_base64(format, options)`
+* `page.driver.scroll_to(left, top)`
+* `page.driver.basic_authorize(user, password)`
+* `element.native.send_keys(*keys)`
 * cookie handling
 * drag-and-drop
 
@@ -117,9 +115,12 @@ There are some additional features:
 You can grab screenshots of the page at any point by calling
 `save_screenshot('/path/to/file.png')` (this works the same way as the PhantomJS
 render feature, so you can specify other extensions like `.pdf`, `.gif`, etc.)
+Just in case you render pdf it's might be worth to set `driver.paper_size=` with
+settings provided by PhantomJS in [here](https://github.com/ariya/phantomjs/wiki/API-Reference-WebPage#wiki-webpage-paperSize)
 
-By default, only the viewport will be rendered (the part of the page that is in view). To render
-the entire page, use `save_screenshot('/path/to/file.png', :full => true)`.
+By default, only the viewport will be rendered (the part of the page that is in
+view). To render the entire page, use `save_screenshot('/path/to/file.png',
+:full => true)`.
 
 You also have an ability to render selected element. Pass option `selector` with
 any valid element selector to make a screenshot bounded by that element
@@ -198,6 +199,9 @@ You can inspect the network traffic (i.e. what resources have been
 loaded) on the current page by calling `page.driver.network_traffic`.
 This returns an array of request objects. A request object has a
 `response_parts` method containing data about the response chunks.
+Please note that network traffic is not cleared when you visit new page.
+You can manually clear the network traffic by calling `page.driver.clear_network_traffic`
+or `page.driver.reset`
 
 ### Manipulating cookies ###
 
@@ -238,6 +242,25 @@ page.within_window fb_popup do
 end
 ```
 
+### Sending keys ###
+
+There's an ability to send arbitrary keys to the element:
+
+``` ruby
+element = find('input#id')
+element.native.send_key('String')
+```
+
+or even more complicated:
+
+``` ruby
+element.native.send_keys('H', 'elo', :Left, 'l') # => 'Hello'
+element.native.send_key(:Enter) # triggers Enter key
+```
+Since it's implemented natively in PhantomJS this will exactly imitate user
+behavior.
+See more about [sendEvent](http://phantomjs.org/api/webpage/method/send-event.html) and
+[PhantomJS keys](https://github.com/ariya/phantomjs/commit/cab2635e66d74b7e665c44400b8b20a8f225153a)
 
 ## Customization ##
 

data/lib/capybara/poltergeist/browser.rb

@@ -66,6 +66,10 @@ module Capybara::Poltergeist
       command 'visible_text', page_id, id
     end
 
+    def delete_text(page_id, id)
+      command 'delete_text', page_id, id
+    end
+
     def attribute(page_id, id, name)
       command 'attribute', page_id, id, name.to_s
     end
@@ -108,7 +112,7 @@ module Capybara::Poltergeist
 
     def within_frame(handle, &block)
       if handle.is_a?(Capybara::Node::Base)
-        command 'push_frame', handle['id']
+        command 'push_frame', handle[:name] || handle[:id]
       else
         command 'push_frame', handle
       end
@@ -171,10 +175,18 @@ module Capybara::Poltergeist
       command 'render_base64', format.to_s, !!options[:full], options[:selector]
     end
 
+    def set_paper_size(size)
+      command 'set_paper_size', size
+    end
+
     def resize(width, height)
       command 'resize', width, height
     end
 
+    def send_keys(page_id, id, keys)
+      command 'send_keys', page_id, id, normalize_keys(keys)
+    end
+
     def network_traffic
       command('network_traffic').values.map do |event|
         NetworkTraffic::Request.new(
@@ -184,6 +196,10 @@ module Capybara::Poltergeist
       end
     end
 
+    def clear_network_traffic
+      command('clear_network_traffic')
+    end
+
     def equals(page_id, id, other_id)
       command('equals', page_id, id, other_id)
     end
@@ -228,6 +244,10 @@ module Capybara::Poltergeist
       command 'cookies_enabled', !!flag
     end
 
+    def set_http_auth(user, password)
+      command 'set_http_auth', user, password
+    end
+
     def js_errors=(val)
       command 'set_js_errors', !!val
     end
@@ -261,6 +281,14 @@ module Capybara::Poltergeist
       raise
     end
 
+    def go_back
+      command 'go_back'
+    end
+
+    def go_forward
+      command 'go_forward'
+    end
+
     private
 
     def log(message)
@@ -273,5 +301,20 @@ module Capybara::Poltergeist
         options.delete(:selector)
       end
     end
+
+    def normalize_keys(keys)
+      keys.map do |key|
+        case key
+        when Array
+          # String itself with modifiers like :alt, :shift, etc
+          raise Error, 'PhantomJS behaviour for key modifiers is currently ' \
+                       'broken, we will add this in later versions'
+        when Symbol
+          { key: key } # Return a known sequence for PhantomJS
+        when String
+          key # Plain string, nothing to do
+        end
+      end
+    end
   end
 end

data/lib/capybara/poltergeist/client.rb

@@ -57,32 +57,16 @@ module Capybara::Poltergeist
 
       redirect_stdout do
         @pid = Process.spawn(*command.map(&:to_s), process_options)
-        ObjectSpace.define_finalizer(self, self.class.process_killer(@pid) )
+        ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
       end
     end
 
     def stop
       if pid
-        begin
-          if Capybara::Poltergeist.windows?
-            Process.kill('KILL', pid)
-          else
-            Process.kill('TERM', pid)
-            begin
-              Timeout.timeout(KILL_TIMEOUT) { Process.wait(pid) }
-            rescue Timeout::Error
-              Process.kill('KILL', pid)
-              Process.wait(pid)
-            end
-          end
-        rescue Errno::ESRCH, Errno::ECHILD
-          # Zed's dead, baby
-        end
+        kill_phantomjs
         @out_thread.kill
-        @write_io.close
-        @read_io.close
+        close_io
         ObjectSpace.undefine_finalizer(self)
-        @pid = nil
       end
     end
 
@@ -103,7 +87,10 @@ module Capybara::Poltergeist
     private
 
     # This abomination is because JRuby doesn't support the :out option of
-    # Process.spawn
+    # Process.spawn. To be honest it works pretty bad with pipes too, because
+    # we ought close writing end in parent process immediately but JRuby will
+    # lose all the output from child. Process.popen can be used here and seems
+    # it works with JRuby but I've experienced strange mistakes on Rubinius.
     def redirect_stdout
       prev = STDOUT.dup
       prev.autoclose = false
@@ -114,5 +101,45 @@ module Capybara::Poltergeist
       STDOUT.reopen(prev)
       $stdout = STDOUT
     end
+
+    def kill_phantomjs
+      begin
+        if Capybara::Poltergeist.windows?
+          Process.kill('KILL', pid)
+        else
+          Process.kill('TERM', pid)
+          begin
+            Timeout.timeout(KILL_TIMEOUT) { Process.wait(pid) }
+          rescue Timeout::Error
+            Process.kill('KILL', pid)
+            Process.wait(pid)
+          end
+        end
+      rescue Errno::ESRCH, Errno::ECHILD
+        # Zed's dead, baby
+      end
+      @pid = nil
+    end
+
+    # We grab all the output from PhantomJS like console.log in another thread
+    # and when PhantomJS crashes we try to restart it. In order to do it we stop
+    # server and client and on JRuby see this error `IOError: Stream closed`.
+    # It happens because JRuby tries to close pipe and it is blocked on `eof?`
+    # or `readpartial` call. The error is raised in the related thread and it's
+    # not actually main thread but the thread that listens to the output. That's
+    # why if you put some debug code after `rescue IOError` it won't be shown.
+    # In fact the main thread will continue working after the error even if we
+    # don't use `rescue`. The first attempt to fix it was a try not to block on
+    # IO, but looks like similar issue appers after JRuby upgrade. Perhaps the
+    # only way to fix it is catching the exception what this method overall does.
+    def close_io
+      [@write_io, @read_io].each do |io|
+        begin
+          io.close unless io.closed?
+        rescue IOError
+          raise unless RUBY_ENGINE == 'jruby'
+        end
+      end
+    end
   end
 end

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

@@ -37,7 +37,8 @@ class PoltergeistAgent
 
       this.register(el) for el in results
     catch error
-      if error.code == DOMException.SYNTAX_ERR
+      # DOMException.INVALID_EXPRESSION_ERR is undefined, using pure code
+      if error.code == DOMException.SYNTAX_ERR || error.code == 51
         throw new PoltergeistAgent.InvalidSelector
       else
         throw error
@@ -140,6 +141,12 @@ class PoltergeistAgent.Node
     else
       @element.innerText
 
+  deleteText: ->
+    range = document.createRange()
+    range.selectNodeContents(@element)
+    window.getSelection().addRange(range)
+    window.getSelection().deleteFromDocument()
+
   getAttribute: (name) ->
     if name == 'checked' || name == 'selected'
       @element[name]
@@ -164,13 +171,16 @@ class PoltergeistAgent.Node
     @element.value = ''
     this.trigger('focus')
 
-    for char in value
-      keyCode = this.characterToKeyCode(char)
-      this.keyupdowned('keydown', keyCode)
-      @element.value += char
+    if @element.type == 'number'
+      @element.value = value
+    else
+      for char in value
+        keyCode = this.characterToKeyCode(char)
+        this.keyupdowned('keydown', keyCode)
+        @element.value += char
 
-      this.keypressed(false, false, false, false, char.charCodeAt(0), char.charCodeAt(0))
-      this.keyupdowned('keyup', keyCode)
+        this.keypressed(false, false, false, false, char.charCodeAt(0), char.charCodeAt(0))
+        this.keyupdowned('keyup', keyCode)
 
     this.changed()
     this.input()

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

@@ -121,6 +121,9 @@ class Poltergeist.Browser
   visible_text: (page_id, id) ->
     this.sendResponse this.node(page_id, id).visibleText()
 
+  delete_text: (page_id, id) ->
+    this.sendResponse this.node(page_id, id).deleteText()
+
   attribute: (page_id, id, name) ->
     this.sendResponse this.node(page_id, id).getAttribute(name)
 
@@ -250,6 +253,15 @@ class Poltergeist.Browser
     @page.setScrollPosition(left: left, top: top)
     this.sendResponse(true)
 
+  send_keys: (page_id, id, keys) ->
+    # Programmatically generated focus doesn't work for `sendKeys`.
+    # That's why we need something more realistic like user behavior.
+    this.node(page_id, id).mouseEvent('click')
+    for sequence in keys
+      key = if sequence.key? then @page.native.event.key[sequence.key] else sequence
+      @page.sendEvent('keypress', key)
+    this.sendResponse(true)
+
   render_base64: (format, full, selector = null)->
     this.set_clip_rect(full, selector)
     encoded_image = @page.renderBase64(format)
@@ -277,6 +289,10 @@ class Poltergeist.Browser
     @page.setClipRect(rect)
     dimensions
 
+  set_paper_size: (size) ->
+    @page.setPaperSize(size)
+    this.sendResponse(true)
+
   resize: (width, height) ->
     @page.setViewportSize(width: width, height: height)
     this.sendResponse(true)
@@ -284,6 +300,10 @@ class Poltergeist.Browser
   network_traffic: ->
     this.sendResponse(@page.networkTraffic())
 
+  clear_network_traffic: ->
+    @page.clearNetworkTraffic()
+    this.sendResponse(true)
+
   get_headers: ->
     this.sendResponse(@page.getCustomHeaders())
 
@@ -323,6 +343,10 @@ class Poltergeist.Browser
     phantom.cookiesEnabled = flag
     this.sendResponse(true)
 
+  set_http_auth: (user, password) ->
+    @page.setHttpAuth(user, password)
+    this.sendResponse(true)
+
   set_js_errors: (value) ->
     @js_errors = value
     this.sendResponse(true)
@@ -340,3 +364,11 @@ class Poltergeist.Browser
   # This command is purely for testing error handling
   browser_error: ->
     throw new Error('zomg')
+
+  go_back: ->
+    this.page.goBack() if this.page.canGoBack
+    this.sendResponse(true)
+
+  go_forward: ->
+    this.page.goForward() if this.page.canGoForward
+    this.sendResponse(true)

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

@@ -74,7 +74,7 @@ PoltergeistAgent = (function() {
       return _results;
     } catch (_error) {
       error = _error;
-      if (error.code === DOMException.SYNTAX_ERR) {
+      if (error.code === DOMException.SYNTAX_ERR || error.code === 51) {
         throw new PoltergeistAgent.InvalidSelector;
       } else {
         throw error;
@@ -233,6 +233,14 @@ PoltergeistAgent.Node = (function() {
     }
   };
 
+  Node.prototype.deleteText = function() {
+    var range;
+    range = document.createRange();
+    range.selectNodeContents(this.element);
+    window.getSelection().addRange(range);
+    return window.getSelection().deleteFromDocument();
+  };
+
   Node.prototype.getAttribute = function(name) {
     if (name === 'checked' || name === 'selected') {
       return this.element[name];
@@ -272,13 +280,17 @@ PoltergeistAgent.Node = (function() {
     }
     this.element.value = '';
     this.trigger('focus');
-    for (_i = 0, _len = value.length; _i < _len; _i++) {
-      char = value[_i];
-      keyCode = this.characterToKeyCode(char);
-      this.keyupdowned('keydown', keyCode);
-      this.element.value += char;
-      this.keypressed(false, false, false, false, char.charCodeAt(0), char.charCodeAt(0));
-      this.keyupdowned('keyup', keyCode);
+    if (this.element.type === 'number') {
+      this.element.value = value;
+    } else {
+      for (_i = 0, _len = value.length; _i < _len; _i++) {
+        char = value[_i];
+        keyCode = this.characterToKeyCode(char);
+        this.keyupdowned('keydown', keyCode);
+        this.element.value += char;
+        this.keypressed(false, false, false, false, char.charCodeAt(0), char.charCodeAt(0));
+        this.keyupdowned('keyup', keyCode);
+      }
     }
     this.changed();
     this.input();

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

@@ -153,6 +153,10 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(this.node(page_id, id).visibleText());
   };
 
+  Browser.prototype.delete_text = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).deleteText());
+  };
+
   Browser.prototype.attribute = function(page_id, id, name) {
     return this.sendResponse(this.node(page_id, id).getAttribute(name));
   };
@@ -324,6 +328,17 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.send_keys = function(page_id, id, keys) {
+    var key, sequence, _i, _len;
+    this.node(page_id, id).mouseEvent('click');
+    for (_i = 0, _len = keys.length; _i < _len; _i++) {
+      sequence = keys[_i];
+      key = sequence.key != null ? this.page["native"].event.key[sequence.key] : sequence;
+      this.page.sendEvent('keypress', key);
+    }
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.render_base64 = function(format, full, selector) {
     var encoded_image;
     if (selector == null) {
@@ -371,6 +386,11 @@ Poltergeist.Browser = (function() {
     return dimensions;
   };
 
+  Browser.prototype.set_paper_size = function(size) {
+    this.page.setPaperSize(size);
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.resize = function(width, height) {
     this.page.setViewportSize({
       width: width,
@@ -383,6 +403,11 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(this.page.networkTraffic());
   };
 
+  Browser.prototype.clear_network_traffic = function() {
+    this.page.clearNetworkTraffic();
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.get_headers = function() {
     return this.sendResponse(this.page.getCustomHeaders());
   };
@@ -435,6 +460,11 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.set_http_auth = function(user, password) {
+    this.page.setHttpAuth(user, password);
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.set_js_errors = function(value) {
     this.js_errors = value;
     return this.sendResponse(true);
@@ -455,6 +485,20 @@ Poltergeist.Browser = (function() {
     throw new Error('zomg');
   };
 
+  Browser.prototype.go_back = function() {
+    if (this.page.canGoBack) {
+      this.page.goBack();
+    }
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.go_forward = function() {
+    if (this.page.canGoForward) {
+      this.page.goForward();
+    }
+    return this.sendResponse(true);
+  };
+
   return Browser;
 
 })();

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

@@ -89,14 +89,15 @@ Poltergeist.ObsoleteNode = (function(_super) {
 Poltergeist.InvalidSelector = (function(_super) {
   __extends(InvalidSelector, _super);
 
-  function InvalidSelector(selector) {
+  function InvalidSelector(method, selector) {
+    this.method = method;
     this.selector = selector;
   }
 
   InvalidSelector.prototype.name = "Poltergeist.InvalidSelector";
 
   InvalidSelector.prototype.args = function() {
-    return [this.selector];
+    return [this.method, this.selector];
   };
 
   return InvalidSelector;

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

@@ -4,7 +4,7 @@ Poltergeist.Node = (function() {
   var name, _fn, _i, _len, _ref,
     _this = this;
 
-  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled'];
+  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText'];
 
   function Node(page, id) {
     this.page = page;

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

@@ -6,7 +6,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated'];
 
-  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64'];
+  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward'];
 
   WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload'];
 
@@ -145,10 +145,19 @@ Poltergeist.WebPage = (function() {
     }
   };
 
+  WebPage.prototype.setHttpAuth = function(user, password) {
+    this["native"].settings.userName = user;
+    return this["native"].settings.password = password;
+  };
+
   WebPage.prototype.networkTraffic = function() {
     return this._networkTraffic;
   };
 
+  WebPage.prototype.clearNetworkTraffic = function() {
+    return this._networkTraffic = {};
+  };
+
   WebPage.prototype.content = function() {
     return this["native"].frameContent;
   };
@@ -198,6 +207,10 @@ Poltergeist.WebPage = (function() {
     return this["native"].viewportSize = size;
   };
 
+  WebPage.prototype.setPaperSize = function(size) {
+    return this["native"].paperSize = size;
+  };
+
   WebPage.prototype.scrollPosition = function() {
     return this["native"].scrollPosition;
   };
@@ -357,7 +370,7 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.runCommand = function(name, args) {
-    var result;
+    var method, result, selector;
     result = this.evaluate(function(name, args) {
       return __poltergeist.externalCall(name, args);
     }, name, args);
@@ -367,7 +380,8 @@ Poltergeist.WebPage = (function() {
           throw new Poltergeist.ObsoleteNode;
           break;
         case 'PoltergeistAgent.InvalidSelector':
-          throw new Poltergeist.InvalidSelector(args[1]);
+          method = args[0], selector = args[1];
+          throw new Poltergeist.InvalidSelector(method, selector);
           break;
         default:
           throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
@@ -377,6 +391,14 @@ Poltergeist.WebPage = (function() {
     }
   };
 
+  WebPage.prototype.canGoBack = function() {
+    return this["native"].canGoBack;
+  };
+
+  WebPage.prototype.canGoForward = function() {
+    return this["native"].canGoForward;
+  };
+
   return WebPage;
 
 }).call(this);

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

@@ -51,9 +51,9 @@ class Poltergeist.ObsoleteNode extends Poltergeist.Error
   toString: -> this.name
 
 class Poltergeist.InvalidSelector extends Poltergeist.Error
-  constructor: (@selector) ->
+  constructor: (@method, @selector) ->
   name: "Poltergeist.InvalidSelector"
-  args: -> [@selector]
+  args: -> [@method, @selector]
 
 class Poltergeist.FrameNotFound extends Poltergeist.Error
   constructor: (@frameName) ->

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

@@ -4,7 +4,7 @@ class Poltergeist.Node
   @DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete',
                 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find',
                 'isVisible', 'position', 'trigger', 'parentId', 'mouseEventTest',
-                'scrollIntoView', 'isDOMEqual', 'isDisabled']
+                'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText']
 
   constructor: (@page, @id) ->
 

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

@@ -3,7 +3,7 @@ class Poltergeist.WebPage
                 'onLoadStarted', 'onResourceRequested', 'onResourceReceived',
                 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated']
 
-  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64']
+  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward']
 
   @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload']
 
@@ -93,9 +93,16 @@ class Poltergeist.WebPage
         @_statusCode      = response.status
         @_responseHeaders = response.headers
 
+  setHttpAuth: (user, password) ->
+    @native.settings.userName = user
+    @native.settings.password = password
+
   networkTraffic: ->
     @_networkTraffic
 
+  clearNetworkTraffic: ->
+    @_networkTraffic = {}
+
   content: ->
     @native.frameContent
 
@@ -132,6 +139,9 @@ class Poltergeist.WebPage
   setViewportSize: (size) ->
     @native.viewportSize = size
 
+  setPaperSize: (size) ->
+    @native.paperSize = size
+
   scrollPosition: ->
     @native.scrollPosition
 
@@ -262,8 +272,15 @@ class Poltergeist.WebPage
         when 'PoltergeistAgent.ObsoleteNode'
           throw new Poltergeist.ObsoleteNode
         when 'PoltergeistAgent.InvalidSelector'
-          throw new Poltergeist.InvalidSelector(args[1])
+          [method, selector] = args
+          throw new Poltergeist.InvalidSelector(method, selector)
         else
           throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
     else
       result.value
+
+  canGoBack: ->
+    @native.canGoBack
+
+  canGoForward: ->
+    @native.canGoForward

data/lib/capybara/poltergeist/driver.rb

@@ -161,6 +161,10 @@ module Capybara::Poltergeist
       browser.render_base64(format, options)
     end
 
+    def paper_size=(size = {})
+      browser.set_paper_size(size)
+    end
+
     def resize(width, height)
       browser.resize(width, height)
     end
@@ -174,6 +178,10 @@ module Capybara::Poltergeist
       browser.network_traffic
     end
 
+    def clear_network_traffic
+      browser.clear_network_traffic
+    end
+
     def headers
       browser.get_headers
     end
@@ -221,6 +229,17 @@ module Capybara::Poltergeist
       browser.cookies_enabled = flag
     end
 
+    # * PhantomJS with set settings doesn't send `Authorize` on POST request
+    # * With manually set header PhantomJS makes next request with
+    # `Authorization: Basic Og==` header when settings are empty and the
+    # response was `401 Unauthorized` (which means Base64.encode64(':')).
+    # Combining both methods to reach proper behavior.
+    def basic_authorize(user, password)
+      browser.set_http_auth(user, password)
+      credentials = ["#{user}:#{password}"].pack('m*').strip
+      add_header('Authorization', "Basic #{credentials}")
+    end
+
     def debug
       if @options[:inspector]
         inspector.open
@@ -243,5 +262,13 @@ module Capybara::Poltergeist
     def invalid_element_errors
       [Capybara::Poltergeist::ObsoleteNode, Capybara::Poltergeist::MouseEventFailed]
     end
+
+    def go_back
+      browser.go_back
+    end
+
+    def go_forward
+      browser.go_forward
+    end
   end
 end

data/lib/capybara/poltergeist/errors.rb

@@ -65,13 +65,17 @@ module Capybara
     end
 
     class InvalidSelector < ClientError
+      def method
+        response['args'][0]
+      end
+
       def selector
-        response['args'].first
+        response['args'][1]
       end
 
       def message
         "The browser raised a syntax error while trying to evaluate " \
-          "the selector #{selector.inspect}"
+          "#{method} selector #{selector.inspect}"
       end
     end
 
@@ -142,7 +146,7 @@ module Capybara
     class PhantomJSTooOld < Error
       def self.===(other)
         if Cliver::Dependency::VersionMismatch === other
-          warn "{name} exception has been deprecated in favor of using the " +
+          warn "#{name} exception has been deprecated in favor of using the " +
                "cliver gem for command-line dependency detection. Please " +
                "handle Cliver::Dependency::VersionMismatch instead."
           true
@@ -155,7 +159,7 @@ module Capybara
     class PhantomJSFailed < Error
       def self.===(other)
         if Cliver::Dependency::NotMet === other
-          warn "{name} exception has been deprecated in favor of using the " +
+          warn "#{name} exception has been deprecated in favor of using the " +
                "cliver gem for command-line dependency detection. Please " +
                "handle Cliver::Dependency::NotMet instead."
           true

data/lib/capybara/poltergeist/node.rb

@@ -1,8 +1,5 @@
 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)
@@ -72,6 +69,9 @@ module Capybara::Poltergeist
         end
       elsif tag_name == 'textarea'
         command :set, value.to_s
+      elsif self[:contenteditable] == 'true'
+        command :delete_text
+        send_keys(value.to_s)
       end
     end
 
@@ -128,10 +128,15 @@ module Capybara::Poltergeist
       command :equals, other.id
     end
 
+    def send_keys(*keys)
+      command :send_keys, keys
+    end
+    alias_method :send_key, :send_keys
+
     private
 
     def filter_text(text)
-      text.to_s.gsub(NBSP, ' ').gsub(/\s+/u, ' ').strip
+      Capybara::Helpers.normalize_whitespace(text.to_s)
     end
   end
 end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.4.1"
+    VERSION = "1.5.0"
   end
 end

data/lib/capybara/poltergeist/web_socket_server.rb

@@ -26,15 +26,13 @@ module Capybara::Poltergeist
       @server  = start_server(port)
     end
 
-    def port
-      server.addr[1]
-    end
-
     def start_server(port)
       time = Time.now
 
       begin
-        TCPServer.open(HOST, port || 0)
+        TCPServer.open(HOST, port || 0).tap do |server|
+          @port = server.addr[1]
+        end
       rescue Errno::EADDRINUSE
         if (Time.now - time) < BIND_TIMEOUT
           sleep(0.01)
@@ -89,11 +87,10 @@ module Capybara::Poltergeist
       raise TimeoutError.new(message)
     end
 
+    # Closing sockets separately as `close_read`, `close_write`
+    # causes IO mistakes on JRuby, using just `close` fixes that.
     def close
-      [server, socket].compact.each do |s|
-        s.close_read
-        s.close_write
-      end
+      [server, socket].compact.each(&:close)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pdf-reader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-description: PhantomJS driver for Capybara
+description: Poltergeist is a driver for Capybara that allows you to run your tests
+  on a headless WebKit browser, provided by PhantomJS.
 email:
 - j@jonathanleighton.com
 executables: []
@@ -202,7 +217,8 @@ files:
 - LICENSE
 - README.md
 homepage: http://github.com/jonleighton/poltergeist
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -212,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -220,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara