Move into angular plugin

Author: mattrobenolt

plugins/angular.js

@@ -24,18 +24,39 @@ function ExceptionHandlerProvider($provide) {
 }
 
 function exceptionHandler(Raven, $delegate) {
-    return function (ex, cause)     {
+    return function (ex, cause) {
         Raven.captureException(ex, {
             extra: { cause: cause }
         });
         $delegate(ex, cause);
     };
 }
 
+// See https://github.com/angular/angular.js/blob/v1.4.7/src/minErr.js
+var angularPattern = /^\[((?:[$a-zA-Z0-9]+:)?(?:[$a-zA-Z0-9]+))\] (.+?)\n(\S+)$/;
+
 Raven.addPlugin(function () {
     angular.module('ngRaven', [])
         .provider('Raven',  RavenProvider)
         .config(['$provide', ExceptionHandlerProvider]);
 });
 
+Raven.setDataCallback(function(data) {
+    // We only care about mutating an exception
+    var exception = data.exception;
+    if (exception) {
+        exception = exception.values[0];
+        var matches = angularPattern.exec(exception.value);
+
+        if (matches) {
+            // This type now becomes something like: $rootScope:inprog
+            exception.type = matches[1];
+            exception.value = matches[2];
+            data.message = exception.type + ': ' + exception.value;
+            // auto set a new tag specifically for the angular error url
+            data.extra.angularDocs = matches[3];
+        }
+    }
+});
+
 }(typeof window !== 'undefined' ? window : this));

src/raven.js

@@ -481,8 +481,7 @@ function triggerEvent(eventType, options) {
 }
 
 var dsnKeys = 'source protocol user pass host port path'.split(' '),
-    dsnPattern = /^(?:(\w+):)?\/\/(?:(\w+)(:\w+)?@)?([\w\.-]+)(?::(\d+))?(\/.*)/,
-    angularPattern = /^\[((?:[$a-zA-Z0-9]+:)?(?:[$a-zA-Z0-9]+))\] (.+?)\n(\S+)$/;
+    dsnPattern = /^(?:(\w+):)?\/\/(?:(\w+)(:\w+)?@)?([\w\.-]+)(?::(\d+))?(\/.*)/;
 
 function RavenConfigError(message) {
     this.name = 'RavenConfigError';
@@ -569,19 +568,7 @@ function each(obj, callback) {
 }
 
 function handleStackInfo(stackInfo, options) {
-    var frames = [],
-        matches = angularPattern.exec(stackInfo.message);
-
-    if (matches) {
-        stackInfo.name = matches[1];
-        stackInfo.message = matches[2];
-        // auto set a new tag specifically for the angular error url
-        options = options || {};
-        options.extra = objectMerge({
-            // Truncate this message pretty short since it can be insane.
-            ref: truncate(matches[3], 250)
-        }, options.extra);
-    }
+    var frames = [];
 
     if (stackInfo.stack && stackInfo.stack.length) {
         each(stackInfo.stack, function(i, stack) {

test/raven.test.js

@@ -1553,28 +1553,6 @@ describe('globals', function() {
                 'new <anonymous>', 'hey', 'http://example.com', 10, [], undefined
             ]);
         });
-
-        it('should extract angularjs specific error messages', function() {
-            this.sinon.stub(window, 'normalizeFrame').returns(undefined);
-            this.sinon.stub(window, 'processException');
-
-            var stackInfo = {
-                name: 'Error',
-                message: '[$foo:bar] thing happened\nhttp://errors.angularjs.org/cool/story',
-                url: 'http://example.com',
-                lineno: 10
-            };
-
-            handleStackInfo(stackInfo);
-            assert.deepEqual(window.processException.lastCall.args, [
-                '$foo:bar',
-                'thing happened',
-                'http://example.com',
-                10,
-                [],
-                {extra: {ref: 'http://errors.angularjs.org/cool/story'}}
-            ]);
-        });
     });
 
     describe('joinRegExp', function() {