poltergeist 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac1d67cd0c1e7872a042e4d0dfa10740b132858
-  data.tar.gz: e52276ce486bb4bda8e17416da7492cdae0af9aa
+  metadata.gz: dc319cb98595a9cedd482bffd3756720c4ed24b4
+  data.tar.gz: a79f76c1344f910aac1aa9f38a0cb6fd40dfa075
 SHA512:
-  metadata.gz: aa4a1e4fa49103bb1989d16a46c1135ebffaec9df3fb0a86f1fdf5841389fffd9c6ebaa59ffc8f57abf150a981ce419d38c5c9516d1b0281e73e96f3c78cc517
-  data.tar.gz: a7088f6835bf5ef8eb42e724e99dc3271e37deb56c47cce57d68bdd54493ed0e4ed795717dc10d91a56196c55df59fed3c8bdf2c437c9d387d58cc5e7f0d4cbf
+  metadata.gz: f0c6a5e24513e4c34e755c2a4cee6191580648d98bea2ba26877b8d4267dafb75a6aedd0d61d49b767b02dd825cdbcbbd1a59d05a85fc35a3230aaf92eccadaa
+  data.tar.gz: c634a8ee97d076785499dd803553174d1ed5932cede4f80bdc23dc11a364cec694d024a8e51bf10cf0155948ddc9a38515d5f43fbc7d3c1590ace315a88d3169

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.10.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.10.0)**
+(1.13.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.13.0)**
 
 ## Getting help ##
 
