poltergeist 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30764c7fffa008722381c14b695751179d6f2aa4
-  data.tar.gz: bc9747887101bf79414e69442b39144ca7af0ef4
+  metadata.gz: 475593a2e1c767e61acb2023b065eb7688972efa
+  data.tar.gz: d35e4e7d9d2245564ea960045a891589c6a1dbed
 SHA512:
-  metadata.gz: d2cf7f4946e9e46ef9e7cdbd56c4a7e789342799b9b05c2b5e89833c7ef4d706331c9ae29a866efdae4b15311470e4797b2a716044b6cc61f2efda57dd89687d
-  data.tar.gz: 5238c2b847c294019d1b7e7a13393c43aa5d96d1ba7bd7591a1a81ecfdeaea9d90a43a6dc279de095310eef8670b82fe01fd2528bc6ad04b9156cea61ccbc600
+  metadata.gz: 14677723d5e05debc486229fbe765a5e4fa6fdd49620daf32bcac5347c8856ea448946babba7904574ab904400ae9ae5db125de9d56683a745f6719a22f4c840
+  data.tar.gz: fd6f1a43a661fc191cc7e80e63ed02bb601dbf21c17f40145a24da82941859add75100da027e8656450c0aed062606d6e17cc33d9e0da538cacd9d2a71358550

data/README.md

