poltergeist 0.4.0 → 0.5.0

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

@@ -7,15 +7,28 @@ PoltergeistAgent = (function() {
     this.windows = [];
     this.pushWindow(window);
   }
+  PoltergeistAgent.prototype.externalCall = function(name, arguments) {
+    try {
+      return {
+        value: this[name].apply(this, arguments)
+      };
+    } catch (error) {
+      return {
+        error: error.toString()
+      };
+    }
+  };
   PoltergeistAgent.prototype.pushWindow = function(new_window) {
     this.windows.push(new_window);
     this.window = new_window;
-    return this.document = this.window.document;
+    this.document = this.window.document;
+    return null;
   };
   PoltergeistAgent.prototype.popWindow = function() {
     this.windows.pop();
     this.window = this.windows[this.windows.length - 1];
-    return this.document = this.window.document;
+    this.document = this.window.document;
+    return null;
   };
   PoltergeistAgent.prototype.pushFrame = function(id) {
     return this.pushWindow(this.document.getElementById(id).contentWindow);
@@ -26,10 +39,12 @@ PoltergeistAgent = (function() {
   PoltergeistAgent.prototype.currentUrl = function() {
     return window.location.toString();
   };
-  PoltergeistAgent.prototype.find = function(selector, id) {
-    var context, i, ids, results, _ref;
-    context = id != null ? this.elements[id] : this.document;
-    results = this.document.evaluate(selector, context, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+  PoltergeistAgent.prototype.find = function(selector, within) {
+    var i, ids, results, _ref;
+    if (within == null) {
+      within = this.document;
+    }
+    results = this.document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
     ids = [];
     for (i = 0, _ref = results.snapshotLength; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {
       ids.push(this.register(results.snapshotItem(i)));
@@ -53,10 +68,20 @@ PoltergeistAgent = (function() {
   PoltergeistAgent.prototype.nodeCall = function(id, name, arguments) {
     var node;
     node = this.get(id);
+    if (node.isObsolete()) {
+      throw new PoltergeistAgent.ObsoleteNode;
+    }
     return node[name].apply(node, arguments);
   };
   return PoltergeistAgent;
 })();
+PoltergeistAgent.ObsoleteNode = (function() {
+  function ObsoleteNode() {}
+  ObsoleteNode.prototype.toString = function() {
+    return "PoltergeistAgent.ObsoleteNode";
+  };
+  return ObsoleteNode;
+})();
 PoltergeistAgent.Node = (function() {
   Node.EVENTS = {
     FOCUS: ['blur', 'focus', 'focusin', 'focusout'],
@@ -69,6 +94,9 @@ PoltergeistAgent.Node = (function() {
   Node.prototype.parentId = function() {
     return this.agent.register(this.element.parentNode);
   };
+  Node.prototype.find = function(selector) {
+    return this.agent.find(selector, this.element);
+  };
   Node.prototype.isObsolete = function() {
     var obsolete;
     obsolete = __bind(function(element) {
@@ -178,10 +206,14 @@ PoltergeistAgent.Node = (function() {
   };
   Node.prototype.position = function() {
     var rect;
-    rect = this.element.getBoundingClientRect();
+    rect = this.element.getClientRects()[0];
     return {
       top: rect.top,
-      left: rect.left
+      right: rect.right,
+      left: rect.left,
+      bottom: rect.bottom,
+      width: rect.width,
+      height: rect.height
     };
   };
   Node.prototype.trigger = function(name) {
@@ -197,6 +229,37 @@ PoltergeistAgent.Node = (function() {
     }
     return this.element.dispatchEvent(event);
   };
+  Node.prototype.clickTest = function(x, y) {
+    var el, origEl;
+    el = origEl = document.elementFromPoint(x, y);
+    while (el) {
+      if (el === this.element) {
+        return {
+          status: 'success'
+        };
+      } else {
+        el = el.parentNode;
+      }
+    }
+    return {
+      status: 'failure',
+      selector: origEl && this.getSelector(origEl)
+    };
+  };
+  Node.prototype.getSelector = function(el) {
+    var className, selector, _i, _len, _ref;
+    selector = el.tagName !== 'HTML' ? this.getSelector(el.parentNode) + ' ' : '';
+    selector += el.tagName.toLowerCase();
+    if (el.id) {
+      selector += "#" + el.id;
+    }
+    _ref = el.classList;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      className = _ref[_i];
+      selector += "." + className;
+    }
+    return selector;
+  };
   return Node;
 })();
 window.__poltergeist = new PoltergeistAgent;

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

@@ -3,6 +3,7 @@ Poltergeist.Browser = (function() {
   function Browser(owner) {
     this.owner = owner;
     this.state = 'default';
+    this.page_id = 0;
     this.resetPage();
   }
   Browser.prototype.resetPage = function() {
@@ -15,45 +16,71 @@ Poltergeist.Browser = (function() {
         return this.state = 'loading';
       }
     }, this);
-    return this.page.onLoadFinished = __bind(function(status) {
+    this.page.onLoadFinished = __bind(function(status) {
       if (this.state === 'loading') {
-        this.owner.sendResponse(status);
+        this.sendResponse(status);
         return this.state = 'default';
       }
     }, this);
+    return this.page.onInitialized = __bind(function() {
+      return this.page_id += 1;
+    }, this);
+  };
+  Browser.prototype.sendResponse = function(response) {
+    var errors;
+    errors = this.page.errors();
+    if (errors.length > 0) {
+      this.page.clearErrors();
+      return this.owner.sendError(new Poltergeist.JavascriptError(errors));
+    } else {
+      return this.owner.sendResponse(response);
+    }
+  };
+  Browser.prototype.node = function(page_id, id) {
+    if (page_id === this.page_id) {
+      return this.page.get(id);
+    } else {
+      throw new Poltergeist.ObsoleteNode;
+    }
   };
   Browser.prototype.visit = function(url) {
     this.state = 'loading';
     return this.page.open(url);
   };
   Browser.prototype.current_url = function() {
-    return this.owner.sendResponse(this.page.currentUrl());
+    return this.sendResponse(this.page.currentUrl());
   };
   Browser.prototype.body = function() {
-    return this.owner.sendResponse(this.page.content());
+    return this.sendResponse(this.page.content());
   };
   Browser.prototype.source = function() {
-    return this.owner.sendResponse(this.page.source());
+    return this.sendResponse(this.page.source());
+  };
+  Browser.prototype.find = function(selector) {
+    return this.sendResponse({
+      page_id: this.page_id,
+      ids: this.page.find(selector)
+    });
   };
-  Browser.prototype.find = function(selector, id) {
-    return this.owner.sendResponse(this.page.find(selector, id));
+  Browser.prototype.find_within = function(page_id, id, selector) {
+    return this.sendResponse(this.node(page_id, id).find(selector));
   };
-  Browser.prototype.text = function(id) {
-    return this.owner.sendResponse(this.page.get(id).text());
+  Browser.prototype.text = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).text());
   };
-  Browser.prototype.attribute = function(id, name) {
-    return this.owner.sendResponse(this.page.get(id).getAttribute(name));
+  Browser.prototype.attribute = function(page_id, id, name) {
+    return this.sendResponse(this.node(page_id, id).getAttribute(name));
   };
-  Browser.prototype.value = function(id) {
-    return this.owner.sendResponse(this.page.get(id).value());
+  Browser.prototype.value = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).value());
   };
-  Browser.prototype.set = function(id, value) {
-    this.page.get(id).set(value);
-    return this.owner.sendResponse(true);
+  Browser.prototype.set = function(page_id, id, value) {
+    this.node(page_id, id).set(value);
+    return this.sendResponse(true);
   };
-  Browser.prototype.select_file = function(id, value) {
+  Browser.prototype.select_file = function(page_id, id, value) {
     var element, multiple;
-    element = this.page.get(id);
+    element = this.node(page_id, id);
     multiple = element.isMultiple();
     if (multiple) {
       element.removeAttribute('multiple');
@@ -64,53 +91,53 @@ Poltergeist.Browser = (function() {
     if (multiple) {
       element.setAttribute('multiple', 'multiple');
     }
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
-  Browser.prototype.select = function(id, value) {
-    return this.owner.sendResponse(this.page.get(id).select(value));
+  Browser.prototype.select = function(page_id, id, value) {
+    return this.sendResponse(this.node(page_id, id).select(value));
   };
-  Browser.prototype.tag_name = function(id) {
-    return this.owner.sendResponse(this.page.get(id).tagName());
+  Browser.prototype.tag_name = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).tagName());
   };
-  Browser.prototype.visible = function(id) {
-    return this.owner.sendResponse(this.page.get(id).isVisible());
+  Browser.prototype.visible = function(page_id, id) {
+    return this.sendResponse(this.node(page_id, id).isVisible());
   };
   Browser.prototype.evaluate = function(script) {
-    return this.owner.sendResponse(JSON.parse(this.page.evaluate("function() { return JSON.stringify(" + script + ") }")));
+    return this.sendResponse(JSON.parse(this.page.evaluate("function() { return JSON.stringify(" + script + ") }")));
   };
   Browser.prototype.execute = function(script) {
     this.page.execute("function() { " + script + " }");
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
   Browser.prototype.push_frame = function(id) {
     this.page.pushFrame(id);
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
   Browser.prototype.pop_frame = function() {
     this.page.popFrame();
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
-  Browser.prototype.click = function(id) {
+  Browser.prototype.click = function(page_id, id) {
     this.state = 'clicked';
-    this.page.get(id).click();
+    this.node(page_id, id).click();
     return setTimeout(__bind(function() {
       if (this.state === 'clicked') {
         this.state = 'default';
-        return this.owner.sendResponse(true);
+        return this.sendResponse(true);
       }
     }, this), 10);
   };
-  Browser.prototype.drag = function(id, other_id) {
-    this.page.get(id).dragTo(this.page.get(other_id));
-    return this.owner.sendResponse(true);
+  Browser.prototype.drag = function(page_id, id, other_id) {
+    this.node(page_id, id).dragTo(this.page.get(other_id));
+    return this.sendResponse(true);
   };
-  Browser.prototype.trigger = function(id, event) {
-    this.page.get(id).trigger(event);
-    return this.owner.sendResponse(event);
+  Browser.prototype.trigger = function(page_id, id, event) {
+    this.node(page_id, id).trigger(event);
+    return this.sendResponse(event);
   };
   Browser.prototype.reset = function() {
     this.resetPage();
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
   Browser.prototype.render = function(path, full) {
     var dimensions, document, viewport;
@@ -142,14 +169,14 @@ Poltergeist.Browser = (function() {
       });
       this.page.render(path);
     }
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
   Browser.prototype.resize = function(width, height) {
     this.page.setViewportSize({
       width: width,
       height: height
     });
-    return this.owner.sendResponse(true);
+    return this.sendResponse(true);
   };
   Browser.prototype.exit = function() {
     return phantom.exit();

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

@@ -8,9 +8,7 @@ Poltergeist = (function() {
     try {
       return this.browser[command.name].apply(this.browser, command.args);
     } catch (error) {
-      return this.connection.send({
-        error: error.toString()
-      });
+      return this.sendError(error);
     }
   };
   Poltergeist.prototype.sendResponse = function(response) {
@@ -18,15 +16,46 @@ Poltergeist = (function() {
       response: response
     });
   };
+  Poltergeist.prototype.sendError = function(error) {
+    return this.connection.send({
+      error: {
+        name: error.name || 'Generic',
+        args: error.args && error.args() || [error.toString()]
+      }
+    });
+  };
   return Poltergeist;
 })();
+window.Poltergeist = Poltergeist;
 Poltergeist.ObsoleteNode = (function() {
   function ObsoleteNode() {}
-  ObsoleteNode.prototype.toString = function() {
-    return "Poltergeist.ObsoleteNode";
+  ObsoleteNode.prototype.name = "Poltergeist.ObsoleteNode";
+  ObsoleteNode.prototype.args = function() {
+    return [];
   };
   return ObsoleteNode;
 })();
+Poltergeist.ClickFailed = (function() {
+  function ClickFailed(selector, position) {
+    this.selector = selector;
+    this.position = position;
+  }
+  ClickFailed.prototype.name = "Poltergeist.ClickFailed";
+  ClickFailed.prototype.args = function() {
+    return [this.selector, this.position];
+  };
+  return ClickFailed;
+})();
+Poltergeist.JavascriptError = (function() {
+  function JavascriptError(errors) {
+    this.errors = errors;
+  }
+  JavascriptError.prototype.name = "Poltergeist.JavascriptError";
+  JavascriptError.prototype.args = function() {
+    return [this.errors];
+  };
+  return JavascriptError;
+})();
 phantom.injectJs('web_page.js');
 phantom.injectJs('node.js');
 phantom.injectJs('connection.js');

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

@@ -1,7 +1,7 @@
 var __slice = Array.prototype.slice, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 Poltergeist.Node = (function() {
   var name, _fn, _i, _len, _ref;
-  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'isVisible', 'position', 'trigger', 'parentId'];
+  Node.DELEGATES = ['text', 'getAttribute', 'value', 'set', 'setAttribute', 'removeAttribute', 'isMultiple', 'select', 'tagName', 'find', 'isVisible', 'position', 'trigger', 'parentId', 'clickTest'];
   function Node(page, id) {
     this.page = page;
     this.id = id;
@@ -9,27 +9,23 @@ Poltergeist.Node = (function() {
   Node.prototype.parent = function() {
     return new Poltergeist.Node(this.page, this.parentId());
   };
-  Node.prototype.isObsolete = function() {
-    return this.page.nodeCall(this.id, 'isObsolete');
-  };
   _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) : [];
-      if (this.isObsolete()) {
-        throw new Poltergeist.ObsoleteNode;
-      } else {
-        return this.page.nodeCall(this.id, name, arguments);
-      }
+      return this.page.nodeCall(this.id, name, arguments);
     };
   }, Node);
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     name = _ref[_i];
     _fn(name);
   }
-  Node.prototype.scrollIntoView = function() {
-    var adjust, dimensions, document, pos, scroll, viewport;
+  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;
@@ -45,26 +41,39 @@ Poltergeist.Node = (function() {
         return scroll[coord] = Math.min(document[measurement] - viewport[measurement], scroll[coord] + pos[coord] - viewport[measurement] + (viewport[measurement] / 2));
       }
     };
-    adjust('left', 'width');
-    adjust('top', 'height');
-    if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
-      this.page.setScrollPosition(scroll);
-      pos = this.position();
+    if (scrollIntoView) {
+      adjust('left', 'width');
+      adjust('top', 'height');
+      if (scroll.left !== dimensions.left || scroll.top !== dimensions.top) {
+        this.page.setScrollPosition(scroll);
+        pos = this.position();
+      }
     }
-    return pos;
+    middle = function(start, end, size) {
+      return start + ((Math.min(end, size) - start) / 2);
+    };
+    return {
+      x: middle(pos.left, pos.right, viewport.width),
+      y: middle(pos.top, pos.bottom, viewport.height)
+    };
   };
   Node.prototype.click = function() {
-    var position;
-    position = this.scrollIntoView();
-    return this.page.sendEvent('click', position.left, position.top);
+    var pos, test;
+    pos = this.clickPosition();
+    test = this.clickTest(pos.x, pos.y);
+    if (test.status === 'success') {
+      return this.page.sendEvent('click', pos.x, pos.y);
+    } else {
+      throw new Poltergeist.ClickFailed(test.selector, pos);
+    }
   };
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
-    position = this.scrollIntoView();
-    otherPosition = other.position();
-    this.page.sendEvent('mousedown', position.left, position.top);
-    this.page.sendEvent('mousemove', otherPosition.left, otherPosition.top);
-    return this.page.sendEvent('mouseup', otherPosition.left, otherPosition.top);
+    position = this.clickPosition();
+    otherPosition = other.clickPosition(false);
+    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);
   };
   return Node;
 }).call(this);