@@ -88,7 +88,8 @@ 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/) and [Codeship](https://codeship.com/) has PhantomJS pre-installed.
+[Travis CI](https://travis-ci.org/), [CircleCI](https://circleci.com/)
+and [Codeship](https://codeship.com/) 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
@@ -192,8 +193,9 @@ visit(login_path)
 page.driver.headers # => { "User-Agent" => "Poltergeist" }
 ```
 
-This way your temporary headers will be sent only for the initial request, all
-subsequent request will only contain your permanent headers.
+This way your temporary headers will be sent only for the initial request, and related 30x redirects. All
+subsequent request will only contain your permanent headers. If the temporary
+headers should not be sent on related 30x redirects, specify `permanent: :no_redirect`.
 
 ### Inspecting network traffic ###
 
@@ -201,6 +203,12 @@ 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.
+
+You can inspect requests that were blocked by a whitelist or blacklist
+by calling `page.driver.network_traffic(:blocked)`. This returns an array of
+request objects. The `response_parts` portion of these requests will always
+be empty.
+
 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`

data/lib/capybara/poltergeist/browser.rb

@@ -260,8 +260,8 @@ module Capybara::Poltergeist
       command 'path', page_id, id
     end
 
-    def network_traffic
-      command('network_traffic').values.map do |event|
+    def network_traffic(type = nil)
+      command('network_traffic', type).map do |event|
         NetworkTraffic::Request.new(
           event['request'],
           event['responseParts'].map { |response| NetworkTraffic::Response.new(response) },
@@ -297,8 +297,8 @@ module Capybara::Poltergeist
       command 'add_headers', headers
     end
 
-    def add_header(header, permanent)
-      command 'add_header', header, permanent
+    def add_header(header, options={})
+      command 'add_header', header, options
     end
 
     def response_headers

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

@@ -57,6 +57,26 @@ class PoltergeistAgent
   clearLocalStorage: ->
     localStorage?.clear()
 
+  wrapResults: (result, page_id)->
+    @_visitedObjects ||= [];
+    switch
+      when result in @_visitedObjects
+        '(cyclic structure)'
+      when Array.isArray(result) || (result instanceof NodeList)
+        @wrapResults(res, page_id) for res in result
+      when result && result.nodeType == 1 && result['tagName']
+        {'ELEMENT': { id: @register(result), page_id: page_id } };
+      when not result?
+        undefined
+      when typeof result == 'object'
+        @_visitedObjects.push(result);
+        obj = {}
+        obj[key] = @wrapResults(val, page_id) for own key, val of result
+        @_visitedObjects.pop();
+        obj
+      else
+        result
+
 class PoltergeistAgent.ObsoleteNode
   toString: -> "PoltergeistAgent.ObsoleteNode"
 
@@ -89,7 +109,7 @@ class PoltergeistAgent.Node
 
   isObsolete: ->
     obsolete = (element) =>
-      if (parent = element.parentNode)?
+      if (parent = element?.parentNode)?
         if parent == document
           return false
         else

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

@@ -75,8 +75,10 @@ class Poltergeist.Browser
     return
 
   add_extension: (extension) ->
-    @currentPage.injectExtension extension
-    @current_command.sendResponse 'success'
+    if @currentPage.injectExtension extension
+      @current_command.sendResponse 'success'
+    else
+      @current_command.sendError(new Poltergeist.BrowserError("Unable to load extension: #{extension}"))
 
   node: (page_id, id) ->
     if @currentPage.id == page_id
@@ -417,8 +419,8 @@ class Poltergeist.Browser
     @currentPage.setViewportSize(width: width, height: height)
     @current_command.sendResponse(true)
 
-  network_traffic: ->
-    @current_command.sendResponse(@currentPage.networkTraffic())
+  network_traffic: (type) ->
+    @current_command.sendResponse(@currentPage.networkTraffic(type))
 
   clear_network_traffic: ->
     @currentPage.clearNetworkTraffic()
@@ -443,8 +445,10 @@ class Poltergeist.Browser
       allHeaders[name] = value
     this.set_headers(allHeaders)
 
-  add_header: (header, permanent) ->
-    @currentPage.addTempHeader(header) unless permanent
+  add_header: (header, { permanent = true }) ->
+    unless permanent == true
+      @currentPage.addTempHeader(header)
+      @currentPage.addTempHeaderToRemoveOnRedirect(header) if permanent == "no_redirect"
     this.add_headers(header)
 
   response_headers: ->

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

@@ -1,4 +1,6 @@
-var PoltergeistAgent;
+var PoltergeistAgent,
+  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; },
+  hasProp = {}.hasOwnProperty;
 
 PoltergeistAgent = (function() {
   function PoltergeistAgent() {
@@ -100,6 +102,44 @@ PoltergeistAgent = (function() {
     return typeof localStorage !== "undefined" && localStorage !== null ? localStorage.clear() : void 0;
   };
 
+  PoltergeistAgent.prototype.wrapResults = function(result, page_id) {
+    var j, key, len, obj, res, results1, val;
+    this._visitedObjects || (this._visitedObjects = []);
+    switch (false) {
+      case indexOf.call(this._visitedObjects, result) < 0:
+        return '(cyclic structure)';
+      case !(Array.isArray(result) || (result instanceof NodeList)):
+        results1 = [];
+        for (j = 0, len = result.length; j < len; j++) {
+          res = result[j];
+          results1.push(this.wrapResults(res, page_id));
+        }
+        return results1;
+        break;
+      case !(result && result.nodeType === 1 && result['tagName']):
+        return {
+          'ELEMENT': {
+            id: this.register(result),
+            page_id: page_id
+          }
+        };
+      case !(result == null):
+        return void 0;
+      case typeof result !== 'object':
+        this._visitedObjects.push(result);
+        obj = {};
+        for (key in result) {
+          if (!hasProp.call(result, key)) continue;
+          val = result[key];
+          obj[key] = this.wrapResults(val, page_id);
+        }
+        this._visitedObjects.pop();
+        return obj;
+      default:
+        return result;
+    }
+  };
+
   return PoltergeistAgent;
 
 })();
@@ -162,7 +202,7 @@ PoltergeistAgent.Node = (function() {
     obsolete = (function(_this) {
       return function(element) {
         var parent;
-        if ((parent = element.parentNode) != null) {
+        if ((parent = element != null ? element.parentNode : void 0) != null) {
           if (parent === document) {
             return false;
           } else {

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

@@ -100,8 +100,11 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.add_extension = function(extension) {
-    this.currentPage.injectExtension(extension);
-    return this.current_command.sendResponse('success');
+    if (this.currentPage.injectExtension(extension)) {
+      return this.current_command.sendResponse('success');
+    } else {
+      return this.current_command.sendError(new Poltergeist.BrowserError("Unable to load extension: " + extension));
+    }
   };
 
   Browser.prototype.node = function(page_id, id) {
@@ -588,8 +591,8 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(true);
   };
 
-  Browser.prototype.network_traffic = function() {
-    return this.current_command.sendResponse(this.currentPage.networkTraffic());
+  Browser.prototype.network_traffic = function(type) {
+    return this.current_command.sendResponse(this.currentPage.networkTraffic(type));
   };
 
   Browser.prototype.clear_network_traffic = function() {
@@ -624,9 +627,14 @@ Poltergeist.Browser = (function() {
     return this.set_headers(allHeaders);
   };
 
-  Browser.prototype.add_header = function(header, permanent) {
-    if (!permanent) {
+  Browser.prototype.add_header = function(header, arg1) {
+    var permanent, ref;
+    permanent = (ref = arg1.permanent) != null ? ref : true;
+    if (permanent !== true) {
       this.currentPage.addTempHeader(header);
+      if (permanent === "no_redirect") {
+        this.currentPage.addTempHeaderToRemoveOnRedirect(header);
+      }
     }
     return this.add_headers(header);
   };

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

@@ -29,6 +29,7 @@ Poltergeist.WebPage = (function() {
     this._blockedUrls = [];
     this._requestedResources = {};
     this._responseHeaders = [];
+    this._tempHeadersToRemoveOnRedirect = {};
     ref = WebPage.CALLBACKS;
     for (i = 0, len = ref.length; i < len; i++) {
       callback = ref[i];
@@ -68,6 +69,7 @@ Poltergeist.WebPage = (function() {
     this.source = null;
     this.injectAgent();
     this.removeTempHeaders();
+    this.removeTempHeadersForRedirect();
     return this.setScrollPosition({
       left: 0,
       top: 0
@@ -118,22 +120,14 @@ 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_regex) {
-      return whitelisted_regex.test(request.url);
-    });
-    blacklisted = this.urlBlacklist.some(function(blacklisted_regex) {
-      return blacklisted_regex.test(request.url);
-    });
-    abort = false;
-    if (useWhitelist && !whitelisted) {
-      abort = true;
-    }
-    if (blacklisted) {
-      abort = true;
-    }
-    if (abort) {
+    var ref2;
+    this._networkTraffic[request.id] = {
+      request: request,
+      responseParts: [],
+      error: null
+    };
+    if (this._blockRequest(request.url)) {
+      this._networkTraffic[request.id].blocked = true;
       if (ref2 = request.url, indexOf.call(this._blockedUrls, ref2) < 0) {
         this._blockedUrls.push(request.url);
       }
@@ -141,14 +135,10 @@ Poltergeist.WebPage = (function() {
     } else {
       this.lastRequestId = request.id;
       if (this.normalizeURL(request.url) === this.redirectURL) {
+        this.removeTempHeadersForRedirect();
         this.redirectURL = null;
         this.requestId = request.id;
       }
-      this._networkTraffic[request.id] = {
-        request: request,
-        responseParts: [],
-        error: null
-      };
       this._requestedResources[request.id] = request.url;
     }
     return true;
@@ -164,6 +154,7 @@ Poltergeist.WebPage = (function() {
     }
     if (this.requestId === response.id) {
       if (response.redirectURL) {
+        this.removeTempHeadersForRedirect();
         this.redirectURL = this.normalizeURL(response.redirectURL);
       } else {
         this.statusCode = response.status;
@@ -294,8 +285,43 @@ Poltergeist.WebPage = (function() {
     return true;
   };
 
-  WebPage.prototype.networkTraffic = function() {
-    return this._networkTraffic;
+  WebPage.prototype.networkTraffic = function(type) {
+    var id, ref2, ref3, ref4, request, results, results1, results2;
+    switch (type) {
+      case 'all':
+        ref2 = this._networkTraffic;
+        results = [];
+        for (id in ref2) {
+          if (!hasProp.call(ref2, id)) continue;
+          request = ref2[id];
+          results.push(request);
+        }
+        return results;
+        break;
+      case 'blocked':
+        ref3 = this._networkTraffic;
+        results1 = [];
+        for (id in ref3) {
+          if (!hasProp.call(ref3, id)) continue;
+          request = ref3[id];
+          if (request.blocked) {
+            results1.push(request);
+          }
+        }
+        return results1;
+        break;
+      default:
+        ref4 = this._networkTraffic;
+        results2 = [];
+        for (id in ref4) {
+          if (!hasProp.call(ref4, id)) continue;
+          request = ref4[id];
+          if (!request.blocked) {
+            results2.push(request);
+          }
+        }
+        return results2;
+    }
   };
 
   WebPage.prototype.clearNetworkTraffic = function() {
@@ -422,6 +448,26 @@ Poltergeist.WebPage = (function() {
     return this._tempHeaders;
   };
 
+  WebPage.prototype.addTempHeaderToRemoveOnRedirect = function(header) {
+    var name, value;
+    for (name in header) {
+      value = header[name];
+      this._tempHeadersToRemoveOnRedirect[name] = value;
+    }
+    return this._tempHeadersToRemoveOnRedirect;
+  };
+
+  WebPage.prototype.removeTempHeadersForRedirect = function() {
+    var allHeaders, name, ref2, value;
+    allHeaders = this.getCustomHeaders();
+    ref2 = this._tempHeadersToRemoveOnRedirect;
+    for (name in ref2) {
+      value = ref2[name];
+      delete allHeaders[name];
+    }
+    return this.setCustomHeaders(allHeaders);
+  };
+
   WebPage.prototype.removeTempHeaders = function() {
     var allHeaders, name, ref2, value;
     allHeaders = this.getCustomHeaders();
@@ -513,10 +559,11 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.evaluate = function() {
-    var args, fn, ref2;
+    var args, fn, ref2, result;
     fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     this.injectAgent();
-    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { for(var i=0; i < arguments.length; i++){ if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){ arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element; } } var _result = " + (this.stringifyCall(fn)) + "; return (_result == null) ? undefined : _result; }"].concat(slice.call(args)));
+    result = (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { var page_id = arguments[0]; var args = []; for(var i=1; i < arguments.length; i++){ if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){ args.push(window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element); } else { args.push(arguments[i]) } } var _result = " + (this.stringifyCall(fn, "args")) + "; return window.__poltergeist.wrapResults(_result, page_id); }", this.id].concat(slice.call(args)));
+    return result;
   };
 
   WebPage.prototype.execute = function() {
@@ -525,8 +572,11 @@ Poltergeist.WebPage = (function() {
     return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { for(var i=0; i < arguments.length; i++){ if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){ arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element; } } " + (this.stringifyCall(fn)) + " }"].concat(slice.call(args)));
   };
 
-  WebPage.prototype.stringifyCall = function(fn) {
-    return "(" + (fn.toString()) + ").apply(this, arguments)";
+  WebPage.prototype.stringifyCall = function(fn, args_name) {
+    if (args_name == null) {
+      args_name = "arguments";
+    }
+    return "(" + (fn.toString()) + ").apply(this, " + args_name + ")";
   };
 
   WebPage.prototype.bindCallback = function(name) {
@@ -549,22 +599,20 @@ Poltergeist.WebPage = (function() {
     result = this.evaluate(function(name, args) {
       return __poltergeist.externalCall(name, args);
     }, name, args);
-    if (result !== null) {
-      if (result.error != null) {
-        switch (result.error.message) {
-          case 'PoltergeistAgent.ObsoleteNode':
-            throw new Poltergeist.ObsoleteNode;
-            break;
-          case 'PoltergeistAgent.InvalidSelector':
-            method = args[0], selector = args[1];
-            throw new Poltergeist.InvalidSelector(method, selector);
-            break;
-          default:
-            throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
-        }
-      } else {
-        return result.value;
+    if ((result != null ? result.error : void 0) != null) {
+      switch (result.error.message) {
+        case 'PoltergeistAgent.ObsoleteNode':
+          throw new Poltergeist.ObsoleteNode;
+          break;
+        case 'PoltergeistAgent.InvalidSelector':
+          method = args[0], selector = args[1];
+          throw new Poltergeist.InvalidSelector(method, selector);
+          break;
+        default:
+          throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
       }
+    } else {
+      return result != null ? result.value : void 0;
     }
   };
 
@@ -593,6 +641,24 @@ Poltergeist.WebPage = (function() {
     }
   };
 
+  WebPage.prototype._blockRequest = function(url) {
+    var blacklisted, useWhitelist, whitelisted;
+    useWhitelist = this.urlWhitelist.length > 0;
+    whitelisted = this.urlWhitelist.some(function(whitelisted_regex) {
+      return whitelisted_regex.test(url);
+    });
+    blacklisted = this.urlBlacklist.some(function(blacklisted_regex) {
+      return blacklisted_regex.test(url);
+    });
+    if (useWhitelist && !whitelisted) {
+      return true;
+    }
+    if (blacklisted) {
+      return true;
+    }
+    return false;
+  };
+
   WebPage.prototype._overrideNativeEvaluate = function() {
     return this._native.evaluate = function (func, args) {
         function quoteString(str) {

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

@@ -28,6 +28,7 @@ class Poltergeist.WebPage
     @_blockedUrls    = []
     @_requestedResources = {}
     @_responseHeaders = []
+    @_tempHeadersToRemoveOnRedirect = {}
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
@@ -49,8 +50,9 @@ class Poltergeist.WebPage
     @id += 1
     @source = null
     @injectAgent()
-    this.removeTempHeaders()
-    this.setScrollPosition(left: 0, top: 0)
+    @removeTempHeaders()
+    @removeTempHeadersForRedirect()
+    @setScrollPosition(left: 0, top: 0)
 
   onClosingNative: ->
     @handle = null
@@ -84,38 +86,25 @@ class Poltergeist.WebPage
     return true
 
   onResourceRequestedNative: (request, net) ->
-    useWhitelist = @urlWhitelist.length > 0
-
-    whitelisted = @urlWhitelist.some (whitelisted_regex) ->
-      whitelisted_regex.test request.url
-
-    blacklisted = @urlBlacklist.some (blacklisted_regex) ->
-      blacklisted_regex.test request.url
-
-    abort = false
-
-    if useWhitelist && !whitelisted
-      abort = true
-
-    if blacklisted
-      abort = true
-
-    if abort
+    @_networkTraffic[request.id] = {
+      request:       request,
+      responseParts: []
+      error: null
+    }
+
+    if @_blockRequest(request.url)
+      @_networkTraffic[request.id].blocked = true
       @_blockedUrls.push request.url unless request.url in @_blockedUrls
+
       net.abort()
     else
       @lastRequestId = request.id
 
       if @normalizeURL(request.url) == @redirectURL
+        @removeTempHeadersForRedirect()
         @redirectURL = null
         @requestId   = request.id
 
-      @_networkTraffic[request.id] = {
-        request:       request,
-        responseParts: []
-        error: null
-      }
-
       @_requestedResources[request.id] = request.url
     return true
 
@@ -127,6 +116,7 @@ class Poltergeist.WebPage
 
     if @requestId == response.id
       if response.redirectURL
+        @removeTempHeadersForRedirect()
         @redirectURL = @normalizeURL(response.redirectURL)
       else
         @statusCode = response.status
@@ -197,8 +187,14 @@ class Poltergeist.WebPage
     this.native().settings.password = password
     return true
 
-  networkTraffic: ->
-    @_networkTraffic
+  networkTraffic: (type) ->
+    switch type
+      when 'all'
+        request for own id, request of @_networkTraffic
+      when 'blocked'
+        request for own id, request of @_networkTraffic when request.blocked
+      else
+        request for own id, request of @_networkTraffic when not request.blocked
 
   clearNetworkTraffic: ->
     @_networkTraffic = {}
@@ -286,11 +282,22 @@ class Poltergeist.WebPage
       @_tempHeaders[name] = value
     @_tempHeaders
 
+  addTempHeaderToRemoveOnRedirect: (header) ->
+    for name, value of header
+      @_tempHeadersToRemoveOnRedirect[name] = value
+    @_tempHeadersToRemoveOnRedirect
+
+  removeTempHeadersForRedirect: ->
+    allHeaders = @getCustomHeaders()
+    for name, value of @_tempHeadersToRemoveOnRedirect
+      delete allHeaders[name]
+    @setCustomHeaders(allHeaders)
+
   removeTempHeaders: ->
-    allHeaders = this.getCustomHeaders()
+    allHeaders = @getCustomHeaders()
     for name, value of @_tempHeaders
       delete allHeaders[name]
-    this.setCustomHeaders(allHeaders)
+    @setCustomHeaders(allHeaders)
 
   pushFrame: (name) ->
     return true if this.native().switchToFrame(name)
@@ -346,14 +353,20 @@ class Poltergeist.WebPage
 
   evaluate: (fn, args...) ->
     this.injectAgent()
-    this.native().evaluate("function() {
-      for(var i=0; i < arguments.length; i++){
+    result = this.native().evaluate("function() {
+      var page_id = arguments[0];
+      var args = [];
+
+      for(var i=1; i < arguments.length; i++){
         if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){
-          arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element;
+          args.push(window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element);
+        } else {
+          args.push(arguments[i])
         }
       }
-      var _result = #{this.stringifyCall(fn)};
-      return (_result == null) ? undefined : _result; }", args...)
+      var _result = #{this.stringifyCall(fn, "args")};
+      return window.__poltergeist.wrapResults(_result, page_id); }", @id, args...)
+    result
 
   execute: (fn, args...) ->
     this.native().evaluate("function() {
@@ -364,8 +377,8 @@ class Poltergeist.WebPage
       }
       #{this.stringifyCall(fn)} }", args...)
 
-  stringifyCall: (fn) ->
-    "(#{fn.toString()}).apply(this, arguments)"
+  stringifyCall: (fn, args_name = "arguments") ->
+    "(#{fn.toString()}).apply(this, #{args_name})"
 
   bindCallback: (name) ->
     @native()[name] = =>
@@ -382,18 +395,17 @@ class Poltergeist.WebPage
       name, args
     )
 
-    if result != null
-      if result.error?
-        switch result.error.message
-          when 'PoltergeistAgent.ObsoleteNode'
-            throw new Poltergeist.ObsoleteNode
-          when 'PoltergeistAgent.InvalidSelector'
-            [method, selector] = args
-            throw new Poltergeist.InvalidSelector(method, selector)
-          else
-            throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
-      else
-        result.value
+    if result?.error?
+      switch result.error.message
+        when 'PoltergeistAgent.ObsoleteNode'
+          throw new Poltergeist.ObsoleteNode
+        when 'PoltergeistAgent.InvalidSelector'
+          [method, selector] = args
+          throw new Poltergeist.InvalidSelector(method, selector)
+        else
+          throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
+    else
+      result?.value
 
   canGoBack: ->
     this.native().canGoBack
@@ -413,6 +425,23 @@ class Poltergeist.WebPage
     else
       throw new Poltergeist.UnsupportedFeature("clearMemoryCache is supported since PhantomJS 2.0.0")
 
+  _blockRequest: (url) ->
+    useWhitelist = @urlWhitelist.length > 0
+
+    whitelisted = @urlWhitelist.some (whitelisted_regex) ->
+      whitelisted_regex.test url
+
+    blacklisted = @urlBlacklist.some (blacklisted_regex) ->
+      blacklisted_regex.test url
+
+    if useWhitelist && !whitelisted
+      return true
+
+    if blacklisted
+      return true
+
+    false
+
   _overrideNativeEvaluate: ->
     # PhantomJS 1.9.x WebPage#evaluate depends on the browser context  JSON, this replaces it
     # with the evaluate from 2.1.1 which uses the PhantomJS JSON

data/lib/capybara/poltergeist/driver.rb

@@ -135,7 +135,8 @@ module Capybara::Poltergeist
     end
 
     def evaluate_script(script, *args)
-      browser.evaluate(script, *args.map { |arg| arg.is_a?(Capybara::Poltergeist::Node) ?  arg.native : arg})
+      result = browser.evaluate(script, *args.map { |arg| arg.is_a?(Capybara::Poltergeist::Node) ?  arg.native : arg})
+      unwrap_script_result(result)
     end
 
     def execute_script(script, *args)
@@ -228,8 +229,8 @@ module Capybara::Poltergeist
       browser.scroll_to(left, top)
     end
 
-    def network_traffic
-      browser.network_traffic
+    def network_traffic(type = nil)
+      browser.network_traffic(type)
     end
 
     def clear_network_traffic
@@ -253,8 +254,7 @@ module Capybara::Poltergeist
     end
 
     def add_header(name, value, options = {})
-      permanent = options.fetch(:permanent, true)
-      browser.add_header({ name => value }, permanent)
+      browser.add_header({ name => value }, { permanent: true }.merge(options))
     end
 
     def response_headers
@@ -340,8 +340,8 @@ module Capybara::Poltergeist
       rescue EOFError, IO::WaitReadable # Ignore problems reading from STDIN.
       end unless signal
 
-      trap('SIGCONT', old_trap) # Restore the previuos signal handler, if there was one.
-
+    ensure
+      trap('SIGCONT', old_trap) # Restore the previous signal handler, if there was one.
       STDERR.puts 'Continuing'
     end
 
@@ -410,5 +410,17 @@ module Capybara::Poltergeist
       end
       modal_text
     end
+
+    def unwrap_script_result(arg)
+      case arg
+      when Array
+        arg.map { |e| unwrap_script_result(e) }
+      when Hash
+        return Capybara::Poltergeist::Node.new(self, arg['ELEMENT']['page_id'], arg['ELEMENT']['id']) if arg['ELEMENT']
+        arg.each { |k, v| arg[k] = unwrap_script_result(v) }
+      else
+        arg
+      end
+    end
   end
 end

data/lib/capybara/poltergeist/node.rb

@@ -156,7 +156,7 @@ module Capybara::Poltergeist
     end
 
     def ==(other)
-      command :equals, other.id
+      (page_id == other.page_id) && command(:equals, other.id)
     end
 
     def send_keys(*keys)

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.13.0"
+    VERSION = "1.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara