poltergeist 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc14ad1bf5ce9dacde0dfef301ec4fca4e46bd4d
-  data.tar.gz: 41bb2dbf585f8c59b32eeb7b10e7289dae0d193e
+  metadata.gz: 62a6d774d0e6cf68f19667891d54f61c810e89f1
+  data.tar.gz: 19861cdfb3615834316772b64ee067be4efca384
 SHA512:
-  metadata.gz: 48a9db9338cbca32461001b10787638bd486cbfe4f3ebf4ec5a080a20abbefc7a79b5ced7788e2d935d4f06d0dc86aae37325a3b0df53e3504d8bb1e77e61f05
-  data.tar.gz: 2f75709c6262d5fd35075eadaa7a633f9ade052b68dc3a382ec5d6afeb5574d3a8d956d846caf07fc5de9c10a9a9b16d789065f67ba7ed6589adb2efcba4c666
+  metadata.gz: 3caef6797f238771788a78b0db80019e0f5559c2aef822e3bd102682ecd88a12160e39f6cf6c8a6dd58a4771cb501911fb99ac06d6464f1b8f0370b5dabae9cf
+  data.tar.gz: ad4321b2d883e7e2236ca800d401371a863027abe9b9a2c6807ae93c16898c77c9284844366504bec5b9f66d93c3d9c55a546af3ae1a79552b3ebe907dd6cb0b

data/lib/capybara/poltergeist/client.rb

@@ -23,8 +23,19 @@ module Capybara::Poltergeist
     def self.process_killer(pid)
       proc do
         begin
-          Process.kill('KILL', pid)
+          if Capybara::Poltergeist.windows?
+            Process.kill('KILL', pid)
+          else
+            Process.kill('TERM', pid)
+            begin
+              Timeout.timeout(KILL_TIMEOUT) { Process.wait(pid) }
+            rescue Timeout::Error
+              Process.kill('KILL', pid)
+              Process.wait(pid)
+            end
+          end
         rescue Errno::ESRCH, Errno::ECHILD
+          # Zed's dead, baby
         end
       end
     end
@@ -41,15 +52,6 @@ module Capybara::Poltergeist
       @window_size       = options[:window_size]       || [1024, 768]
       @phantomjs_options = options[:phantomjs_options] || []
       @phantomjs_logger  = options[:phantomjs_logger]  || $stdout
-
-      pid = Process.pid
-      at_exit do
-        # do the work in a separate thread, to avoid stomping on $!,
-        # since other libraries depend on it directly.
-        Thread.new do
-          stop if Process.pid == pid
-        end.join
-      end
     end
 
     def start
@@ -111,21 +113,7 @@ module Capybara::Poltergeist
     end
 
     def kill_phantomjs
-      begin
-        if Capybara::Poltergeist.windows?
-          Process.kill('KILL', pid)
-        else
-          Process.kill('TERM', pid)
-          begin
-            Timeout.timeout(KILL_TIMEOUT) { Process.wait(pid) }
-          rescue Timeout::Error
-            Process.kill('KILL', pid)
-            Process.wait(pid)
-          end
-        end
-      rescue Errno::ESRCH, Errno::ECHILD
-        # Zed's dead, baby
-      end
+      self.class.process_killer(pid).call
       @pid = nil
     end
 

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

@@ -1,10 +1,5 @@
 # This is injected into each page that is loaded
-
 class PoltergeistAgent
-  # Since this code executes in the sites browser space - copy needed JSON functions
-  # in case user code messes with JSON (early mootools for instance)
-  @.JSON ||= { parse: JSON.parse, stringify: JSON.stringify }
-
   constructor: ->
     @elements = []
     @nodes    = {}
@@ -15,19 +10,6 @@ class PoltergeistAgent
     catch error
       { error: { message: error.toString(), stack: error.stack } }
 
