poltergeist 1.0.3 → 1.1.0

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

@@ -5,6 +5,8 @@ class Poltergeist.Browser
     @state      = 'default'
     @page_stack = []
     @page_id    = 0
+    @js_errors  = true
+    @_debug     = false
 
     this.resetPage()
 
@@ -17,18 +19,18 @@ class Poltergeist.Browser
     @page.setViewportSize(width: @width, height: @height)
 
     @page.onLoadStarted = =>
-      @state = 'loading' if @state == 'clicked'
+      this.setState 'loading' if @state == 'clicked'
 
     @page.onNavigationRequested = (url, navigation) =>
-      @state = 'loading' if @state == 'clicked' && navigation == 'FormSubmitted'
+      this.setState 'loading' if @state == 'clicked' && navigation == 'FormSubmitted'
 
     @page.onLoadFinished = (status) =>
       if @state == 'loading'
         this.sendResponse(status: status, click: @last_click)
-        @state = 'default'
+        this.setState 'default'
       else if @state == 'awaiting_frame_load'
         this.sendResponse(true)
-        @state = 'default'
+        this.setState 'default'
 
     @page.onInitialized = =>
       @page_id += 1
@@ -36,23 +38,36 @@ class Poltergeist.Browser
     @page.onPageCreated = (sub_page) =>
       if @state == 'awaiting_sub_page'
         name       = @page_name
-        @state     = 'default'
         @page_name = null
 
+        this.setState 'default'
+
         # At this point subpage isn't fully initialized, so we can't check
         # its name. Instead, we just schedule another attempt to push the
         # window.
         setTimeout((=> this.push_window(name)), 0)
 
+  debug: (message) ->
+    if @_debug
+      console.log "poltergeist [#{new Date().getTime()}] #{message}"
+
+  setState: (state) ->
+    this.debug "state #{@state} -> #{state}"
+    @state = state
+
   sendResponse: (response) ->
     errors = @page.errors()
+    @page.clearErrors()
 
-    if errors.length > 0
-      @page.clearErrors()
+    if errors.length > 0 && @js_errors
       @owner.sendError(new Poltergeist.JavascriptError(errors))
     else
       @owner.sendResponse(response)
 
+  add_extension: (extension) ->
+    @page.injectExtension extension
+    this.sendResponse 'success'
+
   node: (page_id, id) ->
     if page_id == @page_id
       @page.get(id)
@@ -60,14 +75,15 @@ class Poltergeist.Browser
       throw new Poltergeist.ObsoleteNode
 
   visit: (url) ->
-    @state   = 'loading'
+    this.setState 'loading'
+
     prev_url = @page.currentUrl()
 
     @page.open(url)
 
     if /#/.test(url) && prev_url.split('#')[0] == url.split('#')[0]
       # hashchange occurred, so there will be no onLoadFinished
-      @state = 'default'
+      this.setState 'default'
       this.sendResponse 'success'
 
   current_url: ->
@@ -105,11 +121,11 @@ class Poltergeist.Browser
   # so we have to add an attribute to the element to identify it, then remove it
   # afterwards.
   select_file: (page_id, id, value) ->
-    node     = this.node(page_id, id)
+    node = this.node(page_id, id)
 
-    node.setAttribute('_poltergeist_selected', '')
+    @page.beforeUpload(node.id)
     @page.uploadFile('[_poltergeist_selected]', value)
-    node.removeAttribute('_poltergeist_selected')
+    @page.afterUpload(node.id)
 
     this.sendResponse(true)
 
@@ -132,7 +148,7 @@ class Poltergeist.Browser
   push_frame: (name) ->
     if @page.pushFrame(name)
       if @page.currentUrl() == 'about:blank'
-        @state = 'awaiting_frame_load'
+        this.setState 'awaiting_frame_load'
       else
         this.sendResponse(true)
     else
@@ -158,29 +174,36 @@ class Poltergeist.Browser
         this.sendResponse(true)
     else
       @page_name = name
