1.1.22

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.22
+
+* Fix another outstanding bug related to https://github.com/getsentry/raven-js/issues/377 that wasn't fully resolved with 1.1.21
+* Laid groundwork for pluggable transports, but not ready for public consumption yet
+
 ## 1.1.21
 
 * Fix a bug where calling `captureException` before calling `Raven.config()` would trigger it's own exception. See: https://github.com/getsentry/raven-js/issues/377

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "dependencies": {},
   "main": "dist/raven.js",
   "ignore": [

dist/raven.js

@@ -1,4 +1,4 @@
-/*! Raven.js 1.1.21 (8995c6d) | github.com/getsentry/raven-js */
+/*! Raven.js 1.1.22 (6278810) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
@@ -1101,7 +1101,6 @@ var _Raven = window.Raven,
         maxMessageLength: 100,
         extra: {}
     },
-    authQueryString,
     isRavenInstalled = false,
     objectPrototype = Object.prototype,
     // capture references to window.console *and* all its methods first
@@ -1119,7 +1118,7 @@ for (var method in originalConsole) {
  * @this {Raven}
  */
 var Raven = {
-    VERSION: '1.1.21',
+    VERSION: '1.1.22',
 
     debug: true,
 
@@ -1192,8 +1191,6 @@ var Raven = {
 
         TraceKit.collectWindowErrors = !!globalOptions.collectWindowErrors;
 
-        setAuthQueryString();
-
         // return for chaining
         return Raven;
     },
@@ -1586,15 +1583,6 @@ function each(obj, callback) {
     }
 }
 
-
-function setAuthQueryString() {
-    authQueryString =
-        '?sentry_version=4' +
-        '&sentry_client=raven-js/' + Raven.VERSION +
-        '&sentry_key=' + globalKey;
-}
-
-
 function handleStackInfo(stackInfo, options) {
     var frames = [];
 
@@ -1693,7 +1681,7 @@ function extractContextFromFrame(frame) {
 function processException(type, message, fileurl, lineno, frames, options) {
     var stacktrace, i, fullMessage;
 
-    if (globalOptions.ignoreErrors.test(message)) return;
+    if (!!globalOptions.ignoreErrors.test && globalOptions.ignoreErrors.test(message)) return;
 
     message += '';
     message = truncate(message, globalOptions.maxMessageLength);
@@ -1717,8 +1705,8 @@ function processException(type, message, fileurl, lineno, frames, options) {
         };
     }
 
-    if (globalOptions.ignoreUrls && globalOptions.ignoreUrls.test(fileurl)) return;
-    if (globalOptions.whitelistUrls && !globalOptions.whitelistUrls.test(fileurl)) return;
+    if (!!globalOptions.ignoreUrls.test && globalOptions.ignoreUrls.test(fileurl)) return;
+    if (!!globalOptions.whitelistUrls.test && !globalOptions.whitelistUrls.test(fileurl)) return;
 
     // Fire away!
     send(
@@ -1826,35 +1814,46 @@ function send(data) {
     // Set lastEventId after we know the error should actually be sent
     lastEventId = data.event_id || (data.event_id = uuid4());
 
-    makeRequest(data);
-}
+    logDebug('debug', 'Raven about to send:', data);
 
+    if (!isSetup()) return;
 
-function makeRequest(data) {
-    var img,
-        src;
+    (globalOptions.transport || makeRequest)({
+        url: globalServer,
+        auth: {
+            sentry_version: '4',
+            sentry_client: 'raven-js/' + Raven.VERSION,
+            sentry_key: globalKey
+        },
+        data: data,
+        options: globalOptions,
+        onSuccess: function success() {
+            triggerEvent('success', {
+                data: data,
+                src: globalServer
+            });
+        },
+        onError: function failure() {
+            triggerEvent('failure', {
+                data: data,
+                src: globalServer
+            });
+        }
+    });
+}
 
-    logDebug('debug', 'Raven about to send:', data);
+function makeRequest(opts) {
+    // Tack on sentry_data to auth options, which get urlencoded
+    opts.auth.sentry_data = JSON.stringify(opts.data);
 
-    if (!isSetup()) return;
+    var img = newImage(),
+        src = opts.url + '?' + urlencode(opts.auth);
 
-    img = newImage();
-    src = globalServer + authQueryString + '&sentry_data=' + encodeURIComponent(JSON.stringify(data));
-    if (globalOptions.crossOrigin || globalOptions.crossOrigin === '') {
-        img.crossOrigin = globalOptions.crossOrigin;
+    if (opts.options.crossOrigin || opts.options.crossOrigin === '') {
+        img.crossOrigin = opts.options.crossOrigin;
     }
-    img.onload = function success() {
-        triggerEvent('success', {
-            data: data,
-            src: src
-        });
-    };
-    img.onerror = img.onabort = function failure() {
-        triggerEvent('failure', {
-            data: data,
-            src: src
-        });
-    };
+    img.onload = opts.onSuccess;
+    img.onerror = img.onabort = opts.onError;
     img.src = src;
 }
 
@@ -1948,6 +1947,15 @@ function afterLoad() {
         Raven.config(RavenConfig.dsn, RavenConfig.config).install();
     }
 }
+
+function urlencode(o) {
+    var pairs = [];
+    each(o, function(key, value) {
+        pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+    });
+    return pairs.join('&');
+}
+
 afterLoad();
 
 // Expose Raven to the world

docs/index.rst

@@ -27,7 +27,7 @@ you can use our CDN:
 
 .. sourcecode:: html
 
-    <script src="//cdn.ravenjs.com/1.1.21/raven.min.js"></script>
+    <script src="//cdn.ravenjs.com/1.1.22/raven.min.js"></script>
 
 Configuring the Project
 -----------------------

docs/install.rst

@@ -9,7 +9,7 @@ So for example:
 .. sourcecode:: html
 
     <script src="jquery.js"></script>
-    <script src="//cdn.ravenjs.com/1.1.21/jquery,native/raven.min.js"></script>
+    <script src="//cdn.ravenjs.com/1.1.22/jquery,native/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
     <script src="app.js"></script>
 
@@ -28,7 +28,7 @@ Our CDN distributes builds with and without :doc:`plugins <plugins>`.
 
 .. sourcecode:: html
 
-    <script src="//cdn.ravenjs.com/1.1.21/raven.min.js"></script>
+    <script src="//cdn.ravenjs.com/1.1.22/raven.min.js"></script>
 
 **We highly recommend trying out a plugin or two since it'll greatly
 improve the chances that we can collect good information.**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "license": "BSD-2-Clause",
   "homepage": "https://getsentry.com",
   "scripts": {