poltergeist 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a6d774d0e6cf68f19667891d54f61c810e89f1
-  data.tar.gz: 19861cdfb3615834316772b64ee067be4efca384
+  metadata.gz: eac1d67cd0c1e7872a042e4d0dfa10740b132858
+  data.tar.gz: e52276ce486bb4bda8e17416da7492cdae0af9aa
 SHA512:
-  metadata.gz: 3caef6797f238771788a78b0db80019e0f5559c2aef822e3bd102682ecd88a12160e39f6cf6c8a6dd58a4771cb501911fb99ac06d6464f1b8f0370b5dabae9cf
-  data.tar.gz: ad4321b2d883e7e2236ca800d401371a863027abe9b9a2c6807ae93c16898c77c9284844366504bec5b9f66d93c3d9c55a546af3ae1a79552b3ebe907dd6cb0b
+  metadata.gz: aa4a1e4fa49103bb1989d16a46c1135ebffaec9df3fb0a86f1fdf5841389fffd9c6ebaa59ffc8f57abf150a981ce419d38c5c9516d1b0281e73e96f3c78cc517
+  data.tar.gz: a7088f6835bf5ef8eb42e724e99dc3271e37deb56c47cce57d68bdd54493ed0e4ed795717dc10d91a56196c55df59fed3c8bdf2c437c9d387d58cc5e7f0d4cbf

data/lib/capybara/poltergeist/browser.rb

@@ -120,12 +120,12 @@ module Capybara::Poltergeist
       command 'click_coordinates', x, y
     end
 
-    def evaluate(script)
-      command 'evaluate', script
+    def evaluate(script, *args)
+      command 'evaluate', script, *args
     end
 
-    def execute(script)
-      command 'execute', script
+    def execute(script, *args)
+      command 'execute', script, *args
     end
 
     def within_frame(handle, &block)
@@ -429,19 +429,49 @@ module Capybara::Poltergeist
       end
     end
 
+    KEY_ALIASES = {
+      command:   :Meta,
+      equals:    :Equal,
+      Control:   :Ctrl,
+      control:   :Ctrl,
+      mulitply:  'numpad*',
+      add:       'numpad+',
+      divide:    'numpad/',
+      subtract:  'numpad-',
+      decimal:   'numpad.'
+    }
+
     def normalize_keys(keys)
       keys.map do |key|
         case key
         when Array
           # [:Shift, "s"] => { modifier: "shift", key: "S" }
+          # [:Shift, "string"] => { modifier: "shift", key: "STRING" }
           # [:Ctrl, :Left] => { modifier: "ctrl", key: :Left }
           # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: :Left }
-          letter = key.last
-          symbol = key[0...-1].map { |k| k.to_s.downcase }.join(',')
-
-          { modifier: symbol.to_s.downcase, key: letter.capitalize }
+          # [:Ctrl, :Left, :Left] => { modifier: "ctrl", key: [:Left, :Left] }
+          _keys = key.chunk {|k| k.is_a?(Symbol) && %w(shift ctrl control alt meta command).include?(k.to_s.downcase) }
+          modifiers = if _keys.peek[0]
+            _keys.next[1].map do |k|
+              k = k.to_s.downcase
+              k = 'ctrl' if k == 'control'
+              k = 'meta' if k == 'command'
+              k
+            end.join(',')
+          else
+            ''
+          end
+          letter = normalize_keys(_keys.next[1].map {|k| k.is_a?(String) ? k.upcase : k })
+          { modifier: modifiers, key: letter }
         when Symbol
-          { key: key.capitalize } # Return a known sequence for PhantomJS
+          # Return a known sequence for PhantomJS
+          key = KEY_ALIASES.fetch(key, key)
+          if match = key.to_s.match(/numpad(.)/)
+            res = { key: match[1], modifier: 'keypad' }
+          elsif key !~ /^[A-Z]/
+            key = key.to_s.split('_').map{|e| e.capitalize}.join
+          end
+          res || { key: key }
         when String
           key # Plain string, nothing to do
         end

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

