Merge remote-tracking branch 'origin/pr/77' into stable

Author: Eric Wendelin

README.md

@@ -77,6 +77,7 @@ It is currently tested and working on:
  - K-Meleon 1.5.3+
  - Epiphany 2.28.0+
  - Iceape 1.1+
+ - PhantomJS
 
 ## Contributions [![Stories in Ready](http://badge.waffle.io/stacktracejs/stacktrace.js.png)](http://waffle.io/stacktracejs/stacktrace.js)  
 

stacktrace.js

@@ -64,6 +64,10 @@
          * @return {String} mode of operation for the exception
          */
         mode: function(e) {
+            if (typeof window !== 'undefined' && window.navigator.userAgent.indexOf('PhantomJS') > -1) {
+                return 'phantomjs';
+            }
+
             if (e['arguments'] && e.stack) {
                 return 'chrome';
             }
@@ -278,6 +282,24 @@
             return result;
         },
 
+        phantomjs: function(e) {
+            var ANON = '{anonymous}', lineRE = /(\S+) \((\S+)\)/i;
+            var lines = e.stack.split('\n'), result = [];
+
+            for (var i = 1, len = lines.length; i < len; i++) {
+                lines[i] = lines[i].replace(/^\s+at\s+/gm, '');
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    result.push(match[1] + '()@' + match[2]);
+                }
+                else {
+                    result.push(ANON + '()@' + lines[i]);
+                }
+            }
+
+            return result;
+        },
+
         // Safari 5-, IE 9-, and others
         other: function(curr) {
             var ANON = '{anonymous}', fnRE = /function(?:\s+([\w$]+))?\s*\(/, stack = [], fn, args, maxStackSize = 10;

test/CapturedExceptions.js

@@ -350,3 +350,20 @@ CapturedExceptions.node_simple = {
         '    at ReadStream.onkeypress (readline.js:99:10)',
     'arguments': [ 'x' ]
 };
+
+CapturedExceptions.phantomjs = {
+    message: "'undefined' is not a function (evaluating 'this.undef()')",
+    line: 852,
+    sourceId: 163911584,
+    sourceURL: 'http://localhost:10015/packages/peerdb.js?fe1089e34c777737beadb68e0657ca0bbe2e54b4',
+    name: 'TypeError',
+    stack: "TypeError: 'undefined' is not a function (evaluating 'this.undef()')\n" +
+        '    at http://localhost:10015/packages/peerdb.js?fe1089e34c777737beadb68e0657ca0bbe2e54b4:852\n' +
+        '    at http://localhost:10015/packages/meteor-peerdb:tests.js?36eb638af853e313daf7222afac0edaf9eb3bbc6:4476\n' +
+        '    at http://localhost:10015/packages/meteor-peerdb:tests.js?36eb638af853e313daf7222afac0edaf9eb3bbc6:4481\n' +
+        '    at http://localhost:10015/packages/tinytest.js?3fa2a6f5f9fadecfe9cf5d3420b3a1c719407388:393\n' +
+        '    at http://localhost:10015/packages/meteor.js?148e9381d225ecad703f4b858769b636ff7a2537:794\n' +
+        '    at http://localhost:10015/packages/meteor.js?148e9381d225ecad703f4b858769b636ff7a2537:379\n' +
+        '    at http://localhost:10015/packages/meteor.js?148e9381d225ecad703f4b858769b636ff7a2537:822\n' +
+        '    at onGlobalMessage (http://localhost:10015/packages/meteor.js?148e9381d225ecad703f4b858769b636ff7a2537:316)'
+};

test/TestStacktrace.js

@@ -52,7 +52,7 @@
             };
         },
         createModeStubs: function(p, stub) {
-            var modes = ['other', 'opera9', 'opera10a', 'opera10b', 'opera11', 'firefox', 'safari', 'ie', 'chrome'];
+            var modes = ['other', 'opera9', 'opera10a', 'opera10b', 'opera11', 'firefox', 'safari', 'ie', 'chrome', 'phantomjs'];
             for (var i = 0, len = modes.length; i < len; i++) {
                 var mode = modes[i];
                 p[mode] = stub || this.createModeStub(mode);
@@ -88,7 +88,7 @@
 
     test("mode", function() {
         expect(1);
-        equals("chrome safari firefox ie other opera9 opera10a opera10b opera11".indexOf(pst.mode(UnitTest.fn.createGenericError())) >= 0, true);
+        equals("chrome safari firefox ie other opera9 opera10a opera10b opera11 phantomjs".indexOf(pst.mode(UnitTest.fn.createGenericError())) >= 0, true);
     });
 
     test("run mode", function() {
@@ -531,6 +531,16 @@
         equals(message[2], 'onclick@http://jenkins.eriwen.com/job/stacktrace.js/ws/test/functional/ExceptionLab.html:82:1');
     });
 
+    test("phantomjs", function() {
+        var e = [CapturedExceptions.phantomjs];
+        expect(2); // 2 * e.length
+        for (var i = 0; i < e.length; i++) {
+            var message = pst.phantomjs(e[i]);
+            equals(message.length, 8, 'number of stack entries');
+            equals(message[message.length - 1].indexOf('onGlobalMessage()') >= 0, true, 'onGlobalMessage() is 1st from the bottom of stack');
+        }
+    });
+
     test("other", function() {
         expect(5);
         var results = [];