@@ -9,7 +9,7 @@ provided by [PhantomJS](http://phantomjs.org/).
 **If you're viewing this at https://github.com/teampoltergeist/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.8.1).](https://github.com/teampoltergeist/poltergeist/tree/v1.8.1)**
+(1.9.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.9.0)**
 
 ## Getting help ##
 
@@ -110,6 +110,7 @@ and the following optional features:
 * `page.driver.scroll_to(left, top)`
 * `page.driver.basic_authorize(user, password)`
 * `element.native.send_keys(*keys)`
+* `page.driver.set_proxy(ip, port, type, user, password)`
 * window API
 * cookie handling
 * drag-and-drop
@@ -211,11 +212,11 @@ The following methods are used to inspect and manipulate cookies:
 * `page.driver.cookies` - a hash of cookies accessible to the current
   page. The keys are cookie names. The values are `Cookie` objects, with
   the following methods: `name`, `value`, `domain`, `path`, `secure?`,
-  `httponly?`, `expires`.
+  `httponly?`, `samesite`, `expires`.
 * `page.driver.set_cookie(name, value, options = {})` - set a cookie.
   The options hash can take the following keys: `:domain`, `:path`,
-  `:secure`, `:httponly`, `:expires`. `:expires` should be a `Time`
-  object.
+  `:secure`, `:httponly`, `:samesite`, `:expires`. `:expires` should be a
+  `Time` object.
 * `page.driver.remove_cookie(name)` - remove a cookie
 * `page.driver.clear_cookies` - clear all cookies
 
@@ -262,7 +263,7 @@ end
 *   `:timeout` (Numeric) - The number of seconds we'll wait for a response
     when communicating with PhantomJS. Default is 30.
 *   `:inspector` (Boolean, String) - See 'Remote Debugging', above.
-*   `:js_errors` (Boolean) - When false, Javascript errors do not get re-raised in Ruby.
+*   `:js_errors` (Boolean) - When false, JavaScript errors do not get re-raised in Ruby.
 *   `:window_size` (Array) - The dimensions of the browser window in which to test, expressed
     as a 2-element array, e.g. [1024, 768]. Default: [1024, 768]
 *   `:phantomjs_options` (Array) - Additional [command line options](http://phantomjs.org/api/command-line.html)
@@ -271,20 +272,29 @@ end
     the phantomjs browser. Useful for faking unsupported APIs.
 *   `:port` (Fixnum) - The port which should be used to communicate
     with the PhantomJS process. Defaults to a random open port.
+*   `:url_blacklist` (Array) - Default session url blacklist - expressed as an array of strings to match against requested URLs.
+*   `:url_whitelist` (Array) - Default session url whitelist - expressed as an array of strings to match against requested URLs.
 
-### URL Blacklisting ###
-
-Poltergeist supports URL blacklisting which allows you
-to prevent scripts from running on designated domains. If you are experiencing
-slower run times, consider creating a URL blacklist of domains that are not
-essential to your testing environment, such as ad networks or analytics.
+### URL Blacklisting & Whitelisting ###
+Poltergeist supports URL blacklisting, which allows you
+to prevent scripts from running on designated domains:
 
 ```ruby
 page.driver.browser.url_blacklist = ['http://www.example.com']
 ```
 
-Make sure you set it before each running test, because this setting's cleaned
-up when capybara does reset.
+and also URL whitelisting, which allows scripts to only run
+on designated domains:
+
+```ruby
+page.driver.browser.url_whitelist = ['http://www.example.com']
+```
+
+If you are experiencing slower run times, consider creating a
+URL whitelist of domains that are essential or a blacklist of
+domains that are not essential, such as ad networks or analytics,
+to your testing environment.
+
 
 ## Troubleshooting ##
 
@@ -358,7 +368,7 @@ test to allow sufficient time for the page to settle.
 
 If you have these types of problems, read through the [Capybara
 documentation on asynchronous
-Javascript](https://github.com/jnicklas/capybara#asynchronous-javascript-ajax-and-friends)
+JavaScript](https://github.com/jnicklas/capybara#asynchronous-javascript-ajax-and-friends)
 which explains the tools that Capybara provides for dealing with this.
 
 ### Memory leak ###
@@ -392,7 +402,7 @@ Include as much information as possible. For example:
   better)
 * The output obtained from running Poltergeist with `:debug` turned on
 * Screenshots
-* Stack traces if there are any Ruby on Javascript exceptions generated
+* Stack traces if there are any Ruby on JavaScript exceptions generated
 * The Poltergeist and PhantomJS version numbers used
 * The operating system name and version used
 

data/lib/capybara/poltergeist.rb

@@ -15,7 +15,6 @@ module Capybara
     require 'capybara/poltergeist/web_socket_server'
     require 'capybara/poltergeist/client'
     require 'capybara/poltergeist/inspector'
-    require 'capybara/poltergeist/json'
     require 'capybara/poltergeist/network_traffic'
     require 'capybara/poltergeist/errors'
     require 'capybara/poltergeist/cookie'

data/lib/capybara/poltergeist/browser.rb

@@ -1,6 +1,6 @@
 require "capybara/poltergeist/errors"
 require "capybara/poltergeist/command"
-require 'multi_json'
+require 'json'
 require 'time'
 
 module Capybara::Poltergeist
@@ -10,7 +10,8 @@ module Capybara::Poltergeist
       'Poltergeist.FrameNotFound'   => FrameNotFound,
       'Poltergeist.InvalidSelector' => InvalidSelector,
       'Poltergeist.StatusFailError' => StatusFailError,
-      'Poltergeist.NoSuchWindowError' => NoSuchWindowError
+      'Poltergeist.NoSuchWindowError' => NoSuchWindowError,
+      'Poltergeist.UnsupportedFeature' => UnsupportedFeature
     }
 
     attr_reader :server, :client, :logger
@@ -163,7 +164,7 @@ module Capybara::Poltergeist
       return locator if window_handles.include? locator
 
       handle = command 'window_handle', locator
-      raise noSuchWindowError unless handle
+      raise NoSuchWindowError unless handle
       return handle
     end
 
@@ -218,12 +219,14 @@ module Capybara::Poltergeist
 
     def render(path, options = {})
       check_render_options!(options)
-      command 'render', path.to_s, !!options[:full], options[:selector]
+      options[:full] = !!options[:full]
+      command 'render', path.to_s, options
     end
 
     def render_base64(format, options = {})
       check_render_options!(options)
-      command 'render_base64', format.to_s, !!options[:full], options[:selector]
+      options[:full] = !!options[:full]
+      command 'render_base64', format.to_s, options
     end
 
     def set_zoom_factor(zoom_factor)
@@ -260,6 +263,13 @@ module Capybara::Poltergeist
       command('clear_network_traffic')
     end
 
+    def set_proxy(ip, port, type, user, password)
+      args = [ip, port, type]
+      args << user if user
+      args << password if password
+      command('set_proxy', *args)
+    end
+
     def equals(page_id, id, other_id)
       command('equals', page_id, id, other_id)
     end
@@ -337,6 +347,10 @@ module Capybara::Poltergeist
       command 'set_debug', !!val
     end
 
+    def clear_memory_cache
+      command 'clear_memory_cache'
+    end
+
     def command(name, *args)
       cmd = Command.new(name, *args)
       log cmd.message
@@ -411,8 +425,8 @@ module Capybara::Poltergeist
           # [:Shift, "s"] => { modifier: "shift", key: "S" }
           # [:Ctrl, :Left] => { modifier: "ctrl", key: :Left }
           # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: :Left }
-          letter = key.pop
-          symbol = key.map { |k| k.to_s.downcase }.join(',')
+          letter = key.last
+          symbol = key[0...-1].map { |k| k.to_s.downcase }.join(',')
 
           { modifier: symbol.to_s.downcase, key: letter.capitalize }
         when Symbol

data/lib/capybara/poltergeist/client.rb

@@ -33,8 +33,10 @@ module Capybara::Poltergeist
 
     def initialize(server, options = {})
       @server            = server
-      @path              = Cliver::detect!((options[:path] || PHANTOMJS_NAME),
-                                           *PHANTOMJS_VERSION)
+      @path              = Cliver::detect((options[:path] || PHANTOMJS_NAME), *['>=2.1.0', '< 3.0'])
+      @path            ||= Cliver::detect!((options[:path] || PHANTOMJS_NAME), *PHANTOMJS_VERSION).tap do
+        warn "You're running an old version of PhantomJS, update to >= 2.1.1 for a better experience."
+      end
 
       @window_size       = options[:window_size]       || [1024, 768]
       @phantomjs_options = options[:phantomjs_options] || []

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

@@ -169,7 +169,10 @@ class PoltergeistAgent.Node
       if @element.nodeName == "TEXTAREA"
         @element.textContent
       else
-        @element.innerText || @element.textContent
+        if @element instanceof SVGElement
+          @element.textContent
+        else
+          @element.innerText
 
   deleteText: ->
     range = document.createRange()

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

@@ -52,6 +52,9 @@ class Poltergeist.Browser
     @page.onPageCreated = (newPage) =>
       page = new Poltergeist.WebPage(newPage)
       page.handle = "#{@_counter++}"
+      page.urlBlacklist = @page.urlBlacklist
+      page.urlWhitelist = @page.urlWhitelist
+      page.setViewportSize(@page.viewportSize())
       @pages.push(page)
 
     return
@@ -65,8 +68,7 @@ class Poltergeist.Browser
     this[command.name].apply(this, command.args)
 
   debug: (message) ->
-    if @_debug
-      console.log "poltergeist [#{new Date().getTime()}] #{message}"
+    console.log "poltergeist [#{new Date().getTime()}] #{message}" if @_debug
 
   setModalMessage: (msg) ->
     @processed_modal_messages.push(msg)
@@ -103,15 +105,16 @@ class Poltergeist.Browser
       @current_command.sendResponse(status: 'success')
     else
       command = @current_command
-      @currentPage.waitState 'default', =>
-        if @currentPage.statusCode == null && @currentPage.status == 'fail'
+      loading_page = @currentPage
+      @currentPage.waitState 'default', ->
+        if @statusCode == null && @status == 'fail'
           command.sendError(new Poltergeist.StatusFailError(url))
         else
-          command.sendResponse(status: @currentPage.status)
-      , max_wait, =>
-        resources = @currentPage.openResourceRequests()
+          command.sendResponse(status: @status)
+      , max_wait, ->
+        resources = @openResourceRequests()
         msg = if resources.length
-          "Timed out with the following resources still waiting #{@currentPage.openResourceRequests().join(',')}"
+          "Timed out with the following resources still waiting #{resources.join(',')}"
         command.sendError(new Poltergeist.StatusFailError(url,msg))
       return
 
@@ -214,12 +217,13 @@ class Poltergeist.Browser
         frame.setAttribute('name', "_random_name_#{new Date().getTime()}")
         name = frame.getAttribute('name')
 
-    if @frameUrl(name) in @currentPage.blockedUrls()
+    frame_url = @frameUrl(name)
+    if frame_url in @currentPage.blockedUrls()
       command.sendResponse(true)
     else if @currentPage.pushFrame(name)
-      if @currentPage.currentUrl() == 'about:blank'
+      if frame_url && (frame_url != 'about:blank') && (@currentPage.currentUrl() == 'about:blank')
         @currentPage.state = 'awaiting_frame_load'
-        @currentPage.waitState 'default', =>
+        @currentPage.waitState 'default', ->
           command.sendResponse(true)
       else
         command.sendResponse(true)
@@ -250,11 +254,11 @@ class Poltergeist.Browser
 
   switch_to_window: (handle) ->
     command = @current_command
-    page = @getPageByHandle(handle)
-    if page
-      if page != @currentPage
-        page.waitState 'default', =>
-          @currentPage = page
+    new_page = @getPageByHandle(handle)
+    if new_page
+      if new_page != @currentPage
+        new_page.waitState 'default', =>
+          @currentPage = new_page
           command.sendResponse(true)
       else
         command.sendResponse(true)
@@ -280,18 +284,18 @@ class Poltergeist.Browser
     # state and wait for onLoadFinished before sending a response.
     @currentPage.state = 'mouse_event'
 
-    @last_mouse_event = node.mouseEvent(name)
-
+    last_mouse_event = node.mouseEvent(name)
+    event_page = @currentPage
     command = @current_command
 
-    setTimeout =>
+    setTimeout ->
       # If the state is still the same then navigation event won't happen
-      if @currentPage.state == 'mouse_event'
-        @currentPage.state = 'default'
-        command.sendResponse(position: @last_mouse_event)
+      if event_page.state == 'mouse_event'
+        event_page.state = 'default'
+        command.sendResponse(position: last_mouse_event)
       else
-        @currentPage.waitState 'default', =>
-          command.sendResponse(position: @last_mouse_event)
+        event_page.waitState 'default', ->
+          command.sendResponse(position: last_mouse_event)
     , 5
 
   click: (page_id, id) ->
@@ -354,16 +358,26 @@ class Poltergeist.Browser
 
     @current_command.sendResponse(true)
 
-  render_base64: (format, full, selector = null)->
-    this.set_clip_rect(full, selector)
+  render_base64: (format, { full = false, selector = null } = {})->
+    window_scroll_position = @currentPage.native().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }")
+    dimensions = this.set_clip_rect(full, selector)
     encoded_image = @currentPage.renderBase64(format)
