poltergeist 0.6.0 → 0.7.0

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

@@ -1,54 +1,37 @@
-var __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+var __slice = [].slice;
+
 Poltergeist.Node = (function() {
-  var name, _fn, _i, _len, _ref;
-  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest'];
+  var name, _fn, _i, _len, _ref,
+    _this = this;
+
+  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest', 'scrollIntoView', 'isDOMEqual'];
+
   function Node(page, id) {
     this.page = page;
     this.id = id;
   }
+
   Node.prototype.parent = function() {
     return new Poltergeist.Node(this.page, this.parentId());
   };
+
   _ref = Node.DELEGATES;
-  _fn = __bind(function(name) {
-    return this.prototype[name] = function() {
-      var arguments, _ref2;
-      _ref2 = arguments, arguments = 1 <= _ref2.length ? __slice.call(_ref2, 0) : [];
-      return this.page.nodeCall(this.id, name, arguments);
+  _fn = function(name) {
+    return Node.prototype[name] = function() {
+      var args;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return this.page.nodeCall(this.id, name, args);
     };
-  }, Node);
+  };
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     name = _ref[_i];
     _fn(name);
   }
-  Node.prototype.clickPosition = function(scrollIntoView) {
-    var adjust, dimensions, document, middle, pos, scroll, viewport;
-    if (scrollIntoView == null) {
-      scrollIntoView = true;
-    }
-    dimensions = this.page.validatedDimensions();
-    document = dimensions.document;
-    viewport = dimensions.viewport;
+
+  Node.prototype.clickPosition = function() {
+    var middle, pos, viewport;
+    viewport = this.page.viewportSize();
     pos = this.position();
-    scroll = {
-      left: dimensions.left,
-      top: dimensions.top
-    };
-    adjust = function(coord, measurement) {
-      if (pos[coord] < 0) {
-        return scroll[coord] = Math.max(0, scroll[coord] + pos[coord] - (viewport[measurement] / 2));
-      } else if (pos[coord] >= viewport[measurement]) {
-        return scroll[coord] = Math.min(document[measurement] - viewport[measurement], scroll[coord] + pos[coord] - viewport[measurement] + (viewport[measurement] / 2));
-      }
-    };
-    if (scrollIntoView) {
-      adjust('left', 'width');
-      adjust('top', 'height');
-      if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
-        this.page.setScrollPosition(scroll);
-        pos = this.position();
-      }
-    }
     middle = function(start, end, size) {
       return start + ((Math.min(end, size) - start) / 2);
     };
@@ -57,23 +40,33 @@ Poltergeist.Node = (function() {
       y: middle(pos.top, pos.bottom, viewport.height)
     };
   };
+
   Node.prototype.click = function() {
     var pos, test;
+    this.scrollIntoView();
     pos = this.clickPosition();
     test = this.clickTest(pos.x, pos.y);
     if (test.status === 'success') {
       return this.page.sendEvent('click', pos.x, pos.y);
     } else {
-      return new Poltergeist.ClickFailed(test.selector, pos);
+      throw new Poltergeist.ClickFailed(test.selector, pos);
     }
   };
+
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
+    this.scrollIntoView();
     position = this.clickPosition();
-    otherPosition = other.clickPosition(false);
+    otherPosition = other.clickPosition();
     this.page.sendEvent('mousedown', position.x, position.y);
     this.page.sendEvent('mousemove', otherPosition.x, otherPosition.y);
     return this.page.sendEvent('mouseup', otherPosition.x, otherPosition.y);
   };
+
+  Node.prototype.isEqual = function(other) {
+    return this.page === other.page && this.isDOMEqual(other.id);
+  };
+
   return Node;
-}).call(this);
+
+}).call(this);

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