-      @state     = 'awaiting_sub_page'
+      this.setState 'awaiting_sub_page'
 
   pop_window: ->
     prev_page = @page_stack.pop()
     @page = prev_page if prev_page
     this.sendResponse(true)
 
-  click: (page_id, id) ->
+  click: (page_id, id, event = 'click') ->
     # Get the node before changing state, in case there is an exception
     node = this.node(page_id, id)
 
     # If the click event triggers onNavigationRequested, we will transition to the 'loading'
     # state and wait for onLoadFinished before sending a response.
-    @state = 'clicked'
+    this.setState 'clicked'
 
-    @last_click = node.click()
+    @last_click = node.click(event)
 
     setTimeout =>
       if @state != 'loading'
-        @state = 'default'
+        this.setState 'default'
         this.sendResponse(@last_click)
     , 5
 
+  double_click: (page_id, id) ->
+    this.click page_id, id, 'doubleclick'
+
+  click_coordinates: (x, y) ->
+    @page.sendEvent('click', x, y)
+    this.sendResponse({ click: { x: x, y: y } })
+
   drag: (page_id, id, other_id) ->
     this.node(page_id, id).dragTo this.node(page_id, other_id)
     this.sendResponse(true)
@@ -241,6 +264,14 @@ class Poltergeist.Browser
     @page.deleteCookie(name)
     this.sendResponse(true)
 
+  set_js_errors: (value) ->
+    @js_errors = value
+    this.sendResponse(true)
+
+  set_debug: (value) ->
+    @_debug = value
+    this.sendResponse(true)
+
   exit: ->
     phantom.exit()
 

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

@@ -83,6 +83,14 @@ PoltergeistAgent = (function() {
     return node[name].apply(node, args);
   };
 
+  PoltergeistAgent.prototype.beforeUpload = function(id) {
+    return this.get(id).setAttribute('_poltergeist_selected', '');
+  };
+
+  PoltergeistAgent.prototype.afterUpload = function(id) {
+    return this.get(id).removeAttribute('_poltergeist_selected');
+  };
+
   return PoltergeistAgent;
 
 })();
@@ -223,20 +231,38 @@ PoltergeistAgent.Node = (function() {
     }
   };
 