+    @currentPage.setScrollPosition(left: dimensions.left, top: dimensions.top)
+    @currentPage.native().evaluate("window.scrollTo", window_scroll_position...)
+
     @current_command.sendResponse(encoded_image)
 
-  render: (path, full, selector = null) ->
+  render: (path, { full = false, selector = null, format = null, quality = null } = {} ) ->
+    window_scroll_position = @currentPage.native().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }")
     dimensions = this.set_clip_rect(full, selector)
+    options = {}
+    options["format"] = format if format?
+    options["quality"] = quality if quality?
     @currentPage.setScrollPosition(left: 0, top: 0)
-    @currentPage.render(path)
+    @currentPage.render(path, options)
     @currentPage.setScrollPosition(left: dimensions.left, top: dimensions.top)
+    @currentPage.native().evaluate("window.scrollTo", window_scroll_position...)
+
     @current_command.sendResponse(true)
 
   set_clip_rect: (full, selector) ->
@@ -400,6 +414,10 @@ class Poltergeist.Browser
     @currentPage.clearNetworkTraffic()
     @current_command.sendResponse(true)
 
+  set_proxy: (ip, port, type, user, password) ->
+    phantom.setProxy(ip, port, type, user, password)
+    @current_command.sendResponse(true)
+
   get_headers: ->
     @current_command.sendResponse(@currentPage.getCustomHeaders())
 
