poltergeist 1.7.0 → 1.8.0

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

@@ -0,0 +1,31 @@
+Poltergeist.Cmd = (function() {
+  function Cmd(owner, id, name, args) {
+    this.owner = owner;
+    this.id = id;
+    this.name = name;
+    this.args = args;
+  }
+
+  Cmd.prototype.sendResponse = function(response) {
+    var errors;
+    errors = this.browser.currentPage.errors;
+    this.browser.currentPage.clearErrors();
+    if (errors.length > 0 && this.browser.js_errors) {
+      return this.sendError(new Poltergeist.JavascriptError(errors));
+    } else {
+      return this.owner.sendResponse(this.id, response);
+    }
+  };
+
+  Cmd.prototype.sendError = function(errors) {
+    return this.owner.sendError(this.id, errors);
+  };
+
+  Cmd.prototype.run = function(browser) {
+    this.browser = browser;
+    return this.browser.runCommand(this);
+  };
+
+  return Cmd;
+
+})();

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

@@ -1,10 +1,10 @@
-var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
 Poltergeist.Connection = (function() {
   function Connection(owner, port) {
     this.owner = owner;
     this.port = port;
-    this.commandReceived = __bind(this.commandReceived, this);
+    this.commandReceived = bind(this.commandReceived, this);
     this.socket = new WebSocket("ws://127.0.0.1:" + this.port + "/");
     this.socket.onmessage = this.commandReceived;
     this.socket.onclose = function() {

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

@@ -1,11 +1,11 @@
-var Poltergeist, system, _ref, _ref1, _ref2,
-  __hasProp = {}.hasOwnProperty,
-  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+var Poltergeist, system,
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
 
 Poltergeist = (function() {
   function Poltergeist(port, width, height) {
     var that;
-    this.browser = new Poltergeist.Browser(this, width, height);
+    this.browser = new Poltergeist.Browser(width, height);
     this.connection = new Poltergeist.Connection(this, port);
     that = this;
     phantom.onError = function(message, stack) {
@@ -15,28 +15,31 @@ Poltergeist = (function() {
   }
 
   Poltergeist.prototype.runCommand = function(command) {
-    var error;
+    var error, error1;
     this.running = true;
+    command = new Poltergeist.Cmd(this, command.id, command.name, command.args);
     try {
-      return this.browser.runCommand(command.name, command.args);
-    } catch (_error) {
-      error = _error;
+      return command.run(this.browser);
+    } catch (error1) {
+      error = error1;
       if (error instanceof Poltergeist.Error) {
-        return this.sendError(error);
+        return this.sendError(command.id, error);
       } else {
-        return this.sendError(new Poltergeist.BrowserError(error.toString(), error.stack));
+        return this.sendError(command.id, new Poltergeist.BrowserError(error.toString(), error.stack));
       }
     }
   };
 
-  Poltergeist.prototype.sendResponse = function(response) {
+  Poltergeist.prototype.sendResponse = function(command_id, response) {
     return this.send({
+      command_id: command_id,
       response: response
     });
   };
 
-  Poltergeist.prototype.sendError = function(error) {
+  Poltergeist.prototype.sendError = function(command_id, error) {
     return this.send({
+      command_id: command_id,
       error: {
         name: error.name || 'Generic',
         args: error.args && error.args() || [error.toString()]
@@ -64,12 +67,11 @@ Poltergeist.Error = (function() {
 
 })();
 
-Poltergeist.ObsoleteNode = (function(_super) {
-  __extends(ObsoleteNode, _super);
+Poltergeist.ObsoleteNode = (function(superClass) {
+  extend(ObsoleteNode, superClass);
 
   function ObsoleteNode() {
-    _ref = ObsoleteNode.__super__.constructor.apply(this, arguments);
-    return _ref;
+    return ObsoleteNode.__super__.constructor.apply(this, arguments);
   }
 
   ObsoleteNode.prototype.name = "Poltergeist.ObsoleteNode";
@@ -86,8 +88,8 @@ Poltergeist.ObsoleteNode = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.InvalidSelector = (function(_super) {
-  __extends(InvalidSelector, _super);
+Poltergeist.InvalidSelector = (function(superClass) {
+  extend(InvalidSelector, superClass);
 
   function InvalidSelector(method, selector) {
     this.method = method;
@@ -104,8 +106,8 @@ Poltergeist.InvalidSelector = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.FrameNotFound = (function(_super) {
-  __extends(FrameNotFound, _super);
+Poltergeist.FrameNotFound = (function(superClass) {
+  extend(FrameNotFound, superClass);
 
   function FrameNotFound(frameName) {
     this.frameName = frameName;
@@ -121,8 +123,8 @@ Poltergeist.FrameNotFound = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.MouseEventFailed = (function(_super) {
-  __extends(MouseEventFailed, _super);
+Poltergeist.MouseEventFailed = (function(superClass) {
+  extend(MouseEventFailed, superClass);
 
   function MouseEventFailed(eventName, selector, position) {
     this.eventName = eventName;
@@ -140,8 +142,8 @@ Poltergeist.MouseEventFailed = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.JavascriptError = (function(_super) {
-  __extends(JavascriptError, _super);
+Poltergeist.JavascriptError = (function(superClass) {
+  extend(JavascriptError, superClass);
 
   function JavascriptError(errors) {
     this.errors = errors;
@@ -157,12 +159,12 @@ Poltergeist.JavascriptError = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.BrowserError = (function(_super) {
-  __extends(BrowserError, _super);
+Poltergeist.BrowserError = (function(superClass) {
+  extend(BrowserError, superClass);
 
-  function BrowserError(message, stack) {
-    this.message = message;
-    this.stack = stack;
+  function BrowserError(message1, stack1) {
+    this.message = message1;
+    this.stack = stack1;
   }
 
   BrowserError.prototype.name = "Poltergeist.BrowserError";
@@ -175,30 +177,28 @@ Poltergeist.BrowserError = (function(_super) {
 
 })(Poltergeist.Error);
 
-Poltergeist.StatusFailError = (function(_super) {
-  __extends(StatusFailError, _super);
+Poltergeist.StatusFailError = (function(superClass) {
+  extend(StatusFailError, superClass);
 
-  function StatusFailError() {
-    _ref1 = StatusFailError.__super__.constructor.apply(this, arguments);
-    return _ref1;
+  function StatusFailError(url) {
+    this.url = url;
   }
 
   StatusFailError.prototype.name = "Poltergeist.StatusFailError";
 
   StatusFailError.prototype.args = function() {
-    return [];
+    return [this.url];
   };
 
   return StatusFailError;
 
 })(Poltergeist.Error);
 
-Poltergeist.NoSuchWindowError = (function(_super) {
-  __extends(NoSuchWindowError, _super);
+Poltergeist.NoSuchWindowError = (function(superClass) {
+  extend(NoSuchWindowError, superClass);
 
   function NoSuchWindowError() {
-    _ref2 = NoSuchWindowError.__super__.constructor.apply(this, arguments);
-    return _ref2;
+    return NoSuchWindowError.__super__.constructor.apply(this, arguments);
   }
 
   NoSuchWindowError.prototype.name = "Poltergeist.NoSuchWindowError";
@@ -211,13 +211,15 @@ Poltergeist.NoSuchWindowError = (function(_super) {
 
 })(Poltergeist.Error);
 
-phantom.injectJs("" + phantom.libraryPath + "/web_page.js");
+phantom.injectJs(phantom.libraryPath + "/web_page.js");
+
+phantom.injectJs(phantom.libraryPath + "/node.js");
 
-phantom.injectJs("" + phantom.libraryPath + "/node.js");
+phantom.injectJs(phantom.libraryPath + "/connection.js");
 
-phantom.injectJs("" + phantom.libraryPath + "/connection.js");
+phantom.injectJs(phantom.libraryPath + "/cmd.js");
 
-phantom.injectJs("" + phantom.libraryPath + "/browser.js");
+phantom.injectJs(phantom.libraryPath + "/browser.js");
 
 system = require('system');
 

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

@@ -1,10 +1,9 @@
-var __slice = [].slice;
+var slice = [].slice;
 
 Poltergeist.Node = (function() {
-  var name, _fn, _i, _len, _ref,
-    _this = this;
+  var fn, i, len, name, ref;
 
-  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'getAttributes', 'isVisible', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection', 'path'];
+  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'getAttributes', 'isVisible', 'isInViewport', 'position', 'trigger', 'parentId', 'parentIds', 'mouseEventTest', 'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'containsSelection', 'path', 'getProperty'];
 
   function Node(page, id) {
     this.page = page;
@@ -15,17 +14,17 @@ Poltergeist.Node = (function() {
     return new Poltergeist.Node(this.page, this.parentId());
   };
 
-  _ref = Node.DELEGATES;
-  _fn = function(name) {
+  ref = Node.DELEGATES;
+  fn = function(name) {
     return Node.prototype[name] = function() {
       var args;
-      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
       return this.page.nodeCall(this.id, name, args);
     };
   };
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    name = _ref[_i];
-    _fn(name);
+  for (i = 0, len = ref.length; i < len; i++) {
+    name = ref[i];
+    fn(name);
   }
 
   Node.prototype.mouseEventPosition = function() {
@@ -86,4 +85,4 @@ Poltergeist.Node = (function() {
 
   return Node;
 
-}).call(this);
+})();

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

@@ -1,9 +1,8 @@
-var __slice = [].slice,
-  __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 slice = [].slice,
+  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; };
 
 Poltergeist.WebPage = (function() {
-  var command, delegate, _fn, _fn1, _i, _j, _len, _len1, _ref, _ref1,
-    _this = this;
+  var command, delegate, fn1, fn2, i, j, len, len1, ref, ref1;
 
   WebPage.CALLBACKS = ['onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
 
@@ -14,7 +13,7 @@ Poltergeist.WebPage = (function() {
   WebPage.EXTENSIONS = [];
 
   function WebPage(_native) {
-    var callback, _i, _len, _ref;
+    var callback, i, len, ref;
     this._native = _native;
     this._native || (this._native = require('webpage').create());
     this.id = 0;
@@ -27,35 +26,35 @@ Poltergeist.WebPage = (function() {
     this._networkTraffic = {};
     this._tempHeaders = {};
     this._blockedUrls = [];
-    _ref = WebPage.CALLBACKS;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      callback = _ref[_i];
+    ref = WebPage.CALLBACKS;
+    for (i = 0, len = ref.length; i < len; i++) {
+      callback = ref[i];
       this.bindCallback(callback);
     }
   }
 
-  _ref = WebPage.COMMANDS;
-  _fn = function(command) {
+  ref = WebPage.COMMANDS;
+  fn1 = function(command) {
     return WebPage.prototype[command] = function() {
       var args;
-      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
       return this.runCommand(command, args);
     };
   };
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    command = _ref[_i];
-    _fn(command);
+  for (i = 0, len = ref.length; i < len; i++) {
+    command = ref[i];
+    fn1(command);
   }
 
-  _ref1 = WebPage.DELEGATES;
-  _fn1 = function(delegate) {
+  ref1 = WebPage.DELEGATES;
+  fn2 = function(delegate) {
     return WebPage.prototype[delegate] = function() {
       return this._native[delegate].apply(this._native, arguments);
     };
   };
-  for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-    delegate = _ref1[_j];
-    _fn1(delegate);
+  for (j = 0, len1 = ref1.length; j < len1; j++) {
+    delegate = ref1[j];
+    fn2(delegate);
   }
 
   WebPage.prototype.onInitializedNative = function() {
@@ -111,18 +110,18 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.onResourceRequestedNative = function(request, net) {
-    var abort, _ref2;
+    var abort, ref2;
     abort = this.urlBlacklist.some(function(blacklisted_url) {
       return request.url.indexOf(blacklisted_url) !== -1;
     });
     if (abort) {
-      if (_ref2 = request.url, __indexOf.call(this._blockedUrls, _ref2) < 0) {
+      if (ref2 = request.url, indexOf.call(this._blockedUrls, ref2) < 0) {
         this._blockedUrls.push(request.url);
       }
       return net.abort();
     } else {
       this.lastRequestId = request.id;
-      if (request.url === this.redirectURL) {
+      if (this.normalizeURL(request.url) === this.redirectURL) {
         this.redirectURL = null;
         this.requestId = request.id;
       }
@@ -134,13 +133,13 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
-    var _ref2;
-    if ((_ref2 = this._networkTraffic[response.id]) != null) {
-      _ref2.responseParts.push(response);
+    var ref2;
+    if ((ref2 = this._networkTraffic[response.id]) != null) {
+      ref2.responseParts.push(response);
     }
     if (this.requestId === response.id) {
       if (response.redirectURL) {
-        return this.redirectURL = response.redirectURL;
+        return this.redirectURL = this.normalizeURL(response.redirectURL);
       } else {
         this.statusCode = response.status;
         return this._responseHeaders = response.headers;
@@ -149,18 +148,18 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.injectAgent = function() {
-    var extension, _k, _len2, _ref2, _results;
+    var extension, k, len2, ref2, results;
     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(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));
       }
-      return _results;
+      return results;
     }
   };
 
@@ -195,20 +194,22 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.keyModifierKeys = function(names) {
-    var _this = this;
-    return names.split(',').map(function(name) {
-      return _this.keyCode(name.charAt(0).toUpperCase() + name.substring(1));
-    });
+    return names.split(',').map((function(_this) {
+      return function(name) {
+        return _this.keyCode(name.charAt(0).toUpperCase() + name.substring(1));
+      };
+    })(this));
   };
 
   WebPage.prototype.waitState = function(state, callback) {
-    var _this = this;
     if (this.state === state) {
       return callback.call();
     } else {
-      return setTimeout((function() {
-        return _this.waitState(state, callback);
-      }), 100);
+      return setTimeout(((function(_this) {
+        return function() {
+          return _this.waitState(state, callback);
+        };
+      })(this)), 100);
     }
   };
 
@@ -241,13 +242,13 @@ Poltergeist.WebPage = (function() {
     return this["native"]().frameTitle;
   };
 
-  WebPage.prototype.frameUrl = function(frameName) {
+  WebPage.prototype.frameUrl = function(frameNameOrId) {
     var query;
-    query = function(frameName) {
-      var _ref2;
-      return (_ref2 = document.querySelector("iframe[name='" + frameName + "']")) != null ? _ref2.src : void 0;
+    query = function(frameNameOrId) {
+      var ref2;
+      return (ref2 = document.querySelector("iframe[name='" + frameNameOrId + "'], iframe[id='" + frameNameOrId + "']")) != null ? ref2.src : void 0;
     };
-    return this.evaluate(query, frameName);
+    return this.evaluate(query, frameNameOrId);
   };
 
   WebPage.prototype.clearErrors = function() {
@@ -322,32 +323,53 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.addTempHeader = function(header) {
-    var name, value, _results;
-    _results = [];
+    var name, results, value;
+    results = [];
     for (name in header) {
       value = header[name];
-      _results.push(this._tempHeaders[name] = value);
+      results.push(this._tempHeaders[name] = value);
     }
-    return _results;
+    return results;
   };
 
   WebPage.prototype.removeTempHeaders = function() {
-    var allHeaders, name, value, _ref2;
+    var allHeaders, name, ref2, value;
     allHeaders = this.getCustomHeaders();
-    _ref2 = this._tempHeaders;
-    for (name in _ref2) {
-      value = _ref2[name];
+    ref2 = this._tempHeaders;
+    for (name in ref2) {
+      value = ref2[name];
       delete allHeaders[name];
     }
     return this.setCustomHeaders(allHeaders);
   };
 
   WebPage.prototype.pushFrame = function(name) {
+    var frame_no;
     if (this["native"]().switchToFrame(name)) {
       this.frames.push(name);
       return true;
     } else {
-      return false;
+      frame_no = this["native"]().evaluate(function(frame_name) {
+        var f, frames, idx;
+        frames = document.querySelectorAll("iframe, frame");
+        return ((function() {
+          var k, len2, results;
+          results = [];
+          for (idx = k = 0, len2 = frames.length; k < len2; idx = ++k) {
+            f = frames[idx];
+            if ((f != null ? f['name'] : void 0) === frame_name || (f != null ? f['id'] : void 0) === frame_name) {
+              results.push(idx);
+            }
+          }
+          return results;
+        })())[0];
+      }, name);
+      if ((frame_no != null) && this["native"]().switchToFrame(frame_no)) {
+        this.frames.push(name);
+        return true;
+      } else {
+        return false;
+      }
     }
   };
 
@@ -403,7 +425,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.evaluate = function() {
     var args, fn;
-    fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     this.injectAgent();
     return JSON.parse(this.sanitize(this["native"]().evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }")));
   };
@@ -418,7 +440,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.execute = function() {
     var args, fn;
-    fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     return this["native"]().evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
   };
 
@@ -426,7 +448,7 @@ Poltergeist.WebPage = (function() {
     if (args.length === 0) {
       return "(" + (fn.toString()) + ")()";
     } else {
-      return "(" + (fn.toString()) + ").apply(this, JSON.parse(" + (JSON.stringify(JSON.stringify(args))) + "))";
+      return "(" + (fn.toString()) + ").apply(this, PoltergeistAgent.JSON.parse(" + (JSON.stringify(JSON.stringify(args))) + "))";
     }
   };
 
@@ -476,6 +498,13 @@ Poltergeist.WebPage = (function() {
     return this["native"]().canGoForward;
   };
 
+  WebPage.prototype.normalizeURL = function(url) {
+    var parser;
+    parser = document.createElement('a');
+    parser.href = url;
+    return parser.href;
+  };
+
   return WebPage;
 
-}).call(this);
+})();