+  Node.prototype.frameOffset = function() {
+    var offset, rect, win;
+    win = window;
+    offset = {
+      top: 0,
+      left: 0
+    };
+    while (win.frameElement) {
+      rect = window.frameElement.getClientRects()[0];
+      win = win.parent;
+      offset.top += rect.top;
+      offset.left += rect.left;
+    }
+    return offset;
+  };
+
   Node.prototype.position = function() {
-    var rect;
+    var frameOffset, pos, rect;
     rect = this.element.getClientRects()[0];
     if (!rect) {
       throw new PoltergeistAgent.ObsoleteNode;
     }
-    return {
-      top: rect.top,
-      right: rect.right,
-      left: rect.left,
-      bottom: rect.bottom,
+    frameOffset = this.frameOffset();
+    pos = {
+      top: rect.top + frameOffset.top,
+      right: rect.right + frameOffset.left,
+      left: rect.left + frameOffset.left,
+      bottom: rect.bottom + frameOffset.top,
       width: rect.width,
       height: rect.height
     };
+    return pos;
   };
 
   Node.prototype.trigger = function(name) {
@@ -263,7 +289,10 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.clickTest = function(x, y) {
-    var el, origEl;
+    var el, frameOffset, origEl;
+    frameOffset = this.frameOffset();
+    x -= frameOffset.left;
+    y -= frameOffset.top;
     el = origEl = document.elementFromPoint(x, y);
     while (el) {
       if (el === this.element) {

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

@@ -8,6 +8,8 @@ Poltergeist.Browser = (function() {
     this.state = 'default';
     this.page_stack = [];
     this.page_id = 0;
+    this.js_errors = true;
+    this._debug = false;
     this.resetPage();
   }
 
@@ -24,12 +26,12 @@ Poltergeist.Browser = (function() {
     });
     this.page.onLoadStarted = function() {
       if (_this.state === 'clicked') {
-        return _this.state = 'loading';
+        return _this.setState('loading');
       }
     };
     this.page.onNavigationRequested = function(url, navigation) {
       if (_this.state === 'clicked' && navigation === 'FormSubmitted') {
-        return _this.state = 'loading';
+        return _this.setState('loading');
       }
     };
     this.page.onLoadFinished = function(status) {
@@ -38,10 +40,10 @@ Poltergeist.Browser = (function() {
           status: status,
           click: _this.last_click
         });
-        return _this.state = 'default';
+        return _this.setState('default');
       } else if (_this.state === 'awaiting_frame_load') {
         _this.sendResponse(true);
-        return _this.state = 'default';
+        return _this.setState('default');
       }
     };
     this.page.onInitialized = function() {
@@ -51,8 +53,8 @@ Poltergeist.Browser = (function() {
       var name;
       if (_this.state === 'awaiting_sub_page') {
         name = _this.page_name;
-        _this.state = 'default';
         _this.page_name = null;
+        _this.setState('default');
         return setTimeout((function() {
           return _this.push_window(name);
         }), 0);
@@ -60,17 +62,33 @@ Poltergeist.Browser = (function() {
     };
   };
 
+  Browser.prototype.debug = function(message) {
+    if (this._debug) {
+      return console.log("poltergeist [" + (new Date().getTime()) + "] " + message);
+    }
+  };
+
+  Browser.prototype.setState = function(state) {
+    this.debug("state " + this.state + " -> " + state);
+    return this.state = state;
+  };
+
   Browser.prototype.sendResponse = function(response) {
     var errors;
     errors = this.page.errors();
-    if (errors.length > 0) {
-      this.page.clearErrors();
+    this.page.clearErrors();
+    if (errors.length > 0 && this.js_errors) {
       return this.owner.sendError(new Poltergeist.JavascriptError(errors));
     } else {
       return this.owner.sendResponse(response);
     }
   };
 
+  Browser.prototype.add_extension = function(extension) {
+    this.page.injectExtension(extension);
+    return this.sendResponse('success');
+  };
+
   Browser.prototype.node = function(page_id, id) {
     if (page_id === this.page_id) {
       return this.page.get(id);
@@ -81,11 +99,11 @@ Poltergeist.Browser = (function() {
 
   Browser.prototype.visit = function(url) {
     var prev_url;
-    this.state = 'loading';
+    this.setState('loading');
     prev_url = this.page.currentUrl();
     this.page.open(url);
     if (/#/.test(url) && prev_url.split('#')[0] === url.split('#')[0]) {
-      this.state = 'default';
+      this.setState('default');
       return this.sendResponse('success');
     }
   };
@@ -137,9 +155,9 @@ Poltergeist.Browser = (function() {
   Browser.prototype.select_file = function(page_id, id, value) {
     var node;
     node = this.node(page_id, id);
-    node.setAttribute('_poltergeist_selected', '');
+    this.page.beforeUpload(node.id);
     this.page.uploadFile('[_poltergeist_selected]', value);
-    node.removeAttribute('_poltergeist_selected');
+    this.page.afterUpload(node.id);
     return this.sendResponse(true);
   };
 
@@ -168,7 +186,7 @@ Poltergeist.Browser = (function() {
     var _this = this;
     if (this.page.pushFrame(name)) {
       if (this.page.currentUrl() === 'about:blank') {
-        return this.state = 'awaiting_frame_load';
+        return this.setState('awaiting_frame_load');
       } else {
         return this.sendResponse(true);
       }
@@ -201,7 +219,7 @@ Poltergeist.Browser = (function() {
       }
     } else {
       this.page_name = name;
-      return this.state = 'awaiting_sub_page';
+      return this.setState('awaiting_sub_page');
     }
   };
 
@@ -214,20 +232,37 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
-  Browser.prototype.click = function(page_id, id) {
+  Browser.prototype.click = function(page_id, id, event) {
     var node,
       _this = this;
+    if (event == null) {
+      event = 'click';
+    }
     node = this.node(page_id, id);
-    this.state = 'clicked';
-    this.last_click = node.click();
+    this.setState('clicked');
+    this.last_click = node.click(event);
     return setTimeout(function() {
       if (_this.state !== 'loading') {
-        _this.state = 'default';
+        _this.setState('default');
         return _this.sendResponse(_this.last_click);
       }
     }, 5);
   };
 
+  Browser.prototype.double_click = function(page_id, id) {
+    return this.click(page_id, id, 'doubleclick');
+  };
+
+  Browser.prototype.click_coordinates = function(x, y) {
+    this.page.sendEvent('click', x, y);
+    return this.sendResponse({
+      click: {
+        x: x,
+        y: y
+      }
+    });
+  };
+
   Browser.prototype.drag = function(page_id, id, other_id) {
     this.node(page_id, id).dragTo(this.node(page_id, other_id));
     return this.sendResponse(true);
@@ -318,6 +353,16 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.set_js_errors = function(value) {
+    this.js_errors = value;
+    return this.sendResponse(true);
+  };
+
+  Browser.prototype.set_debug = function(value) {
+    this._debug = value;
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.exit = function() {
     return phantom.exit();
   };

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

@@ -41,13 +41,16 @@ Poltergeist.Node = (function() {
     };
   };
 
-  Node.prototype.click = function() {
+  Node.prototype.click = function(event) {
     var pos, test;
+    if (event == null) {
+      event = 'click';
+    }
     this.scrollIntoView();
     pos = this.clickPosition();
     test = this.clickTest(pos.x, pos.y);
     if (test.status === 'success') {
-      this.page.mouseEvent('click', pos.x, pos.y);
+      this.page.mouseEvent(event, pos.x, pos.y);
       return pos;
     } else {
       throw new Poltergeist.ClickFailed(test.selector, pos);

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

@@ -8,7 +8,9 @@ Poltergeist.WebPage = (function() {
 
   WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render'];
 
-  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize'];
+  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload'];
+
+  WebPage.EXTENSIONS = [];
 
   function WebPage(_native) {
     var callback, _i, _len, _ref;
@@ -24,7 +26,6 @@ Poltergeist.WebPage = (function() {
       callback = _ref[_i];
       this.bindCallback(callback);
     }
-    this.injectAgent();
   }
 
   _ref = WebPage.COMMANDS;
@@ -61,13 +62,26 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.injectAgent = function() {
+    var extension, _k, _len2, _ref2, _results;
     if (this["native"].evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
-      return this["native"].injectJs("" + phantom.libraryPath + "/agent.js");
+      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;
     }
   };
 
+  WebPage.prototype.injectExtension = function(file) {
+    WebPage.EXTENSIONS.push(file);
+    return this["native"].injectJs(file);
+  };
+
   WebPage.prototype.onConsoleMessageNative = function(message) {
     if (message === '__DOMContentLoaded') {
       this._source = this["native"].content;
@@ -204,11 +218,12 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.pushFrame = function(name) {
-    var res;
-    this.frames.push(name);
-    res = this["native"].switchToFrame(name);
-    this.injectAgent();
-    return res;
+    if (this["native"].switchToFrame(name)) {
+      this.frames.push(name);
+      return true;
+    } else {
+      return false;
+    }
   };
 
   WebPage.prototype.popFrame = function() {
@@ -277,6 +292,7 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.evaluate = function() {
     var args, fn;
     fn = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    this.injectAgent();
     return JSON.parse(this["native"].evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }"));
   };
 
@@ -317,7 +333,7 @@ Poltergeist.WebPage = (function() {
       if (result.error.message === 'PoltergeistAgent.ObsoleteNode') {
         throw new Poltergeist.ObsoleteNode;
       } else {
-        throw new Poltergeist.JavascriptError([result.error]);
+        throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
       }
     } else {
       return result.value;