-  @stringify: (object) ->
-    try
-      PoltergeistAgent.JSON.stringify object, (key, value) ->
-        if Array.isArray(this[key])
-          return this[key]
-        else
-          return value
-    catch error
-      if error instanceof TypeError
-        '"(cyclic structure)"'
-      else
-        throw error
-
   # Somehow PhantomJS returns all characters(brackets, etc) properly encoded
   # except whitespace character in pathname part of the location. This hack
   # is intended to fix this up.
@@ -194,7 +176,7 @@ class PoltergeistAgent.Node
     if name == 'checked' || name == 'selected'
       @element[name]
     else
-      @element.getAttribute(name)
+      @element.getAttribute(name) ? undefined
 
   scrollIntoView: ->
     @element.scrollIntoViewIfNeeded()

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

@@ -1,18 +1,13 @@
 var PoltergeistAgent;
 
 PoltergeistAgent = (function() {
-  PoltergeistAgent.JSON || (PoltergeistAgent.JSON = {
-    parse: JSON.parse,
-    stringify: JSON.stringify
-  });
-
   function PoltergeistAgent() {
     this.elements = [];
     this.nodes = {};
   }
 
   PoltergeistAgent.prototype.externalCall = function(name, args) {
-    var error, error1;
+    var error;
     try {
       return {
         value: this[name].apply(this, args)
@@ -28,32 +23,12 @@ PoltergeistAgent = (function() {
     }
   };
 
-  PoltergeistAgent.stringify = function(object) {
-    var error, error1;
-    try {
-      return PoltergeistAgent.JSON.stringify(object, function(key, value) {
-        if (Array.isArray(this[key])) {
-          return this[key];
-        } else {
-          return value;
-        }
-      });
-    } catch (error1) {
-      error = error1;
-      if (error instanceof TypeError) {
-        return '"(cyclic structure)"';
-      } else {
-        throw error;
-      }
-    }
-  };
-
   PoltergeistAgent.prototype.currentUrl = function() {
     return window.location.href.replace(/\ /g, '%20');
   };
 
   PoltergeistAgent.prototype.find = function(method, selector, within) {
-    var el, error, error1, i, j, len, results, results1, xpath;
+    var el, error, i, j, len, results, results1, xpath;
     if (within == null) {
       within = document;
     }
@@ -296,10 +271,11 @@ PoltergeistAgent.Node = (function() {
   };
 
   Node.prototype.getAttribute = function(name) {
+    var ref;
     if (name === 'checked' || name === 'selected') {
       return this.element[name];
     } else {
-      return this.element.getAttribute(name);
+      return (ref = this.element.getAttribute(name)) != null ? ref : void 0;
     }
   };
 

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

@@ -29,7 +29,7 @@ Poltergeist.Cmd = (function() {
   };
 
   Cmd.prototype.run = function(browser) {
-    var error, error1;
+    var error;
     this.browser = browser;
     try {
       return this.browser.runCommand(this);

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

@@ -28,11 +28,15 @@ Poltergeist.WebPage = (function() {
     this._tempHeaders = {};
     this._blockedUrls = [];
     this._requestedResources = {};
+    this._responseHeaders = [];
     ref = WebPage.CALLBACKS;
     for (i = 0, len = ref.length; i < len; i++) {
       callback = ref[i];
       this.bindCallback(callback);
     }
+    if (phantom.version.major < 2) {
+      this._overrideNativeEvaluate();
+    }
   }
 
   ref = WebPage.COMMANDS;
@@ -498,32 +502,20 @@ Poltergeist.WebPage = (function() {
   };
 
   WebPage.prototype.evaluate = function() {
-    var args, fn;
+    var args, fn, ref2;
     fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     this.injectAgent();
-    return JSON.parse(this.sanitize(this["native"]().evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }")));
-  };
-
-  WebPage.prototype.sanitize = function(potential_string) {
-    if (typeof potential_string === "string") {
-      return potential_string.replace("\n", "\\n").replace("\r", "\\r");
-    } else {
-      return potential_string;
-    }
+    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { var _result = " + (this.stringifyCall(fn)) + "; return (_result == null) ? undefined : _result; }"].concat(slice.call(args)));
   };
 
   WebPage.prototype.execute = function() {
-    var args, fn;
+    var args, fn, ref2;
     fn = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-    return this["native"]().evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
+    return (ref2 = this["native"]()).evaluate.apply(ref2, ["function() { " + (this.stringifyCall(fn)) + " }"].concat(slice.call(args)));
   };
 
-  WebPage.prototype.stringifyCall = function(fn, args) {
-    if (args.length === 0) {
-      return "(" + (fn.toString()) + ")()";
-    } else {
-      return "(" + (fn.toString()) + ").apply(this, PoltergeistAgent.JSON.parse(" + (JSON.stringify(JSON.stringify(args))) + "))";
-    }
+  WebPage.prototype.stringifyCall = function(fn) {
+    return "(" + (fn.toString()) + ").apply(this, arguments)";
   };
 
   WebPage.prototype.bindCallback = function(name) {
@@ -590,6 +582,92 @@ Poltergeist.WebPage = (function() {
     }
   };
 
+  WebPage.prototype._overrideNativeEvaluate = function() {
+    return this._native.evaluate = function (func, args) {
+        function quoteString(str) {
+            var c, i, l = str.length, o = '"';
+            for (i = 0; i < l; i += 1) {
+                c = str.charAt(i);
+                if (c >= ' ') {
+                    if (c === '\\' || c === '"') {
+                        o += '\\';
+                    }
+                    o += c;
+                } else {
+                    switch (c) {
+                    case '\b':
+                        o += '\\b';
+                        break;
+                    case '\f':
+                        o += '\\f';
+                        break;
+                    case '\n':
+                        o += '\\n';
+                        break;
+                    case '\r':
+                        o += '\\r';
+                        break;
+                    case '\t':
+                        o += '\\t';
+                        break;
+                    default:
+                        c = c.charCodeAt();
+                        o += '\\u00' + Math.floor(c / 16).toString(16) +
+                            (c % 16).toString(16);
+                    }
+                }
+            }
+            return o + '"';
+        }
+
+        function detectType(value) {
+            var s = typeof value;
+            if (s === 'object') {
+                if (value) {
+                    if (value instanceof Array) {
+                        s = 'array';
+                    } else if (value instanceof RegExp) {
+                        s = 'regexp';
+                    } else if (value instanceof Date) {
+                        s = 'date';
+                    }
+                } else {
+                    s = 'null';
+                }
+            }
+            return s;
+        }
+
+        var str, arg, argType, i, l;
+        if (!(func instanceof Function || typeof func === 'string' || func instanceof String)) {
+            throw "Wrong use of WebPage#evaluate";
+        }
+        str = 'function() { return (' + func.toString() + ')(';
+        for (i = 1, l = arguments.length; i < l; i++) {
+            arg = arguments[i];
+            argType = detectType(arg);
+
+            switch (argType) {
+            case "object":      //< for type "object"
+            case "array":       //< for type "array"
+                str += JSON.stringify(arg) + ","
+                break;
+            case "date":        //< for type "date"
+                str += "new Date(" + JSON.stringify(arg) + "),"
+                break;
+            case "string":      //< for type "string"
+                str += quoteString(arg) + ',';
+                break;
+            default:            // for types: "null", "number", "function", "regexp", "undefined"
+                str += arg + ',';
+                break;
+            }
+        }
+        str = str.replace(/,$/, '') + '); }';
+        return this.evaluateJavaScript(str);
+    };;
+  };
+
   return WebPage;
 
 })();

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

@@ -27,10 +27,14 @@ class Poltergeist.WebPage
     @_tempHeaders    = {}
     @_blockedUrls    = []
     @_requestedResources = {}
+    @_responseHeaders = []
 
     for callback in WebPage.CALLBACKS
       this.bindCallback(callback)
 
+    if phantom.version.major < 2
+      @._overrideNativeEvaluate()
+
   for command in @COMMANDS
     do (command) =>
       this.prototype[command] =
@@ -341,25 +345,14 @@ class Poltergeist.WebPage
 
   evaluate: (fn, args...) ->
     this.injectAgent()
-    JSON.parse this.sanitize(this.native().evaluate("function() { return PoltergeistAgent.stringify(#{this.stringifyCall(fn, args)}) }"))
-
-  sanitize: (potential_string) ->
-    if typeof(potential_string) == "string"
-      # JSON doesn't like \r or \n in strings unless escaped
-      potential_string.replace("\n","\\n").replace("\r","\\r")
-    else
-      potential_string
+    this.native().evaluate("function() { 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() { #{this.stringifyCall(fn)} }", args...)
 
-  stringifyCall: (fn, args) ->
-    if args.length == 0
-      "(#{fn.toString()})()"
-    else
-      # The JSON.stringify happens twice because the second time we are essentially
-      # escaping the string.
-      "(#{fn.toString()}).apply(this, PoltergeistAgent.JSON.parse(#{JSON.stringify(JSON.stringify(args))}))"
+  stringifyCall: (fn) ->
+    "(#{fn.toString()}).apply(this, arguments)"
 
   bindCallback: (name) ->
     @native()[name] = =>
@@ -406,3 +399,90 @@ class Poltergeist.WebPage
       clearMemoryCache()
     else
       throw new Poltergeist.UnsupportedFeature("clearMemoryCache is supported since PhantomJS 2.0.0")
+
+  _overrideNativeEvaluate: ->
+    # PhantomJS 1.9.x WebPage#evaluate depends on the browser context  JSON, this replaces it
+    # with the evaluate from 2.1.1 which uses the PhantomJS JSON
+    @_native.evaluate = `function (func, args) {
+        function quoteString(str) {
+            var c, i, l = str.length, o = '"';
+            for (i = 0; i < l; i += 1) {
+                c = str.charAt(i);
+                if (c >= ' ') {
+                    if (c === '\\' || c === '"') {
+                        o += '\\';
+                    }
+                    o += c;
+                } else {
+                    switch (c) {
+                    case '\b':
+                        o += '\\b';
+                        break;
+                    case '\f':
+                        o += '\\f';
+                        break;
+                    case '\n':
+                        o += '\\n';
+                        break;
+                    case '\r':
+                        o += '\\r';
+                        break;
+                    case '\t':
+                        o += '\\t';
+                        break;
+                    default:
+                        c = c.charCodeAt();
+                        o += '\\u00' + Math.floor(c / 16).toString(16) +
+                            (c % 16).toString(16);
+                    }
+                }
+            }
+            return o + '"';
+        }
+
+        function detectType(value) {
+            var s = typeof value;
+            if (s === 'object') {
+                if (value) {
+                    if (value instanceof Array) {
+                        s = 'array';
+                    } else if (value instanceof RegExp) {
+                        s = 'regexp';
+                    } else if (value instanceof Date) {
+                        s = 'date';
+                    }
+                } else {
+                    s = 'null';
+                }
+            }
+            return s;
+        }
+
+        var str, arg, argType, i, l;
+        if (!(func instanceof Function || typeof func === 'string' || func instanceof String)) {
+            throw "Wrong use of WebPage#evaluate";
+        }
+        str = 'function() { return (' + func.toString() + ')(';
+        for (i = 1, l = arguments.length; i < l; i++) {
+            arg = arguments[i];
+            argType = detectType(arg);
+
+            switch (argType) {
+            case "object":      //< for type "object"
+            case "array":       //< for type "array"
+                str += JSON.stringify(arg) + ","
+                break;
+            case "date":        //< for type "date"
+                str += "new Date(" + JSON.stringify(arg) + "),"
+                break;
+            case "string":      //< for type "string"
+                str += quoteString(arg) + ',';
+                break;
+            default:            // for types: "null", "number", "function", "regexp", "undefined"
+                str += arg + ',';
+                break;
+            }
+        }
+        str = str.replace(/,$/, '') + '); }';
+        return this.evaluateJavaScript(str);
+    };`

data/lib/capybara/poltergeist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: PhantomJS driver for Capybara