@@ -1,17 +1,24 @@
-var __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+var __slice = [].slice;
+
 Poltergeist.WebPage = (function() {
-  var command, delegate, _fn, _fn2, _i, _j, _len, _len2, _ref, _ref2;
-  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError'];
+  var command, delegate, _fn, _fn1, _i, _j, _len, _len1, _ref, _ref1,
+    _this = this;
+
+  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged'];
+
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render'];
+
   WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'pushFrame', 'popFrame', 'documentSize'];
-  function WebPage() {
+
+  function WebPage(width, height) {
     var callback, _i, _len, _ref;
     this["native"] = require('webpage').create();
     this._source = "";
     this._errors = [];
+    this._networkTraffic = {};
     this.setViewportSize({
-      width: 1024,
-      height: 768
+      width: width,
+      height: height
     });
     _ref = WebPage.CALLBACKS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -20,28 +27,31 @@ Poltergeist.WebPage = (function() {
     }
     this.injectAgent();
   }
+
   _ref = WebPage.COMMANDS;
-  _fn = __bind(function(command) {
-    return this.prototype[command] = function() {
-      var arguments, _ref2;
-      _ref2 = arguments, arguments = 1 <= _ref2.length ? __slice.call(_ref2, 0) : [];
-      return this.runCommand(command, arguments);
+  _fn = function(command) {
+    return WebPage.prototype[command] = function() {
+      var args;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return this.runCommand(command, args);
     };
-  }, WebPage);
+  };
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     command = _ref[_i];
     _fn(command);
   }
-  _ref2 = WebPage.DELEGATES;
-  _fn2 = __bind(function(delegate) {
-    return this.prototype[delegate] = function() {
+
+  _ref1 = WebPage.DELEGATES;
+  _fn1 = function(delegate) {
+    return WebPage.prototype[delegate] = function() {
       return this["native"][delegate].apply(this["native"], arguments);
     };
-  }, WebPage);
-  for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
-    delegate = _ref2[_j];
-    _fn2(delegate);
+  };
+  for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+    delegate = _ref1[_j];
+    _fn1(delegate);
   }
+
   WebPage.prototype.onInitializedNative = function() {
     this._source = null;
     this.injectAgent();
@@ -50,64 +60,118 @@ Poltergeist.WebPage = (function() {
       top: 0
     });
   };
+
   WebPage.prototype.injectAgent = function() {
-    if (this.evaluate(function() {
+    if (this["native"].evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
       this["native"].injectJs("" + phantom.libraryPath + "/agent.js");
       return this.nodes = {};
     }
   };
+
   WebPage.prototype.onConsoleMessageNative = function(message) {
     if (message === '__DOMContentLoaded') {
       this._source = this["native"].content;
       return false;
     }
   };
+
+  WebPage.prototype.onLoadStartedNative = function() {
+    return this.requestId = this.lastRequestId;
+  };
+
   WebPage.prototype.onLoadFinishedNative = function() {
     return this._source || (this._source = this["native"].content);
   };
-  WebPage.prototype.onConsoleMessage = function(message, line, file) {
-    if (!(this._errors.length && this._errors[this._errors.length - 1].message === message)) {
-      return console.log(message);
-    }
+
+  WebPage.prototype.onConsoleMessage = function(message) {
+    return console.log(message);
   };
+
   WebPage.prototype.onErrorNative = function(message, stack) {
+    var stackString;
+    stackString = message;
+    stack.forEach(function(frame) {
+      stackString += "\n";
+      stackString += "    at " + frame.file + ":" + frame.line;
+      if (frame["function"] && frame["function"] !== '') {
+        return stackString += " in " + frame["function"];
+      }
+    });
     return this._errors.push({
       message: message,
-      stack: stack
+      stack: stackString
     });
   };
+
+  WebPage.prototype.onResourceRequestedNative = function(request) {
+    this.lastRequestId = request.id;
+    return this._networkTraffic[request.id] = {
+      request: request,
+      responseParts: []
+    };
+  };
+
+  WebPage.prototype.onResourceReceivedNative = function(response) {
+    this._networkTraffic[response.id].responseParts.push(response);
+    if (this.requestId === response.id) {
+      if (response.redirectURL) {
+        return this.requestId = response.id;
+      } else {
+        return this._statusCode = response.status;
+      }
+    }
+  };
+
+  WebPage.prototype.networkTraffic = function() {
+    return this._networkTraffic;
+  };
+
   WebPage.prototype.content = function() {
     return this["native"].content;
   };
+
   WebPage.prototype.source = function() {
     return this._source;
   };
+
   WebPage.prototype.errors = function() {
     return this._errors;
   };
+
   WebPage.prototype.clearErrors = function() {
     return this._errors = [];
   };
+
+  WebPage.prototype.statusCode = function() {
+    return this._statusCode;
+  };
+
   WebPage.prototype.viewportSize = function() {
     return this["native"].viewportSize;
   };
+
   WebPage.prototype.setViewportSize = function(size) {
     return this["native"].viewportSize = size;
   };
+
   WebPage.prototype.scrollPosition = function() {
     return this["native"].scrollPosition;
   };
+
   WebPage.prototype.setScrollPosition = function(pos) {
     return this["native"].scrollPosition = pos;
   };
+
   WebPage.prototype.clipRect = function() {
     return this["native"].clipRect;
   };
+
   WebPage.prototype.setClipRect = function(rect) {
     return this["native"].clipRect = rect;
   };
+
   WebPage.prototype.dimensions = function() {
     var scroll, viewport;
     scroll = this.scrollPosition();
@@ -121,12 +185,11 @@ Poltergeist.WebPage = (function() {
       document: this.documentSize()
     };
   };
+
   WebPage.prototype.validatedDimensions = function() {
-    var dimensions, document, orig_left, orig_top;
+    var dimensions, document;
     dimensions = this.dimensions();
     document = dimensions.document;
-    orig_left = dimensions.left;
-    orig_top = dimensions.top;
     if (dimensions.right > document.width) {
       dimensions.left = Math.max(0, dimensions.left - (dimensions.right - document.width));
       dimensions.right = document.width;
@@ -135,28 +198,30 @@ Poltergeist.WebPage = (function() {
       dimensions.top = Math.max(0, dimensions.top - (dimensions.bottom - document.height));
       dimensions.bottom = document.height;
     }
-    if (dimensions.left !== orig_left || dimensions.top !== orig_top) {
-      this.setScrollPosition({
-        left: dimensions.left,
-        top: dimensions.top
-      });
-    }
+    this.setScrollPosition({
+      left: dimensions.left,
+      top: dimensions.top
+    });
     return dimensions;
   };
+
   WebPage.prototype.get = function(id) {
     var _base;
     return (_base = this.nodes)[id] || (_base[id] = new Poltergeist.Node(this, id));
   };
+
   WebPage.prototype.evaluate = function() {
     var args, fn;
     fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
-    return JSON.parse(this["native"].evaluate("function() { return JSON.stringify(" + (this.stringifyCall(fn, args)) + ") }"));
+    return JSON.parse(this["native"].evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }"));
   };
+
   WebPage.prototype.execute = function() {
     var args, fn;
     fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
     return this["native"].evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
   };
+
   WebPage.prototype.stringifyCall = function(fn, args) {
     if (args.length === 0) {
       return "(" + (fn.toString()) + ")()";
@@ -164,6 +229,7 @@ Poltergeist.WebPage = (function() {
       return "(" + (fn.toString()) + ").apply(this, JSON.parse(" + (JSON.stringify(JSON.stringify(args))) + "))";
     }
   };
+
   WebPage.prototype.bindCallback = function(name) {
     var that;
     that = this;
@@ -177,12 +243,23 @@ Poltergeist.WebPage = (function() {
       }
     };
   };
-  WebPage.prototype.runCommand = function(name, arguments) {
+
+  WebPage.prototype.runCommand = function(name, args) {
     var result;
-    result = this.evaluate(function(name, arguments) {
-      return __poltergeist.externalCall(name, arguments);
-    }, name, arguments);
-    return result && result.value;
+    result = this.evaluate(function(name, args) {
+      return __poltergeist.externalCall(name, args);
+    }, name, args);
+    if (result.error != null) {
+      if (result.error.message === 'PoltergeistAgent.ObsoleteNode') {
+        throw new Poltergeist.ObsoleteNode;
+      } else {
+        throw new Poltergeist.JavascriptError([result.error]);
+      }
+    } else {
+      return result.value;
+    }
   };
+
   return WebPage;
-}).call(this);
+
+}).call(this);

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

@@ -1,6 +1,6 @@
 class Poltergeist
-  constructor: (port) ->
-    @browser    = new Poltergeist.Browser(this)
+  constructor: (port, width, height) ->
+    @browser    = new Poltergeist.Browser(this, width, height)
     @connection = new Poltergeist.Connection(this, port)
 
     # The QtWebKit bridge doesn't seem to like Function.prototype.bind
@@ -11,7 +11,14 @@ class Poltergeist
 
   runCommand: (command) ->
     @running = true
-    @browser[command.name].apply(@browser, command.args)
+
+    try
+      @browser[command.name].apply(@browser, command.args)
+    catch error
+      if error instanceof Poltergeist.Error
+        this.sendError(error)
+      else
+        this.sendError(new Poltergeist.BrowserError(error.toString(), error.stack))
 
   sendResponse: (response) ->
     this.send(response: response)
@@ -23,25 +30,6 @@ class Poltergeist
         args: error.args && error.args() || [error.toString()]
     )
 
-  # This is a bit of a mess. We can't wrap the runCommand code in
-  # a try ... catch, because that will prevent stack traces being
-  # reported, and there is no error.stack property.
-  #
-  # And thrown errors get toString() called, which becomes the
-  # value of the message variable here. So we can basically only
-  # use strings as exceptions at the moment, which means we throw
-  # exceptions with extra data and then retrieve it here.
-  #
-  # The solution will be for PhantomJS to support an e.stack
-  # property on exceptions.
-  #
-  # See http://code.google.com/p/phantomjs/issues/detail?id=166.
-  onError: (message, stack) =>
-    if message == 'PoltergeistAgent.ObsoleteNode'
-      this.sendError(new Poltergeist.ObsoleteNode)
-    else
-      this.sendError(new Poltergeist.BrowserError(message, stack))
-
   send: (data) ->
     # Prevents more than one response being sent for a single
     # command. This can happen in some scenarios where an error
@@ -84,4 +72,4 @@ phantom.injectJs("#{phantom.libraryPath}/node.js")
 phantom.injectJs("#{phantom.libraryPath}/connection.js")
 phantom.injectJs("#{phantom.libraryPath}/browser.js")
 
-new Poltergeist(phantom.args[0])
+new Poltergeist(phantom.args[0], phantom.args[1], phantom.args[2])