Merge pull request #575 from getsentry/3.0.4

benvinegar · benvinegar · commit 6bed42fa7930 · 2016-05-10T16:40:46.000-07:00
3.0.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.4
+* BUGFIX: Navigation breadcrumbs now include query strings and document fragment (#). See: https://github.com/getsentry/raven-js/issues/573
+* BUGFIX: Remove errant `throw` call in _makeRequest affecting some Raven configs. See: https://github.com/getsentry/raven-js/pull/572
+
 ## 3.0.3
 * BUGFIX: Fix pushState instrumentation breaking on non-string URL args. See: https://github.com/getsentry/raven-js/issues/569  
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "dependencies": {},
   "main": "dist/raven.js",
   "ignore": [
diff --git a/dist/plugins/angular.js b/dist/plugins/angular.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.0.3 (3738576) | github.com/getsentry/raven-js */
+/*! Raven.js 3.0.4 (0784c3c) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/angular.min.js b/dist/plugins/angular.min.js
diff --git a/dist/plugins/console.js b/dist/plugins/console.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.0.3 (3738576) | github.com/getsentry/raven-js */
+/*! Raven.js 3.0.4 (0784c3c) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/console.min.js b/dist/plugins/console.min.js
diff --git a/dist/plugins/ember.js b/dist/plugins/ember.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.0.3 (3738576) | github.com/getsentry/raven-js */
+/*! Raven.js 3.0.4 (0784c3c) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/ember.min.js b/dist/plugins/ember.min.js
diff --git a/dist/plugins/require.js b/dist/plugins/require.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.0.3 (3738576) | github.com/getsentry/raven-js */
+/*! Raven.js 3.0.4 (0784c3c) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/require.min.js b/dist/plugins/require.min.js
diff --git a/dist/raven.js b/dist/raven.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.0.3 (3738576) | github.com/getsentry/raven-js */
+/*! Raven.js 3.0.4 (0784c3c) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
@@ -150,7 +150,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.0.3',
+    VERSION: '3.0.4',
 
     debug: false,
 
@@ -778,9 +778,9 @@ Raven.prototype = {
         // Use only the path component of the URL if the URL matches the current
         // document (almost all the time when using pushState)
         if (parsedLoc.protocol === parsedTo.protocol && parsedLoc.host === parsedTo.host)
-            to = parsedTo.path;
+            to = parsedTo.relative;
         if (parsedLoc.protocol === parsedFrom.protocol && parsedLoc.host === parsedFrom.host)
-            from = parsedFrom.path;
+            from = parsedFrom.relative;
 
         this.captureBreadcrumb({
             category: 'navigation',
@@ -1357,9 +1357,6 @@ Raven.prototype = {
     _makeRequest: function(opts) {
         var request = new XMLHttpRequest();
 
-        if (request.send.toString() === 'function send() { [native code] }') {
-            throw new Error('shouldnt get here');
-        }
         // if browser doesn't support CORS (e.g. IE7), we are out of luck
         var hasCORS =
             'withCredentials' in request ||
@@ -1581,10 +1578,15 @@ function urlencode(o) {
 function parseUrl(url) {
     var match = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/);
     if (!match) return {};
+
+    // coerce to undefined values to empty string so we don't get 'undefined'
+    var query = match[6] || '';
+    var fragment = match[8] || '';
     return {
         protocol: match[2],
         host: match[4],
-        path: match[5]
+        path: match[5],
+        relative: match[5] + query + fragment // everything minus origin
     };
 }
 function uuid4() {
diff --git a/dist/raven.min.js b/dist/raven.min.js
diff --git a/dist/raven.min.js.map b/dist/raven.min.js.map
diff --git a/dist/sri.json b/dist/sri.json
@@ -1,20 +1,20 @@
 {
   "@dist/raven.js": {
     "hashes": {
-      "sha256": "QjY8F5qPj7FAZ9zHS5G4O8047voJ/Y5cx92SRno24uc=",
-      "sha512": "1QM0Ou9Yp+QZ86ZZgqBFLgXFlwi3Igi/Yte1VvgsM9nQnapbyyhd5NdkMBrt73lFCcMXcMSQwEJSRKf4VKRd8A=="
+      "sha256": "BhyUFN42x1X3lpmcdqb9FeEEDX120bZD5Tviil7eN+U=",
+      "sha512": "Dcum5QDTkYiE2J8Ds/8UcgOv18moIIbEg8f/2aYWcnl7MKx/015DAaqM0KmRI/bAL1r1l3r5E89H9eKfDPyBtg=="
     },
     "type": null,
-    "integrity": "sha256-QjY8F5qPj7FAZ9zHS5G4O8047voJ/Y5cx92SRno24uc= sha512-1QM0Ou9Yp+QZ86ZZgqBFLgXFlwi3Igi/Yte1VvgsM9nQnapbyyhd5NdkMBrt73lFCcMXcMSQwEJSRKf4VKRd8A==",
+    "integrity": "sha256-BhyUFN42x1X3lpmcdqb9FeEEDX120bZD5Tviil7eN+U= sha512-Dcum5QDTkYiE2J8Ds/8UcgOv18moIIbEg8f/2aYWcnl7MKx/015DAaqM0KmRI/bAL1r1l3r5E89H9eKfDPyBtg==",
     "path": "dist/raven.js"
   },
   "@dist/raven.min.js": {
     "hashes": {
-      "sha256": "RquNiADCm9QcEuQSH0dRBOBv/KEzrceIvP0bWENzzrU=",
-      "sha512": "Utvtpxczqgj+B0P8w771re39iFYld8tRvWzez6dU8vVjmFwQFb8j3o7tFPgkg4qXw4xgZNLlFLcKReA0U3wDww=="
+      "sha256": "g9X2G0d7lq0Uv4i8OTMimZZ4V1WbnbDo6krrRaixbGI=",
+      "sha512": "sTnnzoocXXoQsv0lJQHeLHyDmU9RL9jvzOzyCRuWByF+XlELresM7b5exk1vBu9E8B1o/kxA99ZcgkOeYBw8SQ=="
     },
     "type": null,
-    "integrity": "sha256-RquNiADCm9QcEuQSH0dRBOBv/KEzrceIvP0bWENzzrU= sha512-Utvtpxczqgj+B0P8w771re39iFYld8tRvWzez6dU8vVjmFwQFb8j3o7tFPgkg4qXw4xgZNLlFLcKReA0U3wDww==",
+    "integrity": "sha256-g9X2G0d7lq0Uv4i8OTMimZZ4V1WbnbDo6krrRaixbGI= sha512-sTnnzoocXXoQsv0lJQHeLHyDmU9RL9jvzOzyCRuWByF+XlELresM7b5exk1vBu9E8B1o/kxA99ZcgkOeYBw8SQ==",
     "path": "dist/raven.min.js"
   }
 }
diff --git a/docs/config.rst b/docs/config.rst
@@ -237,7 +237,7 @@ Putting it all together
     <body>
         ...
         <script src="jquery.min.js"></script>
-        <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+        <script src="https://cdn.ravenjs.com/3.0.4/raven.min.js"></script>
         <script>
             Raven.config('___PUBLIC_DSN___', {
                 logger: 'my-logger',
diff --git a/docs/index.rst b/docs/index.rst
@@ -26,7 +26,7 @@ scripts.  For all details see :doc:`install`.
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/raven.min.js"></script>
 
 
 Configuring the Client
diff --git a/docs/install.rst b/docs/install.rst
@@ -9,7 +9,7 @@ So for example:
 .. sourcecode:: html
 
     <script src="jquery.js"></script>
-    <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/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:`integrations <integrations/ind
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/raven.min.js"></script>
 
 This version does not include any plugins. See `ravenjs.com
 <http://ravenjs.com/>`_ for more information about plugins and getting
diff --git a/docs/integrations/angular.rst b/docs/integrations/angular.rst
@@ -27,7 +27,7 @@ Example:
 .. sourcecode:: html
 
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
-    <script src="https://cdn.ravenjs.com/3.0.3/angular/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/angular/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
 
 Note that this CDN build auto-initializes the Angular plugin.
diff --git a/docs/integrations/backbone.rst b/docs/integrations/backbone.rst
@@ -9,7 +9,7 @@ after you load all other external libraries (like jQuery), but before your code.
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/raven.min.js"></script>
 
 Configuring the Client
 ----------------------
diff --git a/docs/integrations/ember.rst b/docs/integrations/ember.rst
@@ -23,7 +23,7 @@ Example:
 .. sourcecode:: html
 
     <script src="http://builds.emberjs.com/tags/v2.3.1/ember.prod.js"></script>
-    <script src="https://cdn.ravenjs.com/3.0.3/ember/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/ember/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
 
 Note that this CDN build auto-initializes the Ember plugin.
diff --git a/docs/integrations/react.rst b/docs/integrations/react.rst
@@ -9,7 +9,7 @@ after you load all other external libraries (like jQuery), but before your code.
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.0.3/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.0.4/raven.min.js"></script>
 
 Configuring the Client
 ----------------------
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "license": "BSD-2-Clause",
   "homepage": "https://getsentry.com",
   "scripts": {
diff --git a/src/raven.js b/src/raven.js
@@ -86,7 +86,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.0.3',
+    VERSION: '3.0.4',
 
     debug: false,
 
diff --git a/test/raven.test.js b/test/raven.test.js
@@ -1074,7 +1074,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.0.3',
+                sentry_client: 'raven-js/3.0.4',
                 sentry_key: 'abc',
                 sentry_version: '7'
             });
@@ -1121,7 +1121,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.0.3',
+                sentry_client: 'raven-js/3.0.4',
                 sentry_key: 'abc',
                 sentry_secret: 'def',
                 sentry_version: '7'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "raven-js",`
`3`		`- "version": "3.0.3",`
	`3`	`+ "version": "3.0.4",`
`4`	`4`	`"dependencies": {},`
`5`	`5`	`"main": "dist/raven.js",`
`6`	`6`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/! Raven.js 3.0.3 (3738576) \| github.com/getsentry/raven-js /`
	`1`	`+/! Raven.js 3.0.4 (0784c3c) \| github.com/getsentry/raven-js /`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* Includes TraceKit`