poltergeist 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b33a1ca12aebf206487179bd97bde02aaf2934
-  data.tar.gz: 4b1545c216c97fd54b9673516e5a7d854daf86d9
+  metadata.gz: ba9a64217db44bbe9dcbe55e34cac615640688df
+  data.tar.gz: 7bd5f0ae85f2565e1b6c07f4030644f59eccbb1f
 SHA512:
-  metadata.gz: 27e4dbb8868f7dfc18daaec1beae92d7afef23c61d4b720fa4a1f9f6352a1d0eb8909053a0a5c920103507ef1a135965061a3874b74c649554823004cc655459
-  data.tar.gz: cb0ed5f12f3cddd189277ee37802fc45b2fc9f157a41812882d14da9de21a135d699a4ffd6d6441919206305b60ee650766e514db2e6fc83d49953cbd27c33f5
+  metadata.gz: 93141f4f1e6438da75f912f4174f5f7f987d9fcff0dbaab0fa7eff384a6501067b6fcbf06eb06f9589e71457a8ee563ab84ff11d0ff9b83828fbd8e531b9eb00
+  data.tar.gz: 54b08a29b4707dfdb8c3a7ff2a7c16194ca100e87cfc89d1e5f11f17f7f151121260cfdf10584949100f66de17ff57b5ed574273268580e75ca7729533a484f9

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.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.8.0)**
+(1.8.1).](https://github.com/teampoltergeist/poltergeist/tree/v1.8.1)**
 
 ## Getting help ##
 

data/lib/capybara/poltergeist/browser.rb

@@ -250,7 +250,8 @@ module Capybara::Poltergeist
       command('network_traffic').values.map do |event|
         NetworkTraffic::Request.new(
           event['request'],
-          event['responseParts'].map { |response| NetworkTraffic::Response.new(response) }
+          event['responseParts'].map { |response| NetworkTraffic::Response.new(response) },
+          event['error'] ? NetworkTraffic::Error.new(event['error']) : nil
         )
       end
     end

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

@@ -107,13 +107,13 @@ class PoltergeistAgent.Node
 
   isObsolete: ->
     obsolete = (element) =>
-      if element.parentNode?
-        if element.parentNode == document
-          false
+      if (parent = element.parentNode)?
+        if parent == document
+          return false
         else
-          obsolete element.parentNode
+          obsolete parent
       else
-        true
+        return true
     obsolete @element
 
   changed: ->
@@ -256,9 +256,7 @@ class PoltergeistAgent.Node
   tagName: ->
     @element.tagName
 
-  isVisible: (element) ->
-    element ||= @element
-
+  isVisible: (element = @element) ->
     while (element)
       style = window.getComputedStyle(element)
       return false if style.display == 'none' or
@@ -312,7 +310,8 @@ class PoltergeistAgent.Node
     offset
 
   position: ->
-    rect = @element.getClientRects()[0]
+    # Elements inside an SVG return underfined for getClientRects???
+    rect = @element.getClientRects()[0] || @element.getBoundingClientRect()
     throw new PoltergeistAgent.ObsoleteNode unless rect
     frameOffset = this.frameOffset()
 

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

@@ -54,6 +54,8 @@ class Poltergeist.Browser
       page.handle = "#{@_counter++}"
       @pages.push(page)
 
+    return
+
   getPageByHandle: (handle) ->
     @pages.filter((p) -> !p.closed && p.handle == handle)[0]
 
@@ -68,6 +70,7 @@ class Poltergeist.Browser
 
   setModalMessage: (msg) ->
     @processed_modal_messages.push(msg)
+    return
 
   add_extension: (extension) ->
     @currentPage.injectExtension extension
@@ -106,6 +109,7 @@ class Poltergeist.Browser
           command.sendError(new Poltergeist.StatusFailError(url))
         else
           command.sendResponse(status: @currentPage.status)
+      return
 
   current_url: ->
     @current_command.sendResponse @currentPage.currentUrl()
@@ -268,7 +272,6 @@ class Poltergeist.Browser
   mouse_event: (page_id, id, name) ->
     # Get the node before changing state, in case there is an exception
     node = this.node(page_id, id)
-
     # If the event triggers onNavigationRequested, we will transition to the 'loading'
     # state and wait for onLoadFinished before sending a response.
     @currentPage.state = 'mouse_event'

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

@@ -186,11 +186,12 @@ PoltergeistAgent.Node = (function() {
     var obsolete;
     obsolete = (function(_this) {
       return function(element) {
-        if (element.parentNode != null) {
-          if (element.parentNode === document) {
+        var parent;
+        if ((parent = element.parentNode) != null) {
+          if (parent === document) {
             return false;
           } else {
-            return obsolete(element.parentNode);
+            return obsolete(parent);
           }
         } else {
           return true;
@@ -381,7 +382,9 @@ PoltergeistAgent.Node = (function() {
 
   Node.prototype.isVisible = function(element) {
     var style;
-    element || (element = this.element);
+    if (element == null) {
+      element = this.element;
+    }
     while (element) {
       style = window.getComputedStyle(element);
       if (style.display === 'none' || style.visibility === 'hidden' || parseFloat(style.opacity) === 0) {
@@ -449,7 +452,7 @@ PoltergeistAgent.Node = (function() {
 
   Node.prototype.position = function() {
     var frameOffset, pos, rect;
-    rect = this.element.getClientRects()[0];
+    rect = this.element.getClientRects()[0] || this.element.getBoundingClientRect();
     if (!rect) {
       throw new PoltergeistAgent.ObsoleteNode;
     }

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

@@ -63,7 +63,7 @@ Poltergeist.Browser = (function() {
         return response;
       };
     })(this);
-    return this.page.onPageCreated = (function(_this) {
+    this.page.onPageCreated = (function(_this) {
       return function(newPage) {
         var page;
         page = new Poltergeist.WebPage(newPage);
@@ -92,7 +92,7 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.setModalMessage = function(msg) {
-    return this.processed_modal_messages.push(msg);
+    this.processed_modal_messages.push(msg);
   };
 
   Browser.prototype.add_extension = function(extension) {
@@ -123,7 +123,7 @@ Poltergeist.Browser = (function() {
       });
     } else {
       command = this.current_command;
-      return this.currentPage.waitState('default', (function(_this) {
+      this.currentPage.waitState('default', (function(_this) {
         return function() {
           if (_this.currentPage.statusCode === null && _this.currentPage.status === 'fail') {
             return command.sendError(new Poltergeist.StatusFailError(url));

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

@@ -50,8 +50,10 @@ Poltergeist = (function() {
   Poltergeist.prototype.send = function(data) {
     if (this.running) {
       this.connection.send(data);
-      return this.running = false;
+      this.running = false;
+      return true;
     }
+    return false;
   };
 
   return Poltergeist;

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

@@ -4,7 +4,7 @@ var slice = [].slice,
 Poltergeist.WebPage = (function() {
   var command, delegate, fn1, fn2, i, j, len, len1, ref, ref1;
 
-  WebPage.CALLBACKS = ['onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
+  WebPage.CALLBACKS = ['onConsoleMessage', 'onError', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onResourceError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
 
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward'];
 
@@ -103,10 +103,11 @@ Poltergeist.WebPage = (function() {
         return stackString += " in " + frame["function"];
       }
     });
-    return this.errors.push({
+    this.errors.push({
       message: message,
       stack: stackString
     });
+    return true;
   };
 
   WebPage.prototype.onResourceRequestedNative = function(request, net) {
@@ -118,18 +119,20 @@ Poltergeist.WebPage = (function() {
       if (ref2 = request.url, indexOf.call(this._blockedUrls, ref2) < 0) {
         this._blockedUrls.push(request.url);
       }
-      return net.abort();
+      net.abort();
     } else {
       this.lastRequestId = request.id;
       if (this.normalizeURL(request.url) === this.redirectURL) {
         this.redirectURL = null;
         this.requestId = request.id;
       }
-      return this._networkTraffic[request.id] = {
+      this._networkTraffic[request.id] = {
         request: request,
-        responseParts: []
+        responseParts: [],
+        error: null
       };
     }
+    return true;
   };
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
@@ -139,28 +142,37 @@ Poltergeist.WebPage = (function() {
     }
     if (this.requestId === response.id) {
       if (response.redirectURL) {
-        return this.redirectURL = this.normalizeURL(response.redirectURL);
+        this.redirectURL = this.normalizeURL(response.redirectURL);
       } else {
         this.statusCode = response.status;
-        return this._responseHeaders = response.headers;
+        this._responseHeaders = response.headers;
       }
     }
+    return true;
+  };
+
+  WebPage.prototype.onResourceErrorNative = function(errorResponse) {
+    var ref2;
+    if ((ref2 = this._networkTraffic[errorResponse.id]) != null) {
+      ref2.error = errorResponse;
+    }
+    return true;
   };
 
   WebPage.prototype.injectAgent = function() {
-    var extension, k, len2, ref2, results;
+    var extension, k, len2, ref2;
     if (this["native"]().evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
       this["native"]().injectJs(phantom.libraryPath + "/agent.js");
       ref2 = WebPage.EXTENSIONS;
-      results = [];
       for (k = 0, len2 = ref2.length; k < len2; k++) {
         extension = ref2[k];
-        results.push(this["native"]().injectJs(extension));
+        this["native"]().injectJs(extension);
       }
-      return results;
+      return true;
     }
+    return false;
   };
 
   WebPage.prototype.injectExtension = function(file) {
@@ -215,7 +227,8 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.setHttpAuth = function(user, password) {
     this["native"]().settings.userName = user;
-    return this["native"]().settings.password = password;
+    this["native"]().settings.password = password;
+    return true;
   };
 
   WebPage.prototype.networkTraffic = function() {
@@ -223,7 +236,8 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.clearNetworkTraffic = function() {
-    return this._networkTraffic = {};
+    this._networkTraffic = {};
+    return true;
   };
 
   WebPage.prototype.blockedUrls = function() {
@@ -231,7 +245,8 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.clearBlockedUrls = function() {
-    return this._blockedUrls = [];
+    this._blockedUrls = [];
+    return true;
   };
 
   WebPage.prototype.content = function() {
@@ -252,7 +267,8 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.clearErrors = function() {
-    return this.errors = [];
+    this.errors = [];
+    return true;
   };
 
   WebPage.prototype.responseHeaders = function() {
@@ -323,13 +339,12 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.addTempHeader = function(header) {
-    var name, results, value;
-    results = [];
+    var name, value;
     for (name in header) {
       value = header[name];
-      results.push(this._tempHeaders[name] = value);
+      this._tempHeaders[name] = value;
     }
-    return results;
+    return this._tempHeaders;
   };
 
   WebPage.prototype.removeTempHeaders = function() {
@@ -455,7 +470,7 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.bindCallback = function(name) {
     var that;
     that = this;
-    return this["native"]()[name] = function() {
+    this["native"]()[name] = function() {
       var result;
       if (that[name + 'Native'] != null) {
         result = that[name + 'Native'].apply(that, arguments);
@@ -464,6 +479,7 @@ Poltergeist.WebPage = (function() {
         return that[name].apply(that, arguments);
       }
     };
+    return true;
   };
 
   WebPage.prototype.runCommand = function(name, args) {

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

@@ -38,6 +38,8 @@ class Poltergeist
     if @running
       @connection.send(data)
       @running = false
+      return true
+    return false
 
 # This is necessary because the remote debugger will wrap the
 # script in a function, causing the Poltergeist variable to

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

@@ -31,11 +31,8 @@ class Poltergeist.Node
 
   mouseEvent: (name) ->
     this.scrollIntoView()
-
     pos = this.mouseEventPosition()
-
     test = this.mouseEventTest(pos.x, pos.y)
-
     if test.status == 'success'
       if name == 'rightclick'
         @page.mouseEvent('click', pos.x, pos.y, 'right')

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

@@ -1,7 +1,7 @@
 class Poltergeist.WebPage
-  @CALLBACKS = ['onConsoleMessage',
+  @CALLBACKS = ['onConsoleMessage','onError',
                 'onLoadFinished', 'onInitialized', 'onLoadStarted',
-                'onResourceRequested', 'onResourceReceived', 'onError',
+                'onResourceRequested', 'onResourceReceived', 'onResourceError',
                 'onNavigationRequested', 'onUrlChanged', 'onPageCreated',
                 'onClosing']
 
@@ -75,6 +75,7 @@ class Poltergeist.WebPage
       stackString += " in #{frame.function}" if frame.function && frame.function != ''
 
     @errors.push(message: message, stack: stackString)
+    return true
 
   onResourceRequestedNative: (request, net) ->
     abort = @urlBlacklist.some (blacklisted_url) ->
@@ -93,7 +94,9 @@ class Poltergeist.WebPage
       @_networkTraffic[request.id] = {
         request:       request,
         responseParts: []
+        error: null
       }
+    return true
 
   onResourceReceivedNative: (response) ->
     @_networkTraffic[response.id]?.responseParts.push(response)
@@ -104,12 +107,19 @@ class Poltergeist.WebPage
       else
         @statusCode = response.status
         @_responseHeaders = response.headers
+    return true
+
+  onResourceErrorNative: (errorResponse) ->
+    @_networkTraffic[errorResponse.id]?.error = errorResponse
+    return true
 
   injectAgent: ->
     if this.native().evaluate(-> typeof __poltergeist) == "undefined"
       this.native().injectJs "#{phantom.libraryPath}/agent.js"
       for extension in WebPage.EXTENSIONS
         this.native().injectJs extension
+      return true
+    return false
 
   injectExtension: (file) ->
     WebPage.EXTENSIONS.push file
@@ -145,18 +155,21 @@ class Poltergeist.WebPage
   setHttpAuth: (user, password) ->
     this.native().settings.userName = user
     this.native().settings.password = password
+    return true
 
   networkTraffic: ->
     @_networkTraffic
 
   clearNetworkTraffic: ->
     @_networkTraffic = {}
+    return true
 
   blockedUrls: ->
     @_blockedUrls
 
   clearBlockedUrls: ->
     @_blockedUrls = []
+    return true
 
   content: ->
     this.native().frameContent
@@ -171,6 +184,7 @@ class Poltergeist.WebPage
 
   clearErrors: ->
     @errors = []
+    return true
 
   responseHeaders: ->
     headers = {}
@@ -210,8 +224,9 @@ class Poltergeist.WebPage
 
   elementBounds: (selector) ->
     this.native().evaluate(
-      (selector) -> document.querySelector(selector).getBoundingClientRect(),
-      selector
+      (selector) ->
+        document.querySelector(selector).getBoundingClientRect()
+      , selector
     )
 
   setUserAgent: (userAgent) ->
@@ -226,6 +241,7 @@ class Poltergeist.WebPage
   addTempHeader: (header) ->
     for name, value of header
       @_tempHeaders[name] = value
+    @_tempHeaders
 
   removeTempHeaders: ->
     allHeaders = this.getCustomHeaders()
@@ -236,7 +252,7 @@ class Poltergeist.WebPage
   pushFrame: (name) ->
     if this.native().switchToFrame(name)
       @frames.push(name)
-      true
+      return true
     else
       frame_no = this.native().evaluate(
         (frame_name) ->
@@ -245,9 +261,9 @@ class Poltergeist.WebPage
         , name)
       if frame_no? and this.native().switchToFrame(frame_no)
         @frames.push(name)
-        true
+        return true
       else
-        false
+        return false
 
   popFrame: ->
     @frames.pop()
@@ -320,6 +336,7 @@ class Poltergeist.WebPage
 
       if result != false && that[name]? # For externally set callbacks
         that[name].apply(that, arguments)
+    return true
 
   # Any error raised here or inside the evaluate will get reported to
   # phantom.onError. If result is null, that means there was an error

data/lib/capybara/poltergeist/errors.rb

@@ -29,14 +29,15 @@ module Capybara
         response['name']
       end
 
-      def javascript_error
-        JSErrorItem.new(*response['args'])
+      def error_parameters
+        response['args'].join("\n")
       end
 
       def message
         "There was an error inside the PhantomJS portion of Poltergeist. " \
-          "This is probably a bug, so please report it. " \
-          "\n\n#{javascript_error}"
+          "If this is the error returned, and not the cause of a more detailed error response, " \
+          "this is probably a bug, so please report it. " \
+          "\n\n#{name}: #{error_parameters}"
       end
     end
 

data/lib/capybara/poltergeist/network_traffic.rb

@@ -2,5 +2,6 @@ module Capybara::Poltergeist
   module NetworkTraffic
     require 'capybara/poltergeist/network_traffic/request'
     require 'capybara/poltergeist/network_traffic/response'
+    require 'capybara/poltergeist/network_traffic/error'
   end
 end

data/lib/capybara/poltergeist/network_traffic/error.rb

@@ -0,0 +1,19 @@
+module Capybara::Poltergeist::NetworkTraffic
+  class Error
+    def initialize(data)
+      @data = data
+    end
+
+    def url
+      @data['url']
+    end
+
+    def code
+      @data['errorCode']
+    end
+
+    def description
+      @data['errorString']
+    end
+  end
+end

data/lib/capybara/poltergeist/network_traffic/request.rb

@@ -1,10 +1,11 @@
 module Capybara::Poltergeist::NetworkTraffic
   class Request
-    attr_reader :response_parts
+    attr_reader :response_parts, :error
 
-    def initialize(data, response_parts = [])
+    def initialize(data, response_parts = [], error = nil)
       @data           = data
       @response_parts = response_parts
+      @error = error
     end
 
     def url

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,7 @@ files:
 - 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
 - lib/capybara/poltergeist/network_traffic/response.rb
 - lib/capybara/poltergeist/node.rb