poltergeist 1.3.0 → 1.4.0

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

@@ -5,7 +5,6 @@ var Poltergeist, _ref,
 Poltergeist = (function() {
   function Poltergeist(port, width, height) {
     var that;
-
     this.browser = new Poltergeist.Browser(this, width, height);
     this.connection = new Poltergeist.Connection(this, port);
     that = this;
@@ -17,7 +16,6 @@ Poltergeist = (function() {
 
   Poltergeist.prototype.runCommand = function(command) {
     var error;
-
     this.running = true;
     try {
       return this.browser.runCommand(command.name, command.args);

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

@@ -19,7 +19,6 @@ Poltergeist.Node = (function() {
   _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);
     };
@@ -31,7 +30,6 @@ Poltergeist.Node = (function() {
 
   Node.prototype.mouseEventPosition = function() {
     var middle, pos, viewport;
-
     viewport = this.page.viewportSize();
     pos = this.position();
     middle = function(start, end, size) {
@@ -45,7 +43,6 @@ Poltergeist.Node = (function() {
 
   Node.prototype.mouseEvent = function(name) {
     var pos, test;
-
     this.scrollIntoView();
     pos = this.mouseEventPosition();
     test = this.mouseEventTest(pos.x, pos.y);
@@ -59,7 +56,6 @@ Poltergeist.Node = (function() {
 
   Node.prototype.dragTo = function(other) {
     var otherPosition, position;
-
     this.scrollIntoView();
     position = this.mouseEventPosition();
     otherPosition = other.mouseEventPosition();

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

@@ -6,7 +6,7 @@ Poltergeist.WebPage = (function() {
 
   WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested', 'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated'];
 
-  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render'];
+  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64'];
 
   WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload'];
 
@@ -14,14 +14,13 @@ Poltergeist.WebPage = (function() {
 
   function WebPage(_native) {
     var callback, _i, _len, _ref;
-
     this["native"] = _native;
     this["native"] || (this["native"] = require('webpage').create());
-    this._source = "";
+    this._source = null;
     this._errors = [];
     this._networkTraffic = {};
+    this._temp_headers = {};
     this.frames = [];
-    this.sub_pages = {};
     _ref = WebPage.CALLBACKS;
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       callback = _ref[_i];
@@ -33,7 +32,6 @@ Poltergeist.WebPage = (function() {
   _fn = function(command) {
     return WebPage.prototype[command] = function() {
       var args;
-
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       return this.runCommand(command, args);
     };
@@ -57,6 +55,7 @@ Poltergeist.WebPage = (function() {
   WebPage.prototype.onInitializedNative = function() {
     this._source = null;
     this.injectAgent();
+    this.removeTempHeaders();
     return this.setScrollPosition({
       left: 0,
       top: 0
@@ -65,7 +64,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.injectAgent = function() {
     var extension, _k, _len2, _ref2, _results;
-
     if (this["native"].evaluate(function() {
       return typeof __poltergeist;
     }) === "undefined") {
@@ -106,7 +104,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onErrorNative = function(message, stack) {
     var stackString;
-
     stackString = message;
     stack.forEach(function(frame) {
       stackString += "\n";
@@ -135,7 +132,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.onResourceReceivedNative = function(response) {
     var _ref2;
-
     if ((_ref2 = this._networkTraffic[response.id]) != null) {
       _ref2.responseParts.push(response);
     }
@@ -179,7 +175,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.responseHeaders = function() {
     var headers;
-
     headers = {};
     this._responseHeaders.forEach(function(item) {
       return headers[item.name] = item.value;
@@ -219,14 +214,45 @@ Poltergeist.WebPage = (function() {
     return this["native"].clipRect = rect;
   };
 
+  WebPage.prototype.elementBounds = function(selector) {
+    return this["native"].evaluate(function(selector) {
+      return document.querySelector(selector).getBoundingClientRect();
+    }, selector);
+  };
+
   WebPage.prototype.setUserAgent = function(userAgent) {
     return this["native"].settings.userAgent = userAgent;
   };
 
+  WebPage.prototype.getCustomHeaders = function() {
+    return this["native"].customHeaders;
+  };
+
   WebPage.prototype.setCustomHeaders = function(headers) {
     return this["native"].customHeaders = headers;
   };
 
+  WebPage.prototype.addTempHeader = function(header) {
+    var name, value, _results;
+    _results = [];
+    for (name in header) {
+      value = header[name];
+      _results.push(this._temp_headers[name] = value);
+    }
+    return _results;
+  };
+
+  WebPage.prototype.removeTempHeaders = function() {
+    var allHeaders, name, value, _ref2;
+    allHeaders = this.getCustomHeaders();
+    _ref2 = this._temp_headers;
+    for (name in _ref2) {
+      value = _ref2[name];
+      delete allHeaders[name];
+    }
+    return this.setCustomHeaders(allHeaders);
+  };
+
   WebPage.prototype.pushFrame = function(name) {
     if (this["native"].switchToFrame(name)) {
       this.frames.push(name);
@@ -236,6 +262,10 @@ Poltergeist.WebPage = (function() {
     }
   };
 
+  WebPage.prototype.pages = function() {
+    return this["native"].pagesWindowName;
+  };
+
   WebPage.prototype.popFrame = function() {
     this.frames.pop();
     return this["native"].switchToParentFrame();
@@ -243,20 +273,14 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.getPage = function(name) {
     var page;
-
-    if (this.sub_pages[name]) {
-      return this.sub_pages[name];
-    } else {
-      page = this["native"].getPage(name);
-      if (page) {
-        return this.sub_pages[name] = new Poltergeist.WebPage(page);
-      }
+    page = this["native"].getPage(name);
+    if (page) {
+      return new Poltergeist.WebPage(page);
     }
   };
 
   WebPage.prototype.dimensions = function() {
     var scroll, viewport;
-
     scroll = this.scrollPosition();
     viewport = this.viewportSize();
     return {
@@ -271,7 +295,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.validatedDimensions = function() {
     var dimensions, document;
-
     dimensions = this.dimensions();
     document = dimensions.document;
     if (dimensions.right > document.width) {
@@ -300,7 +323,6 @@ 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)) + ") }"));
@@ -308,7 +330,6 @@ Poltergeist.WebPage = (function() {
 
   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)) + " }");
   };
@@ -323,11 +344,9 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.bindCallback = function(name) {
     var that;
-
     that = this;
     return this["native"][name] = function() {
       var result;
-
       if (that[name + 'Native'] != null) {
         result = that[name + 'Native'].apply(that, arguments);
       }
@@ -339,7 +358,6 @@ Poltergeist.WebPage = (function() {
 
   WebPage.prototype.runCommand = function(name, args) {
     var result;
-
     result = this.evaluate(function(name, args) {
       return __poltergeist.externalCall(name, args);
     }, name, args);

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

@@ -3,7 +3,7 @@ class Poltergeist.WebPage
                 'onLoadStarted', 'onResourceRequested', 'onResourceReceived',
                 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated']
 
-  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render']
+  @DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64']
 
   @COMMANDS  = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload']
 
@@ -12,11 +12,11 @@ class Poltergeist.WebPage
   constructor: (@native) ->
     @native or= require('webpage').create()
 
-    @_source         = ""
+    @_source         = null
     @_errors         = []
     @_networkTraffic = {}
+    @_temp_headers   = {}
     @frames          = []
-    @sub_pages       = {}
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
@@ -34,6 +34,7 @@ class Poltergeist.WebPage
   onInitializedNative: ->
     @_source = null
     @injectAgent()
+    this.removeTempHeaders()
     this.setScrollPosition(left: 0, top: 0)
 
   injectAgent: ->
@@ -143,12 +144,31 @@ class Poltergeist.WebPage
   setClipRect: (rect) ->
     @native.clipRect = rect
 
+  elementBounds: (selector) ->
+    @native.evaluate(
+      (selector) -> document.querySelector(selector).getBoundingClientRect(),
+      selector
+    )
+
   setUserAgent: (userAgent) ->
     @native.settings.userAgent = userAgent
 
+  getCustomHeaders: ->
+    @native.customHeaders
+
   setCustomHeaders: (headers) ->
     @native.customHeaders = headers
 
+  addTempHeader: (header) ->
+    for name, value of header
+      @_temp_headers[name] = value
+
+  removeTempHeaders: ->
+    allHeaders = this.getCustomHeaders()
+    for name, value of @_temp_headers
+      delete allHeaders[name]
+    this.setCustomHeaders(allHeaders)
+
   pushFrame: (name) ->
     if @native.switchToFrame(name)
       @frames.push(name)
@@ -156,16 +176,16 @@ class Poltergeist.WebPage
     else
       false
 
+  pages: ->
+    @native.pagesWindowName
+
   popFrame: ->
     @frames.pop()
     @native.switchToParentFrame()
 
   getPage: (name) ->
-    if @sub_pages[name]
-      @sub_pages[name]
-    else
-      page = @native.getPage(name)
-      @sub_pages[name] = new Poltergeist.WebPage(page) if page
+    page = @native.getPage(name)
+    new Poltergeist.WebPage(page) if page
 
   dimensions: ->
     scroll   = this.scrollPosition()

data/lib/capybara/poltergeist/driver.rb

@@ -143,6 +143,10 @@ module Capybara::Poltergeist
       browser.within_window(name, &block)
     end
 
+    def window_handles
+      browser.window_handles
+    end
+
     def reset!
       browser.reset
       @started = false
@@ -153,19 +157,40 @@ module Capybara::Poltergeist
     end
     alias_method :render, :save_screenshot
 
+    def render_base64(format = :png, options = {})
+      browser.render_base64(format, options)
+    end
+
     def resize(width, height)
       browser.resize(width, height)
     end
     alias_method :resize_window, :resize
 
+    def scroll_to(left, top)
+      browser.scroll_to(left, top)
+    end
+
     def network_traffic
       browser.network_traffic
     end
 
+    def headers
+      browser.get_headers
+    end
+
     def headers=(headers)
       browser.set_headers(headers)
     end
 
+    def add_headers(headers)
+      browser.add_headers(headers)
+    end
+
+    def add_header(name, value, options = {})
+      permanent = options.fetch(:permanent, true)
+      browser.add_header({ name => value }, permanent)
+    end
+
     def response_headers
       browser.response_headers
     end
@@ -177,11 +202,12 @@ module Capybara::Poltergeist
     def set_cookie(name, value, options = {})
       options[:name]  ||= name
       options[:value] ||= value
-
-      if @started
-        options[:domain] = URI.parse(browser.current_url).host
-      else
-        options[:domain] = Capybara.app_host || "127.0.0.1"
+      options[:domain] ||= begin
+        if @started
+          URI.parse(browser.current_url).host
+        else
+          Capybara.app_host || "127.0.0.1"
+        end
       end
 
       browser.set_cookie(options)

data/lib/capybara/poltergeist/errors.rb

@@ -20,7 +20,7 @@ module Capybara
       end
 
       def to_s
-        stack
+        [message, stack].join("\n")
       end
     end
 
@@ -140,28 +140,28 @@ module Capybara
     end
 
     class PhantomJSTooOld < Error
-      attr_reader :version
-
-      def initialize(version)
-        @version = version
-      end
-
-      def message
-        "PhantomJS version #{version} is too old. You must use at least version #{Client::PHANTOMJS_VERSION}"
+      def self.===(other)
+        if Cliver::Dependency::VersionMismatch === other
+          warn "{name} exception has been deprecated in favor of using the " +
+               "cliver gem for command-line dependency detection. Please " +
+               "handle Cliver::Dependency::VersionMismatch instead."
+          true
+        else
+          super
+        end
       end
     end
 
     class PhantomJSFailed < Error
-      attr_reader :status
-
-      def initialize(status)
-        @status = status
-      end
-
-      def message
-        "PhantomJS returned non-zero exit status #{status.exitstatus}. Make sure phantomjs runs successfully " \
-          "on your system. You can test this by just running the `phantomjs` command which should give you " \
-          "a Javascript REPL."
+      def self.===(other)
+        if Cliver::Dependency::NotMet === other
+          warn "{name} exception has been deprecated in favor of using the " +
+               "cliver gem for command-line dependency detection. Please " +
+               "handle Cliver::Dependency::NotMet instead."
+          true
+        else
+          super
+        end
       end
     end
   end

data/lib/capybara/poltergeist/json.rb

@@ -0,0 +1,25 @@
+module Capybara::Poltergeist
+  module JSON
+    def self.load(message)
+      if dumpy_multi_json?
+        MultiJson.load(message)
+      else
+        MultiJson.decode(message)
+      end
+    end
+
+    def self.dump(message)
+      if dumpy_multi_json?
+        MultiJson.dump(message)
+      else
+        MultiJson.encode(message)
+      end
+    end
+
+    private
+
+    def self.dumpy_multi_json?
+      MultiJson.respond_to?(:dump) && MultiJson.respond_to?(:load)
+    end
+  end
+end