poltergeist 1.2.0 → 1.3.0

data/README.md

@@ -9,7 +9,7 @@ provided by [PhantomJS](http://www.phantomjs.org/).
 **If you're viewing this at https://github.com/jonleighton/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.2.0).](https://github.com/jonleighton/poltergeist/tree/v1.2.0)**
+(1.3.0).](https://github.com/jonleighton/poltergeist/tree/v1.3.0)**
 
 ## Getting help ##
 
@@ -324,6 +324,20 @@ Include as much information as possible. For example:
 
 ## Changes ##
 
+### 1.3.0 ###
+
+#### Features ####
+
+*   Add support for PhantomJS 1.7's `cookiesEnabled` API
+    (Micah Frost)
+
+#### Bug fixes ####
+
+*   Fix logging of mouse event co-ordinates
+*   Invalid selectors throw a useful error message
+*   Tie us to the 0.4 version of faye-websocket since the 0.5 version
+    contains breaking changes.
+
 ### 1.2.0 ###
 
 #### Features ####
@@ -341,6 +355,13 @@ Include as much information as possible. For example:
 *   Run phantomjs in a new process group so ^C doesn't trigger a
     DeadClient error [Issue #252]
 
+### 1.1.1 ###
+
+#### Features ####
+
+*   Changed Capybara dependency to `~> 2.0.1` because Poltergeist 1.1 is
+    not compatible with Capybara 2.1.
+
 ### 1.1.0 ###
 
 #### Features ####

data/lib/capybara/poltergeist/browser.rb

@@ -6,7 +6,8 @@ module Capybara::Poltergeist
   class Browser
     ERROR_MAPPINGS = {
       "Poltergeist.JavascriptError" => JavascriptError,
-      "Poltergeist.FrameNotFound"   => FrameNotFound
+      "Poltergeist.FrameNotFound"   => FrameNotFound,
+      "Poltergeist.InvalidSelector" => InvalidSelector
     }
 
     attr_reader :server, :client, :logger
@@ -197,6 +198,10 @@ module Capybara::Poltergeist
       command 'remove_cookie', name
     end
 
+    def cookies_enabled=(flag)
+      command 'cookies_enabled', !!flag
+    end
+
     def js_errors=(val)
       command 'set_js_errors', !!val
     end

data/lib/capybara/poltergeist/client.rb

@@ -88,8 +88,14 @@ module Capybara::Poltergeist
 
       if version.nil? || $? != 0
         raise PhantomJSFailed.new($?)
-      elsif version.chomp < PHANTOMJS_VERSION
-        raise PhantomJSTooOld.new(version)
+      else
+        major, minor, build = version.chomp.split('.').map(&:to_i)
+        min_major, min_minor, min_build = PHANTOMJS_VERSION.split('.').map(&:to_i)
+        if major < min_major ||
+            major == min_major && minor < min_minor ||
+            major == min_major && minor == min_minor && build < min_build
+          raise PhantomJSTooOld.new(version)
+        end
       end
 
       @phantomjs_version_checked = true

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

@@ -28,13 +28,19 @@ class PoltergeistAgent
     window.location.toString()
 
   find: (method, selector, within = document) ->
-    if method == "xpath"
-      xpath   = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
-      results = (xpath.snapshotItem(i) for i in [0...xpath.snapshotLength])
-    else
-      results = within.querySelectorAll(selector)
+    try
+      if method == "xpath"
+        xpath   = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
+        results = (xpath.snapshotItem(i) for i in [0...xpath.snapshotLength])
+      else
+        results = within.querySelectorAll(selector)
 
-    this.register(el) for el in results
+      this.register(el) for el in results
+    catch error
+      if error.code == DOMException.SYNTAX_ERR
+        throw new PoltergeistAgent.InvalidSelector
+      else
+        throw error
 
   register: (element) ->
     @elements.push(element)
@@ -61,6 +67,9 @@ class PoltergeistAgent
 class PoltergeistAgent.ObsoleteNode
   toString: -> "PoltergeistAgent.ObsoleteNode"
 
+class PoltergeistAgent.InvalidSelector
+  toString: -> "PoltergeistAgent.InvalidSelector"
+
 class PoltergeistAgent.Node
   @EVENTS = {
     FOCUS: ['blur', 'focus', 'focusin', 'focusout'],

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

@@ -26,7 +26,7 @@ class Poltergeist.Browser
 
     @page.onLoadFinished = (status) =>
       if @state == 'loading'
-        this.sendResponse(status: status, click: @last_click)
+        this.sendResponse(status: status, position: @last_mouse_event)
         this.setState 'default'
       else if @state == 'awaiting_frame_load'
         this.sendResponse(true)
@@ -47,11 +47,16 @@ class Poltergeist.Browser
         # window.
         setTimeout((=> this.push_window(name)), 0)
 
+  runCommand: (name, args) ->
+    this.setState "default"
+    this[name].apply(this, args)
+
   debug: (message) ->
     if @_debug
       console.log "poltergeist [#{new Date().getTime()}] #{message}"
 
   setState: (state) ->
+    return if @state == state
     this.debug "state #{@state} -> #{state}"
     @state = state
 
@@ -280,6 +285,10 @@ class Poltergeist.Browser
     @page.deleteCookie(name)
     this.sendResponse(true)
 
+  cookies_enabled: (flag) ->
+    phantom.cookiesEnabled = flag
+    this.sendResponse(true)
+
   set_js_errors: (value) ->
     @js_errors = value
     this.sendResponse(true)

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

@@ -50,31 +50,40 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.find = function(method, selector, within) {
-    var el, i, results, xpath, _i, _len, _results;
+    var el, error, i, results, xpath, _i, _len, _results;
 
     if (within == null) {
       within = document;
     }
-    if (method === "xpath") {
-      xpath = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-      results = (function() {
-        var _i, _ref, _results;
-
-        _results = [];
-        for (i = _i = 0, _ref = xpath.snapshotLength; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
-          _results.push(xpath.snapshotItem(i));
-        }
-        return _results;
-      })();
-    } else {
-      results = within.querySelectorAll(selector);
-    }
-    _results = [];
-    for (_i = 0, _len = results.length; _i < _len; _i++) {
-      el = results[_i];
-      _results.push(this.register(el));
+    try {
+      if (method === "xpath") {
+        xpath = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+        results = (function() {
+          var _i, _ref, _results;
+
+          _results = [];
+          for (i = _i = 0, _ref = xpath.snapshotLength; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+            _results.push(xpath.snapshotItem(i));
+          }
+          return _results;
+        })();
+      } else {
+        results = within.querySelectorAll(selector);
+      }
+      _results = [];
+      for (_i = 0, _len = results.length; _i < _len; _i++) {
+        el = results[_i];
+        _results.push(this.register(el));
+      }
+      return _results;
+    } catch (_error) {
+      error = _error;
+      if (error.code === DOMException.SYNTAX_ERR) {
+        throw new PoltergeistAgent.InvalidSelector;
+      } else {
+        throw error;
+      }
     }
-    return _results;
   };
 
   PoltergeistAgent.prototype.register = function(element) {
@@ -128,6 +137,17 @@ PoltergeistAgent.ObsoleteNode = (function() {
 
 })();
 
+PoltergeistAgent.InvalidSelector = (function() {
+  function InvalidSelector() {}
+
+  InvalidSelector.prototype.toString = function() {
+    return "PoltergeistAgent.InvalidSelector";
+  };
+
+  return InvalidSelector;
+
+})();
+
 PoltergeistAgent.Node = (function() {
   Node.EVENTS = {
     FOCUS: ['blur', 'focus', 'focusin', 'focusout'],

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

@@ -37,7 +37,7 @@ Poltergeist.Browser = (function() {
       if (_this.state === 'loading') {
         _this.sendResponse({
           status: status,
-          click: _this.last_click
+          position: _this.last_mouse_event
         });
         return _this.setState('default');
       } else if (_this.state === 'awaiting_frame_load') {
@@ -62,6 +62,11 @@ Poltergeist.Browser = (function() {
     };
   };
 
+  Browser.prototype.runCommand = function(name, args) {
+    this.setState("default");
+    return this[name].apply(this, args);
+  };
+
   Browser.prototype.debug = function(message) {
     if (this._debug) {
       return console.log("poltergeist [" + (new Date().getTime()) + "] " + message);
@@ -69,6 +74,9 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.setState = function(state) {
+    if (this.state === state) {
+      return;
+    }
     this.debug("state " + this.state + " -> " + state);
     return this.state = state;
   };
@@ -385,6 +393,11 @@ Poltergeist.Browser = (function() {
     return this.sendResponse(true);
   };
 
+  Browser.prototype.cookies_enabled = function(flag) {
+    phantom.cookiesEnabled = flag;
+    return this.sendResponse(true);
+  };
+
   Browser.prototype.set_js_errors = function(value) {
     this.js_errors = value;
     return this.sendResponse(true);

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

@@ -20,7 +20,7 @@ Poltergeist = (function() {
 
     this.running = true;
     try {
-      return this.browser[command.name].apply(this.browser, command.args);
+      return this.browser.runCommand(command.name, command.args);
     } catch (_error) {
       error = _error;
       if (error instanceof Poltergeist.Error) {
@@ -88,6 +88,23 @@ Poltergeist.ObsoleteNode = (function(_super) {
 
 })(Poltergeist.Error);
 
+Poltergeist.InvalidSelector = (function(_super) {
+  __extends(InvalidSelector, _super);
+
+  function InvalidSelector(selector) {
+    this.selector = selector;
+  }
+
+  InvalidSelector.prototype.name = "Poltergeist.InvalidSelector";
+
+  InvalidSelector.prototype.args = function() {
+    return [this.selector];
+  };
+
+  return InvalidSelector;
+
+})(Poltergeist.Error);
+
 Poltergeist.FrameNotFound = (function(_super) {
   __extends(FrameNotFound, _super);
 

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

@@ -344,10 +344,15 @@ Poltergeist.WebPage = (function() {
       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.BrowserError(result.error.message, result.error.stack);
+      switch (result.error.message) {
+        case 'PoltergeistAgent.ObsoleteNode':
+          throw new Poltergeist.ObsoleteNode;
+          break;
+        case 'PoltergeistAgent.InvalidSelector':
+          throw new Poltergeist.InvalidSelector(args[1]);
+          break;
+        default:
+          throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
       }
     } else {
       return result.value;

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

@@ -13,7 +13,7 @@ class Poltergeist
     @running = true
 
     try
-      @browser[command.name].apply(@browser, command.args)
+      @browser.runCommand(command.name, command.args)
     catch error
       if error instanceof Poltergeist.Error
         this.sendError(error)
@@ -50,6 +50,11 @@ class Poltergeist.ObsoleteNode extends Poltergeist.Error
   args: -> []
   toString: -> this.name
 
+class Poltergeist.InvalidSelector extends Poltergeist.Error
+  constructor: (@selector) ->
+  name: "Poltergeist.InvalidSelector"
+  args: -> [@selector]
+
 class Poltergeist.FrameNotFound extends Poltergeist.Error
   constructor: (@frameName) ->
   name: "Poltergeist.FrameNotFound"

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

@@ -238,9 +238,12 @@ class Poltergeist.WebPage
     )
 
     if result.error?
-      if result.error.message == 'PoltergeistAgent.ObsoleteNode'
-        throw new Poltergeist.ObsoleteNode
-      else
-        throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
+      switch result.error.message
+        when 'PoltergeistAgent.ObsoleteNode'
+          throw new Poltergeist.ObsoleteNode
+        when 'PoltergeistAgent.InvalidSelector'
+          throw new Poltergeist.InvalidSelector(args[1])
+        else
+          throw new Poltergeist.BrowserError(result.error.message, result.error.stack)
     else
       result.value

data/lib/capybara/poltergeist/driver.rb

@@ -191,6 +191,10 @@ module Capybara::Poltergeist
       browser.remove_cookie(name)
     end
 
+    def cookies_enabled=(flag)
+      browser.cookies_enabled = flag
+    end
+
     def debug
       if @options[:inspector]
         inspector.open

data/lib/capybara/poltergeist/errors.rb

@@ -64,6 +64,17 @@ module Capybara
       end
     end
 
+    class InvalidSelector < ClientError
+      def selector
+        response['args'].first
+      end
+
+      def message
+        "The browser raised a syntax error while trying to evaluate " \
+          "the selector #{selector.inspect}"
+      end
+    end
+
     class NodeError < ClientError
       attr_reader :node
 

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -48,23 +48,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1657182441903472235
+      hash: 4058260924079530296
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24