ensure angular and react-native wrap callbacks without altering Raven API

Author: Thomas Grainger

plugins/angular.js

@@ -5,6 +5,8 @@
  */
 'use strict';
 
+var wrappedCallback = require('../utils/wrappedCallback').wrappedCallback;
+
 // 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+)$/;
 
@@ -38,9 +40,9 @@ function angularPlugin(Raven, angular) {
         .provider('Raven',  RavenProvider)
         .config(['$provide', ExceptionHandlerProvider]);
 
-    Raven.wrapDataCallback(function(data) {
+    Raven.setDataCallback(wrappedCallback(function(data) {
         return angularPlugin._normalizeData(data);
-    });
+    }));
 }
 
 angularPlugin._normalizeData = function (data) {

plugins/react-native.js

@@ -19,6 +19,9 @@
  */
 'use strict';
 
+
+var wrappedCallback = require('../utils/wrappedCallback').wrappedCallback;
+
 // Example React Native path format (iOS):
 // /var/containers/Bundle/Application/{DEVICE_ID}/HelloWorld.app/main.jsbundle
 
@@ -60,9 +63,9 @@ function reactNativePlugin(Raven, options) {
     Raven.setTransport(reactNativePlugin._transport);
 
     // Use data callback to strip device-specific paths from stack traces
-    Raven.wrapDataCallback(function(data) {
+    Raven.setDataCallback(wrappedCallback(function(data) {
         return reactNativePlugin._normalizeData(data, options.pathStrip);
-    });
+    }));
 
     // Check for a previously persisted payload, and report it.
     reactNativePlugin._restorePayload()

src/raven.js

@@ -33,18 +33,6 @@ function keepOriginalCallback(original, callback) {
     callback;
 }
 
-function wrappedCallback(callback) {
-    function dataCallback(data, original) {
-      var normalizedData = callback(data) || data;
-      if (original) {
-          return original(normalizedData) || normalizedData;
-      }
-      return normalizedData;
-    }
-
-    return dataCallback;
-}
-
 // First, check for JSON support
 // If there is no JSON, we no-op the core features of Raven
 // since JSON is required to encode the payload
@@ -574,10 +562,6 @@ Raven.prototype = {
         return this;
     },
 
-    wrapDataCallback: function(callback) {
-      return this.setDataCallback(wrappedCallback(callback));
-    },
-
     /*
      * Set the breadcrumbCallback option
      *
@@ -592,10 +576,6 @@ Raven.prototype = {
         return this;
     },
 
-    wrapBreadcrumbCallback: function(callback) {
-      return this.setBreadcrumbCallback(wrappedCallback(callback));
-    },
-
     /*
      * Set the shouldSendCallback option
      *
@@ -610,10 +590,6 @@ Raven.prototype = {
         return this;
     },
 
-    wrapShouldSendCallback: function(callback) {
-      return this.setShouldSendCallback(wrappedCallback(callback));
-    },
-
     /**
      * Override the default HTTP transport mechanism that transmits data
      * to the Sentry server.

src/utils.js

@@ -14,7 +14,20 @@ function isError(what) {
         what instanceof Error;
 }
 
+function wrappedCallback(callback) {
+    function dataCallback(data, original) {
+      var normalizedData = callback(data) || data;
+      if (original) {
+          return original(normalizedData) || normalizedData;
+      }
+      return normalizedData;
+    }
+
+    return dataCallback;
+}
+
 module.exports = {
     isObject: isObject,
-    isError: isError
-};
+    isError: isError,
+    wrappedCallback: wrappedCallback
+};