@@ -55,7 +55,7 @@ class PoltergeistAgent
     this.get(id).removeAttribute('_poltergeist_selected')
 
   clearLocalStorage: ->
-    localStorage.clear()
+    localStorage?.clear()
 
 class PoltergeistAgent.ObsoleteNode
   toString: -> "PoltergeistAgent.ObsoleteNode"
@@ -266,7 +266,12 @@ class PoltergeistAgent.Node
     rect.right <= window.innerWidth
 
   isDisabled: ->
-    @element.disabled || @element.tagName == 'OPTION' && @element.parentNode.disabled
+    xpath = 'parent::optgroup[@disabled] | \
+             ancestor::select[@disabled] | \
+             parent::fieldset[@disabled] | \
+             ancestor::*[not(self::legend) or preceding-sibling::legend][parent::fieldset[@disabled]]'
+
+    @element.disabled || document.evaluate(xpath, @element, null, XPathResult.BOOLEAN_TYPE, null).booleanValue
 
   path: ->
     elements = @parentIds().reverse().map((id) => @agent.get(id))

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

@@ -199,11 +199,15 @@ class Poltergeist.Browser
   path: (page_id, id) ->
     @current_command.sendResponse this.node(page_id, id).path()
 
-  evaluate: (script) ->
-    @current_command.sendResponse @currentPage.evaluate("function() { return #{script} }")
-
-  execute: (script) ->
-    @currentPage.execute("function() { #{script} }")
+  evaluate: (script, args...) ->
+    for arg in args when @_isElementArgument(arg)
+      throw new Poltergeist.ObsoleteNode if arg["ELEMENT"]["page_id"] != @currentPage.id
+    @current_command.sendResponse @currentPage.evaluate("function() { return #{script} }", args...)
+
+  execute: (script, args...) ->
+    for arg in args when @_isElementArgument(arg)
+      throw new Poltergeist.ObsoleteNode if arg["ELEMENT"]["page_id"] != @currentPage.id
+    @currentPage.execute("function() { #{script} }", args...)
     @current_command.sendResponse(true)
 
   frameUrl: (frame_name) ->
@@ -345,21 +349,24 @@ class Poltergeist.Browser
     if !target.containsSelection()
       target.mouseEvent('click')
 
+    @_send_keys_with_modifiers(keys)
+    @current_command.sendResponse(true)
+
+  _send_keys_with_modifiers: (keys, current_modifier_code = 0) ->
     for sequence in keys
       key = if sequence.key?
         @currentPage.keyCode(sequence.key) || sequence.key
       else
         sequence
+
       if sequence.modifier?
         modifier_keys = @currentPage.keyModifierKeys(sequence.modifier)
-        modifier_code = @currentPage.keyModifierCode(sequence.modifier)
+        modifier_code = @currentPage.keyModifierCode(sequence.modifier) | current_modifier_code
         @currentPage.sendEvent('keydown', modifier_key) for modifier_key in modifier_keys
-        @currentPage.sendEvent('keypress', key, null, null, modifier_code)
+        @_send_keys_with_modifiers([].concat(key), modifier_code)
         @currentPage.sendEvent('keyup', modifier_key) for modifier_key in modifier_keys
       else
-        @currentPage.sendEvent('keypress', key)
-
-    @current_command.sendResponse(true)
+        @currentPage.sendEvent('keypress', key, null, null, current_modifier_code)
 
   render_base64: (format, { full = false, selector = null } = {})->
     window_scroll_position = @currentPage.native().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }")
@@ -535,3 +542,5 @@ class Poltergeist.Browser
     wildcard = wildcard.replace(/\?/g, ".")
     new RegExp(wildcard, "i")
 
+  _isElementArgument: (arg)->
+    typeof(arg) == "object" and typeof(arg['ELEMENT']) == "object"

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