@@ -470,7 +488,7 @@ class Poltergeist.Browser
     if @currentPage.canGoBack
       @currentPage.state = 'loading'
       @currentPage.goBack()
-      @currentPage.waitState 'default', =>
+      @currentPage.waitState 'default', ->
         command.sendResponse(true)
     else
       command.sendResponse(false)
@@ -480,17 +498,17 @@ class Poltergeist.Browser
     if @currentPage.canGoForward
       @currentPage.state = 'loading'
       @currentPage.goForward()
-      @currentPage.waitState 'default', =>
+      @currentPage.waitState 'default', ->
         command.sendResponse(true)
     else
       command.sendResponse(false)
 
-  set_url_whitelist: ->
-    @currentPage.urlWhitelist = Array.prototype.slice.call(arguments)
+  set_url_whitelist: (wildcards...)->
+    @currentPage.urlWhitelist = (@_wildcardToRegexp(wc) for wc in wildcards)
     @current_command.sendResponse(true)
 
-  set_url_blacklist: ->
-    @currentPage.urlBlacklist = Array.prototype.slice.call(arguments)
+  set_url_blacklist: (wildcards...)->
+    @currentPage.urlBlacklist = (@_wildcardToRegexp(wc) for wc in wildcards)
     @current_command.sendResponse(true)
 
   set_confirm_process: (process) ->
@@ -503,3 +521,14 @@ class Poltergeist.Browser
 
   modal_message: ->
     @current_command.sendResponse(@processed_modal_messages.shift())
+
+  clear_memory_cache: ->
+    @currentPage.clearMemoryCache()
+    @current_command.sendResponse(true)
+
+  _wildcardToRegexp: (wildcard)->
+    wildcard = wildcard.replace(/[\-\[\]\/\{\}\(\)\+\.\\\^\$\|]/g, "\\$&")
+    wildcard = wildcard.replace(/\*/g, ".*")
+    wildcard = wildcard.replace(/\?/g, ".")
+    new RegExp(wildcard, "i")
+

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

@@ -262,7 +262,11 @@ PoltergeistAgent.Node = (function() {
       if (this.element.nodeName === "TEXTAREA") {
         return this.element.textContent;
       } else {
-        return this.element.innerText || this.element.textContent;
+        if (this.element instanceof SVGElement) {
+          return this.element.textContent;
+        } else {
+          return this.element.innerText;
+        }
       }
     }
   };

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

@@ -1,4 +1,5 @@
-var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
+  slice = [].slice;
 
 Poltergeist.Browser = (function() {
   function Browser(width, height) {
@@ -68,6 +69,9 @@ Poltergeist.Browser = (function() {
         var page;
         page = new Poltergeist.WebPage(newPage);
         page.handle = "" + (_this._counter++);
+        page.urlBlacklist = _this.page.urlBlacklist;
+        page.urlWhitelist = _this.page.urlWhitelist;
+        page.setViewportSize(_this.page.viewportSize());
         return _this.pages.push(page);
       };
     })(this);
@@ -109,7 +113,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.visit = function(url, max_wait) {
-    var command, prevUrl;
+    var command, loading_page, prevUrl;
     if (max_wait == null) {
       max_wait = 0;
     }
@@ -126,24 +130,21 @@ Poltergeist.Browser = (function() {
       });
     } else {
       command = this.current_command;
-      this.currentPage.waitState('default', (function(_this) {
-        return function() {
-          if (_this.currentPage.statusCode === null && _this.currentPage.status === 'fail') {
-            return command.sendError(new Poltergeist.StatusFailError(url));
-          } else {
-            return command.sendResponse({
-              status: _this.currentPage.status
-            });
-          }
-        };
-      })(this), max_wait, (function(_this) {
-        return function() {
-          var msg, resources;
-          resources = _this.currentPage.openResourceRequests();
-          msg = resources.length ? "Timed out with the following resources still waiting " + (_this.currentPage.openResourceRequests().join(',')) : void 0;
-          return command.sendError(new Poltergeist.StatusFailError(url, msg));
-        };
-      })(this));
+      loading_page = this.currentPage;
+      this.currentPage.waitState('default', function() {
+        if (this.statusCode === null && this.status === 'fail') {
+          return command.sendError(new Poltergeist.StatusFailError(url));
+        } else {
+          return command.sendResponse({
+            status: this.status
+          });
+        }
+      }, max_wait, function() {
+        var msg, resources;
+        resources = this.openResourceRequests();
+        msg = resources.length ? "Timed out with the following resources still waiting " + (resources.join(',')) : void 0;
+        return command.sendError(new Poltergeist.StatusFailError(url, msg));
+      });
     }
   };
 
@@ -262,7 +263,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.pushFrame = function(command, name, timeout) {
-    var frame, ref;
+    var frame, frame_url;
     if (Array.isArray(name)) {
       frame = this.node.apply(this, name);
       name = frame.getAttribute('name') || frame.getAttribute('id');
@@ -271,16 +272,15 @@ Poltergeist.Browser = (function() {
         name = frame.getAttribute('name');
       }
     }
-    if (ref = this.frameUrl(name), indexOf.call(this.currentPage.blockedUrls(), ref) >= 0) {
+    frame_url = this.frameUrl(name);
+    if (indexOf.call(this.currentPage.blockedUrls(), frame_url) >= 0) {
       return command.sendResponse(true);
     } else if (this.currentPage.pushFrame(name)) {
-      if (this.currentPage.currentUrl() === 'about:blank') {
+      if (frame_url && (frame_url !== 'about:blank') && (this.currentPage.currentUrl() === 'about:blank')) {
         this.currentPage.state = 'awaiting_frame_load';
-        return this.currentPage.waitState('default', (function(_this) {
-          return function() {
-            return command.sendResponse(true);
-          };
-        })(this));
+        return this.currentPage.waitState('default', function() {
+          return command.sendResponse(true);
+        });
       } else {
         return command.sendResponse(true);
       }
@@ -330,14 +330,14 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.switch_to_window = function(handle) {
-    var command, page;
+    var command, new_page;
     command = this.current_command;
-    page = this.getPageByHandle(handle);
-    if (page) {
-      if (page !== this.currentPage) {
-        return page.waitState('default', (function(_this) {
+    new_page = this.getPageByHandle(handle);
+    if (new_page) {
+      if (new_page !== this.currentPage) {
+        return new_page.waitState('default', (function(_this) {
           return function() {
-            _this.currentPage = page;
+            _this.currentPage = new_page;
             return command.sendResponse(true);
           };
         })(this));
@@ -366,27 +366,26 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.mouse_event = function(page_id, id, name) {
-    var command, node;
+    var command, event_page, last_mouse_event, node;
     node = this.node(page_id, id);
     this.currentPage.state = 'mouse_event';
-    this.last_mouse_event = node.mouseEvent(name);
+    last_mouse_event = node.mouseEvent(name);
+    event_page = this.currentPage;
     command = this.current_command;
-    return setTimeout((function(_this) {
-      return function() {
-        if (_this.currentPage.state === 'mouse_event') {
-          _this.currentPage.state = 'default';
+    return setTimeout(function() {
+      if (event_page.state === 'mouse_event') {
+        event_page.state = 'default';
+        return command.sendResponse({
+          position: last_mouse_event
+        });
+      } else {
+        return event_page.waitState('default', function() {
           return command.sendResponse({
-            position: _this.last_mouse_event
-          });
-        } else {
-          return _this.currentPage.waitState('default', function() {
-            return command.sendResponse({
-              position: _this.last_mouse_event
-            });
+            position: last_mouse_event
           });
-        }
-      };
-    })(this), 5);
+        });
+      }
+    }, 5);
   };
 
   Browser.prototype.click = function(page_id, id) {
@@ -475,31 +474,42 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
-  Browser.prototype.render_base64 = function(format, full, selector) {
-    var encoded_image;
-    if (selector == null) {
-      selector = null;
-    }
-    this.set_clip_rect(full, selector);
+  Browser.prototype.render_base64 = function(format, arg) {
+    var dimensions, encoded_image, full, ref, ref1, ref2, ref3, selector, window_scroll_position;
+    ref = arg != null ? arg : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null;
+    window_scroll_position = this.currentPage["native"]().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }");
+    dimensions = this.set_clip_rect(full, selector);
     encoded_image = this.currentPage.renderBase64(format);
+    this.currentPage.setScrollPosition({
+      left: dimensions.left,
+      top: dimensions.top
+    });
+    (ref3 = this.currentPage["native"]()).evaluate.apply(ref3, ["window.scrollTo"].concat(slice.call(window_scroll_position)));
     return this.current_command.sendResponse(encoded_image);
   };
 
-  Browser.prototype.render = function(path, full, selector) {
-    var dimensions;
-    if (selector == null) {
-      selector = null;
-    }
+  Browser.prototype.render = function(path, arg) {
+    var dimensions, format, full, options, quality, ref, ref1, ref2, ref3, ref4, ref5, selector, window_scroll_position;
+    ref = arg != null ? arg : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null, format = (ref3 = ref.format) != null ? ref3 : null, quality = (ref4 = ref.quality) != null ? ref4 : null;
+    window_scroll_position = this.currentPage["native"]().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }");
     dimensions = this.set_clip_rect(full, selector);
+    options = {};
+    if (format != null) {
+      options["format"] = format;
+    }
+    if (quality != null) {
+      options["quality"] = quality;
+    }
     this.currentPage.setScrollPosition({
       left: 0,
       top: 0
     });
-    this.currentPage.render(path);
+    this.currentPage.render(path, options);
     this.currentPage.setScrollPosition({
       left: dimensions.left,
       top: dimensions.top
     });
+    (ref5 = this.currentPage["native"]()).evaluate.apply(ref5, ["window.scrollTo"].concat(slice.call(window_scroll_position)));
     return this.current_command.sendResponse(true);
   };
 
@@ -549,6 +559,11 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
+  Browser.prototype.set_proxy = function(ip, port, type, user, password) {
+    phantom.setProxy(ip, port, type, user, password);
+    return this.current_command.sendResponse(true);
+  };
+
   Browser.prototype.get_headers = function() {
     return this.current_command.sendResponse(this.currentPage.getCustomHeaders());
   };
@@ -637,11 +652,9 @@ Poltergeist.Browser = (function() {
     if (this.currentPage.canGoBack) {
       this.currentPage.state = 'loading';
       this.currentPage.goBack();
-      return this.currentPage.waitState('default', (function(_this) {
-        return function() {
-          return command.sendResponse(true);
-        };
-      })(this));
+      return this.currentPage.waitState('default', function() {
+        return command.sendResponse(true);
+      });
     } else {
       return command.sendResponse(false);
     }
@@ -653,23 +666,41 @@ Poltergeist.Browser = (function() {
     if (this.currentPage.canGoForward) {
       this.currentPage.state = 'loading';
       this.currentPage.goForward();
-      return this.currentPage.waitState('default', (function(_this) {
-        return function() {
-          return command.sendResponse(true);
-        };
-      })(this));
+      return this.currentPage.waitState('default', function() {
+        return command.sendResponse(true);
+      });
     } else {
       return command.sendResponse(false);
     }
   };
 
   Browser.prototype.set_url_whitelist = function() {
-    this.currentPage.urlWhitelist = Array.prototype.slice.call(arguments);
+    var wc, wildcards;
+    wildcards = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+    this.currentPage.urlWhitelist = (function() {
+      var i, len, results;
+      results = [];
+      for (i = 0, len = wildcards.length; i < len; i++) {
+        wc = wildcards[i];
+        results.push(this._wildcardToRegexp(wc));
+      }
+      return results;
+    }).call(this);
     return this.current_command.sendResponse(true);
   };
 
   Browser.prototype.set_url_blacklist = function() {
-    this.currentPage.urlBlacklist = Array.prototype.slice.call(arguments);
+    var wc, wildcards;
+    wildcards = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+    this.currentPage.urlBlacklist = (function() {
+      var i, len, results;
+      results = [];
+      for (i = 0, len = wildcards.length; i < len; i++) {
+        wc = wildcards[i];
+        results.push(this._wildcardToRegexp(wc));
+      }
+      return results;
+    }).call(this);
     return this.current_command.sendResponse(true);
   };
 
@@ -687,6 +718,18 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.processed_modal_messages.shift());
   };
 
+  Browser.prototype.clear_memory_cache = function() {
+    this.currentPage.clearMemoryCache();
+    return this.current_command.sendResponse(true);
+  };
+
+  Browser.prototype._wildcardToRegexp = function(wildcard) {
+    wildcard = wildcard.replace(/[\-\[\]\/\{\}\(\)\+\.\\\^\$\|]/g, "\\$&");
+    wildcard = wildcard.replace(/\*/g, ".*");
+    wildcard = wildcard.replace(/\?/g, ".");
+    return new RegExp(wildcard, "i");
+  };
+
   return Browser;
 
 })();

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

@@ -214,6 +214,23 @@ Poltergeist.NoSuchWindowError = (function(superClass) {
 
 })(Poltergeist.Error);
 
+Poltergeist.UnsupportedFeature = (function(superClass) {
+  extend(UnsupportedFeature, superClass);
+
+  function UnsupportedFeature(message1) {
+    this.message = message1;
+  }
+
+  UnsupportedFeature.prototype.name = "Poltergeist.UnsupportedFeature";
+
+  UnsupportedFeature.prototype.args = function() {
+    return [this.message, phantom.version];
+  };
+
+  return UnsupportedFeature;
+
+})(Poltergeist.Error);
+
 phantom.injectJs(phantom.libraryPath + "/web_page.js");
 
 phantom.injectJs(phantom.libraryPath + "/node.js");

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

@@ -117,11 +117,11 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.onResourceRequestedNative = function(request, net) {
     var abort, blacklisted, ref2, useWhitelist, whitelisted;
     useWhitelist = this.urlWhitelist.length > 0;
-    whitelisted = this.urlWhitelist.some(function(whitelisted_url) {
-      return request.url.indexOf(whitelisted_url) !== -1;
+    whitelisted = this.urlWhitelist.some(function(whitelisted_regex) {
+      return whitelisted_regex.test(request.url);
     });
-    blacklisted = this.urlBlacklist.some(function(blacklisted_url) {
-      return request.url.indexOf(blacklisted_url) !== -1;
+    blacklisted = this.urlBlacklist.some(function(blacklisted_regex) {
+      return blacklisted_regex.test(request.url);
     });
     abort = false;
     if (useWhitelist && !whitelisted) {
@@ -234,13 +234,11 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype._waitState_until = function(state, callback, timeout, timeout_callback) {
-    var d;
     if (this.state === state) {
-      return callback.call();
+      return callback.call(this);
     } else {
-      d = new Date();
-      if (d.getTime() > timeout) {
-        return timeout_callback.call();
+      if (new Date().getTime() > timeout) {
+        return timeout_callback.call(this);
       } else {
         return setTimeout(((function(_this) {
           return function() {
@@ -257,10 +255,10 @@ Poltergeist.WebPage = (function() {
       max_wait = 0;
     }
     if (this.state === state) {
-      return callback.call();
+      return callback.call(this);
     } else {
       if (max_wait !== 0) {
-        timeout = (new Date).getTime() + (max_wait * 1000);
+        timeout = new Date().getTime() + (max_wait * 1000);
         return setTimeout(((function(_this) {
           return function() {
             return _this._waitState_until(state, callback, timeout, timeout_callback);
@@ -584,6 +582,16 @@ Poltergeist.WebPage = (function() {
     return parser.href;
   };
 
+  WebPage.prototype.clearMemoryCache = function() {
+    var clearMemoryCache;
+    clearMemoryCache = this["native"]().clearMemoryCache;
+    if (typeof clearMemoryCache === "function") {
+      return clearMemoryCache();
+    } else {
+      throw new Poltergeist.UnsupportedFeature("clearMemoryCache is supported since PhantomJS 2.0.0");
+    }
+  };
+
   return WebPage;
 
 })();

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

@@ -87,6 +87,11 @@ class Poltergeist.NoSuchWindowError extends Poltergeist.Error
   name: "Poltergeist.NoSuchWindowError"
   args: -> []
 
+class Poltergeist.UnsupportedFeature extends Poltergeist.Error
+  constructor: (@message) ->
+  name: "Poltergeist.UnsupportedFeature"
+  args: -> [@message, phantom.version]
+
 # We're using phantom.libraryPath so that any stack traces
 # report the full path.
 phantom.injectJs("#{phantom.libraryPath}/web_page.js")

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

@@ -83,11 +83,11 @@ class Poltergeist.WebPage
   onResourceRequestedNative: (request, net) ->
     useWhitelist = @urlWhitelist.length > 0
 
-    whitelisted = @urlWhitelist.some (whitelisted_url) ->
-      request.url.indexOf(whitelisted_url) != -1
+    whitelisted = @urlWhitelist.some (whitelisted_regex) ->
+      whitelisted_regex.test request.url
 
-    blacklisted = @urlBlacklist.some (blacklisted_url) ->
-      request.url.indexOf(blacklisted_url) != -1
+    blacklisted = @urlBlacklist.some (blacklisted_regex) ->
+      blacklisted_regex.test request.url
 
     abort = false
 
@@ -170,20 +170,20 @@ class Poltergeist.WebPage
 
   _waitState_until: (state, callback, timeout, timeout_callback) ->
     if (@state == state)
-      callback.call()
+      callback.call(this)
     else
-      d = new Date()
-      if d.getTime() > timeout
-        timeout_callback.call()
+      if new Date().getTime() > timeout
+        timeout_callback.call(this)
       else
         setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
 
   waitState: (state, callback, max_wait=0, timeout_callback) ->
+    # callback and timeout_callback will be called with this == the current page
     if @state == state
-      callback.call()
+      callback.call(this)
     else
       if max_wait != 0
-        timeout = (new Date).getTime() + (max_wait*1000)
+        timeout = new Date().getTime() + (max_wait*1000)
         setTimeout (=> @_waitState_until(state, callback, timeout, timeout_callback)), 100
       else
         setTimeout (=> @waitState(state, callback)), 100
@@ -409,3 +409,10 @@ class Poltergeist.WebPage
     parser = document.createElement('a')
     parser.href = url
     return parser.href
+
+  clearMemoryCache: ->
+    clearMemoryCache = this.native().clearMemoryCache
+    if typeof clearMemoryCache == "function"
+      clearMemoryCache()
+    else
+      throw new Poltergeist.UnsupportedFeature("clearMemoryCache is supported since PhantomJS 2.0.0")

data/lib/capybara/poltergeist/cookie.rb

@@ -28,6 +28,10 @@ module Capybara::Poltergeist
       @attributes['httponly']
     end
 
+    def samesite
+      @attributes['samesite']
+    end
+
     def expires
       Time.at @attributes['expiry'] if @attributes['expiry']
     end

data/lib/capybara/poltergeist/driver.rb

@@ -26,6 +26,8 @@ module Capybara::Poltergeist
         browser.js_errors  = options[:js_errors] if options.key?(:js_errors)
         browser.extensions = options.fetch(:extensions, [])
         browser.debug      = true if options[:debug]
+        browser.url_blacklist = options[:url_blacklist] if options.key?(:url_blacklist)
+        browser.url_whitelist = options[:url_whitelist] if options.key?(:url_whitelist)
         browser
       end
     end
@@ -175,6 +177,8 @@ module Capybara::Poltergeist
 
     def reset!
       browser.reset
+      browser.url_blacklist = options[:url_blacklist] if options.key?(:url_blacklist)
+      browser.url_whitelist = options[:url_whitelist] if options.key?(:url_whitelist)
       @started = false
     end
 
@@ -224,6 +228,10 @@ module Capybara::Poltergeist
       browser.clear_network_traffic
     end
 
+    def set_proxy(ip, port, type = "http", user = nil, password = nil)
+      browser.set_proxy(ip, port, type, user, password)
+    end
+
     def headers
       browser.get_headers
     end
@@ -275,6 +283,10 @@ module Capybara::Poltergeist
       browser.cookies_enabled = flag
     end
 
+    def clear_memory_cache
+      browser.clear_memory_cache
+    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

data/lib/capybara/poltergeist/errors.rb

@@ -115,6 +115,24 @@ module Capybara
       end
     end
 
+    class UnsupportedFeature < ClientError
+      def name
+        response['name']
+      end
+
+      def unsupported_message
+        response['args'][0]
+      end
+
+      def version
+        response['args'][1].values_at(*%w(major minor patch)).join '.'
+      end
+
+      def message
+        "Running version of PhantomJS #{version} does not support some feature: #{unsupported_message}"
+      end
+    end
+
     class MouseEventFailed < NodeError
       def name
         response['args'][0]

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.9.0"
+    VERSION = "1.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cliver
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +141,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
@@ -162,6 +151,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
@@ -192,6 +184,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: coffee-script-source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Poltergeist is a driver for Capybara that allows you to run your tests
   on a headless WebKit browser, provided by PhantomJS.
 email:
@@ -224,7 +258,6 @@ files:
 - lib/capybara/poltergeist/driver.rb
 - lib/capybara/poltergeist/errors.rb
 - lib/capybara/poltergeist/inspector.rb
-- lib/capybara/poltergeist/json.rb
 - lib/capybara/poltergeist/network_traffic.rb
 - lib/capybara/poltergeist/network_traffic/error.rb
 - lib/capybara/poltergeist/network_traffic/request.rb
@@ -254,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara

data/lib/capybara/poltergeist/json.rb

@@ -1,25 +0,0 @@
-module Capybara::Poltergeist
-  module JSON
-    def self.load(message)
-      if dumpy_multi_json?
-        MultiJson.load(message)
-      else
-        MultiJson.decode(message)
-      end
-    end
-
-    def self.dump(message)
-      if dumpy_multi_json?
-        MultiJson.dump(message)
-      else
-        MultiJson.encode(message)
-      end
-    end
-
-    private
-
-    def self.dumpy_multi_json?
-      MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
-    end
-  end
-end