@@ -97,7 +97,7 @@ PoltergeistAgent = (function() {
   };
 
   PoltergeistAgent.prototype.clearLocalStorage = function() {
-    return localStorage.clear();
+    return typeof localStorage !== "undefined" && localStorage !== null ? localStorage.clear() : void 0;
   };
 
   return PoltergeistAgent;
@@ -389,7 +389,9 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.isDisabled = function() {
-    return this.element.disabled || this.element.tagName === 'OPTION' && this.element.parentNode.disabled;
+    var xpath;
+    xpath = 'parent::optgroup[@disabled] | ancestor::select[@disabled] | parent::fieldset[@disabled] | ancestor::*[not(self::legend) or preceding-sibling::legend][parent::fieldset[@disabled]]';
+    return this.element.disabled || document.evaluate(xpath, this.element, null, XPathResult.BOOLEAN_TYPE, null).booleanValue;
   };
 
   Node.prototype.path = function() {

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

@@ -1,5 +1,5 @@
-var 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; },
-  slice = [].slice;
+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.Browser = (function() {
   function Browser(width, height) {
@@ -249,12 +249,32 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(this.node(page_id, id).path());
   };
 
-  Browser.prototype.evaluate = function(script) {
-    return this.current_command.sendResponse(this.currentPage.evaluate("function() { return " + script + " }"));
+  Browser.prototype.evaluate = function() {
+    var arg, args, i, len, ref, script;
+    script = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    for (i = 0, len = args.length; i < len; i++) {
+      arg = args[i];
+      if (this._isElementArgument(arg)) {
+        if (arg["ELEMENT"]["page_id"] !== this.currentPage.id) {
+          throw new Poltergeist.ObsoleteNode;
+        }
+      }
+    }
+    return this.current_command.sendResponse((ref = this.currentPage).evaluate.apply(ref, ["function() { return " + script + " }"].concat(slice.call(args))));
   };
 
-  Browser.prototype.execute = function(script) {
-    this.currentPage.execute("function() { " + script + " }");
+  Browser.prototype.execute = function() {
+    var arg, args, i, len, ref, script;
+    script = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    for (i = 0, len = args.length; i < len; i++) {
+      arg = args[i];
+      if (this._isElementArgument(arg)) {
+        if (arg["ELEMENT"]["page_id"] !== this.currentPage.id) {
+          throw new Poltergeist.ObsoleteNode;
+        }
+      }
+    }
+    (ref = this.currentPage).execute.apply(ref, ["function() { " + script + " }"].concat(slice.call(args)));
     return this.current_command.sendResponse(true);
   };
 
@@ -450,36 +470,51 @@ Poltergeist.Browser = (function() {
   };
 
   Browser.prototype.send_keys = function(page_id, id, keys) {
-    var i, j, k, key, len, len1, len2, modifier_code, modifier_key, modifier_keys, sequence, target;
+    var target;
     target = this.node(page_id, id);
     if (!target.containsSelection()) {
       target.mouseEvent('click');
     }
+    this._send_keys_with_modifiers(keys);
+    return this.current_command.sendResponse(true);
+  };
+
+  Browser.prototype._send_keys_with_modifiers = function(keys, current_modifier_code) {
+    var i, j, key, len, len1, modifier_code, modifier_key, modifier_keys, results, sequence;
+    if (current_modifier_code == null) {
+      current_modifier_code = 0;
+    }
+    results = [];
     for (i = 0, len = keys.length; i < len; i++) {
       sequence = keys[i];
       key = sequence.key != null ? this.currentPage.keyCode(sequence.key) || sequence.key : sequence;
       if (sequence.modifier != null) {
         modifier_keys = this.currentPage.keyModifierKeys(sequence.modifier);
-        modifier_code = this.currentPage.keyModifierCode(sequence.modifier);
+        modifier_code = this.currentPage.keyModifierCode(sequence.modifier) | current_modifier_code;
         for (j = 0, len1 = modifier_keys.length; j < len1; j++) {
           modifier_key = modifier_keys[j];
           this.currentPage.sendEvent('keydown', modifier_key);
         }
-        this.currentPage.sendEvent('keypress', key, null, null, modifier_code);
-        for (k = 0, len2 = modifier_keys.length; k < len2; k++) {
-          modifier_key = modifier_keys[k];
-          this.currentPage.sendEvent('keyup', modifier_key);
-        }
+        this._send_keys_with_modifiers([].concat(key), modifier_code);
+        results.push((function() {
+          var k, len2, results1;
+          results1 = [];
+          for (k = 0, len2 = modifier_keys.length; k < len2; k++) {
+            modifier_key = modifier_keys[k];
+            results1.push(this.currentPage.sendEvent('keyup', modifier_key));
+          }
+          return results1;
+        }).call(this));
       } else {
-        this.currentPage.sendEvent('keypress', key);
+        results.push(this.currentPage.sendEvent('keypress', key, null, null, current_modifier_code));
       }
     }
-    return this.current_command.sendResponse(true);
+    return results;
   };
 
-  Browser.prototype.render_base64 = function(format, arg) {
+  Browser.prototype.render_base64 = function(format, arg1) {
     var dimensions, encoded_image, full, ref, ref1, ref2, ref3, selector, window_scroll_position;
-    ref = arg != null ? arg : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null;
+    ref = arg1 != null ? arg1 : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null;
     window_scroll_position = this.currentPage["native"]().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }");
     dimensions = this.set_clip_rect(full, selector);
     encoded_image = this.currentPage.renderBase64(format);
@@ -491,9 +526,9 @@ Poltergeist.Browser = (function() {
     return this.current_command.sendResponse(encoded_image);
   };
 
-  Browser.prototype.render = function(path, arg) {
+  Browser.prototype.render = function(path, arg1) {
     var dimensions, format, full, options, quality, ref, ref1, ref2, ref3, ref4, ref5, selector, window_scroll_position;
-    ref = arg != null ? arg : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null, format = (ref3 = ref.format) != null ? ref3 : null, quality = (ref4 = ref.quality) != null ? ref4 : null;
+    ref = arg1 != null ? arg1 : {}, full = (ref1 = ref.full) != null ? ref1 : false, selector = (ref2 = ref.selector) != null ? ref2 : null, format = (ref3 = ref.format) != null ? ref3 : null, quality = (ref4 = ref.quality) != null ? ref4 : null;
     window_scroll_position = this.currentPage["native"]().evaluate("function(){ return [window.pageXOffset, window.pageYOffset] }");
     dimensions = this.set_clip_rect(full, selector);
     options = {};
@@ -733,6 +768,10 @@ Poltergeist.Browser = (function() {
     return new RegExp(wildcard, "i");
   };
 
+  Browser.prototype._isElementArgument = function(arg) {
+    return typeof arg === "object" && typeof arg['ELEMENT'] === "object";
+  };
+
   return Browser;
 
 })();

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

@@ -216,24 +216,35 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.keyCode = function(name) {
+    if (name === "Ctrl") {
+      name = "Control";
+    }
     return this["native"]().event.key[name];
   };
 
   WebPage.prototype.keyModifierCode = function(names) {
     var modifiers;
     modifiers = this["native"]().event.modifier;
-    names = names.split(',').map((function(name) {
+    return names.split(',').map(function(name) {
       return modifiers[name];
-    }));
-    return names[0] | names[1];
+    }).reduce(function(n1, n2) {
+      return n1 | n2;
+    });
   };
 
   WebPage.prototype.keyModifierKeys = function(names) {
-    return names.split(',').map((function(_this) {
-      return function(name) {
-        return _this.keyCode(name.charAt(0).toUpperCase() + name.substring(1));
-      };
-    })(this));
+    var k, len2, name, ref2, results;
+    ref2 = names.split(',');
+    results = [];
+    for (k = 0, len2 = ref2.length; k < len2; k++) {
+      name = ref2[k];
+      if (!(name !== 'keypad')) {
+        continue;
+      }
+      name = name.charAt(0).toUpperCase() + name.substring(1);
+      results.push(this.keyCode(name));
+    }
+    return results;
   };
 
   WebPage.prototype._waitState_until = function(state, callback, timeout, timeout_callback) {
@@ -505,13 +516,13 @@ Poltergeist.WebPage = (function() {
     var args, fn, ref2;
     fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     this.injectAgent();
-    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { var _result = " + (this.stringifyCall(fn)) + "; return (_result == null) ? undefined : _result; }"].concat(slice.call(args)));
+    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { for(var i=0; i < arguments.length; i++){ if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){ arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element; } } var _result = " + (this.stringifyCall(fn)) + "; return (_result == null) ? undefined : _result; }"].concat(slice.call(args)));
   };
 
   WebPage.prototype.execute = function() {
     var args, fn, ref2;
     fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { " + (this.stringifyCall(fn)) + " }"].concat(slice.call(args)));
+    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { for(var i=0; i < arguments.length; i++){ if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){ arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element; } } " + (this.stringifyCall(fn)) + " }"].concat(slice.call(args)));
   };
 
   WebPage.prototype.stringifyCall = function(fn) {

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

@@ -160,16 +160,17 @@ class Poltergeist.WebPage
     this.native().windowName
 
   keyCode: (name) ->
+    name = "Control" if name == "Ctrl"
     this.native().event.key[name]
 
   keyModifierCode: (names) ->
     modifiers = this.native().event.modifier
-    names = names.split(',').map ((name) -> modifiers[name])
-    names[0] | names[1] # return codes for 1 or 2 modifiers
+    names.split(',').map((name) -> modifiers[name]).reduce((n1,n2) -> n1 | n2)
 
   keyModifierKeys: (names) ->
-    names.split(',').map (name) =>
-      this.keyCode(name.charAt(0).toUpperCase() + name.substring(1))
+    for name in names.split(',') when name isnt 'keypad'
+      name = name.charAt(0).toUpperCase() + name.substring(1)
+      this.keyCode(name)
 
   _waitState_until: (state, callback, timeout, timeout_callback) ->
     if (@state == state)
@@ -345,11 +346,23 @@ class Poltergeist.WebPage
 
   evaluate: (fn, args...) ->
     this.injectAgent()
-    this.native().evaluate("function() { var _result = #{this.stringifyCall(fn)};
+    this.native().evaluate("function() {
+      for(var i=0; i < arguments.length; i++){
+        if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){
+          arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element;
+        }
+      }
+      var _result = #{this.stringifyCall(fn)};
       return (_result == null) ? undefined : _result; }", args...)
 
   execute: (fn, args...) ->
-    this.native().evaluate("function() { #{this.stringifyCall(fn)} }", args...)
+    this.native().evaluate("function() {
+      for(var i=0; i < arguments.length; i++){
+        if ((typeof(arguments[i]) == 'object') && (typeof(arguments[i]['ELEMENT']) == 'object')){
+          arguments[i] = window.__poltergeist.get(arguments[i]['ELEMENT']['id']).element;
+        }
+      }
+      #{this.stringifyCall(fn)} }", args...)
 
   stringifyCall: (fn) ->
     "(#{fn.toString()}).apply(this, arguments)"

data/lib/capybara/poltergeist/driver.rb

@@ -134,12 +134,12 @@ module Capybara::Poltergeist
       browser.click_coordinates(x, y)
     end
 
-    def evaluate_script(script)
-      browser.evaluate(script)
+    def evaluate_script(script, *args)
+      browser.evaluate(script, *args.map { |arg| arg.is_a?(Capybara::Poltergeist::Node) ?  arg.native : arg})
     end
 
-    def execute_script(script)
-      browser.execute(script)
+    def execute_script(script, *args)
+      browser.execute(script, *args.map { |arg| arg.is_a?(Capybara::Poltergeist::Node) ?  arg.native : arg})
       nil
     end
 

data/lib/capybara/poltergeist/node.rb

@@ -168,6 +168,16 @@ module Capybara::Poltergeist
       command :path
     end
 
+    # @api private
+    def to_json(*)
+      JSON.generate as_json
+    end
+
+    # @api private
+    def as_json(*)
+      { ELEMENT: {page_id: @page_id, id: @id} }
+    end
+
     private
 
     def filter_text(text)

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "1.12.0"
+    VERSION = "1.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement