Support options in captureException and captureMessage

.jshintignore

@@ -0,0 +1,4 @@
+test/
+dist/
+src/vendor/
+phantom-js-loader.js

.jshintrc

@@ -0,0 +1,7 @@
+{
+ "strict": true,
+ "browser": true,
+ "predef": [
+ "parseUri"
+ ]
+}

.travis.yml

@@ -2,7 +2,10 @@
 language: node_js
 node_js:
  - 0.6
-script: make test
+before_script:
+ - npm install -g jshint
+script:
+ - make test
 branches:
  only:
  - develop

Makefile

@@ -28,5 +28,6 @@ raven:
 	mv ${TMP} ${RAVEN_MIN}
 
 test:
+	jshint .
 	phantomjs phantom-js-loader.js
 	phantomjs phantom-js-loader.js zepto

src/raven.js

@@ -9,6 +9,8 @@
 (function(){
  // Save a reference to the global object (`window` in the browser, `global`
  // on the server).
+ "use strict";
+
  var root = this;
 
  var Raven;
@@ -61,14 +63,14 @@
  });
 
  // Expand server base URLs into API URLs
- $.each(self.options['servers'], function(i, server) {
+ $.each(self.options.servers, function(i, server) {
  // Add a trailing slash if one isn't provided
  if (server.slice(-1) !== '/') {
  server += '/';
  }
- servers.push(server + 'api/' + self.options['projectId'] + '/store/');
+ servers.push(server + 'api/' + self.options.projectId + '/store/');
  });
- self.options['servers'] = servers;
+ self.options.servers = servers;
 
  };
 
@@ -102,7 +104,7 @@
  .getAllResponseHeaders();
  }
 
- headers["Referer"] = document.referrer;
+ headers.Referer = document.referrer;
  headers["User-Agent"] = navigator.userAgent;
  return headers;
  };
@@ -145,8 +147,8 @@
  return header;
  };
 
- Raven.captureException = function(e) {
- var lineno, traceback, fileurl;
+ Raven.captureException = function(e, options) {
+ var label, lineno, fileurl, traceback;
 
  if (e.line) { // WebKit
  lineno = e.line;
@@ -160,25 +162,85 @@
  fileurl = e.fileName;
  }
 
- if (e.arguments && e.stack) {
- traceback = this.chromeTraceback(e);
+ if (e["arguments"] && e.stack) {
+ traceback = self.chromeTraceback(e);
  } else if (e.stack) {
  // Detect edge cases where Chrome doesn't have 'arguments'
  if (e.stack.indexOf('@') == -1) {
- traceback = this.chromeTraceback(e);
+ traceback = self.chromeTraceback(e);
  } else {
- traceback = this.firefoxOrSafariTraceback(e);
+ traceback = self.firefoxOrSafariTraceback(e);
  }
  } else {
  traceback = [{"filename": fileurl, "lineno": lineno}];
- traceback = traceback.concat(this.otherTraceback(arguments.callee));
+ traceback = traceback.concat(self.otherTraceback(Raven.captureException));
  }
 
- self.process(e, fileurl, lineno, traceback);
+ self.process(e, fileurl, lineno, traceback, options);
  };
 
- Raven.captureMessage = function(msg) {
- self.process(msg);
+ Raven.captureMessage = function(msg, options) {
+ var data = self.arrayMerge({
+ 'message': msg
+ }, options);
+
+ self.send(data);
+ };
+
+ Raven.process = function(message, fileurl, lineno, traceback, options) {
+ var type, stacktrace, label, data;
+
+ if (typeof(message) === 'object') {
+ type = message.name;
+ message = message.message;
+ }
+
+ if ($.inArray(message, self.options.ignoreErrors) >= 0) {
+ return;
+ }
+
+
+ if (traceback) {
+ stacktrace = {"frames": traceback};
+ fileurl = fileurl || traceback[0].filename;
+ } else if (fileurl) {
+ stacktrace = {
+ "frames": [{
+ "filename": fileurl,
+ "lineno": lineno
+ }]
+ };
+ }
+
+ for (var i = 0; i < self.options.ignoreUrls.length; i++) {
+ if (self.options.ignoreUrls[i].test(fileurl)) {
+ return;
+ }
+ }
+
+ label = lineno ? message + " at " + lineno : message;
+
+ data = self.arrayMerge({
+ "sentry.interfaces.Exception": {
+ "type": type,
+ "value": message
+ },
+ "sentry.interfaces.Stacktrace": stacktrace,
+ "culprit": fileurl,
+ "message": label
+ }, options);
+
+ self.send(data);
+ };
+
+ Raven.arrayMerge = function(arr1, arr2) {
+ if (typeof(arr2) === "undefined") {
+ return arr1;
+ }
+ $.each(arr2, function(key, value){
+ arr1[key] = value;
+ });
+ return arr1;
  };
 
  Raven.trimString = function(str) {
@@ -306,9 +368,9 @@
  traceback = [],
  max = 9;
  while (callee && traceback.length < max) {
- fn = callee.name || (this.funcNameRE.test(callee.toString()) ? RegExp.$1 || ANON : ANON);
- if (callee.arguments) {
- args = this.stringifyArguments(callee.arguments);
+ fn = callee.name || (self.funcNameRE.test(callee.toString()) ? RegExp.$1 || ANON : ANON);
+ if (callee["arguments"]) {
+ args = self.stringifyArguments(callee["arguments"]);
  } else {
  args = undefined;
  }
@@ -359,61 +421,66 @@
  return results;
  };
 
- Raven.process = function(message, fileurl, lineno, traceback, timestamp) {
- var label, stacktrace, data, encoded_msg, type,
- url = root.location.protocol + '//' + root.location.host + root.location.pathname,
- querystring = root.location.search.slice(1); // Remove the ?
+ Raven.getUTCNow = function() {
+ var now = new Date();
+
+ return new Date(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(),
+ now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds());
+ };
 
- if (typeof(message) === 'object') {
- type = message.name;
- message = message.message;
+ Raven.pad = function(n, amount) {
+ var i,
+ len = ('' + n).length;
+ if (typeof(amount) === "undefined") {
+ amount = 2;
  }
- if ($.inArray(message, self.options.ignoreErrors) >= 0) {
- return;
+ if (len >= amount) {
+ return n;
  }
-
- for (var i = 0; i < self.options.ignoreUrls.length; i++) {
- if (self.options.ignoreUrls[i].test(fileurl)) {
- return;
- }
+ for (i=0; i < (amount - len); i++) {
+ n = '0' + n;
  }
+ return n;
+ };
 
- label = lineno ? message + " at " + lineno : message;
-
- if (traceback) {
- stacktrace = {"frames": traceback};
- fileurl = fileurl || traceback[0].filename;
- } else if (fileurl) {
- stacktrace = {
- "frames": [{
- "filename": fileurl,
- "lineno": lineno
- }]
- };
+ Raven.dateToISOString = function(date) {
+ if (Date.prototype.toISOString) {
+ return date.toISOString();
  }
+
+ return date.getUTCFullYear() + '-' +
+ self.pad(date.getUTCMonth() + 1) + '-' +
+ self.pad(date.getUTCDate()) + 'T' +
+ self.pad(date.getUTCHours()) + ':' +
+ self.pad(date.getUTCMinutes()) + ':' +
+ self.pad(date.getUTCSeconds()) + '.' +
+ self.pad(date.getUTCMilliseconds(), 3) + 'Z';
+ };
 
- data = {
- "message": label,
- "culprit": fileurl,
- "sentry.interfaces.Stacktrace": stacktrace,
- "sentry.interfaces.Exception": {
- "type": type,
- "value": message
- },
+ Raven.send = function(data) {
+ var encoded_msg,
+ timestamp= new Date().getTime(),
+ url = root.location.protocol + '//' + root.location.host + root.location.pathname,
+ querystring = root.location.search.slice(1); // Remove the ?
+
+ data = self.arrayMerge({
  "project": self.options.projectId,
  "logger": self.options.logger,
- "site": self.options.site
- };
+ "site": self.options.site,
+ "timestamp": self.getUTCNow(),
+ "sentry.interfaces.Http": {
+ "url": url,
+ "querystring": querystring,
+ "headers": self.getHeaders()
+ }
+ }, data);
 
- data["sentry.interfaces.Http"] = {
- "url": url,
- "querystring": querystring,
- "headers": self.getHeaders()
- };
+ if (typeof(self.options.dataCallback) == 'function') {
+ data = self.options.dataCallback(data);
+ }
 
-if (typeof(self.options.dataCallback) == 'function') data = self.options.dataCallback(data);
+data.timestamp = self.dateToISOString(data.timestamp);
 
- timestamp = timestamp || (new Date()).getTime();
  encoded_msg = JSON.stringify(data);
  self.getSignature(encoded_msg, timestamp, function(signature) {
  var header = self.getAuthHeader(signature, timestamp);

test/exception.js

@@ -29,6 +29,8 @@ $(document).ready(function() {
  }
  }
 
+ equal(ajax_calls.length, 1);
+
  data = JSON.parse(ajax_calls[0].data);
 
  equal(data.logger, 'javascript',
@@ -43,18 +45,18 @@ $(document).ready(function() {
  'the culprit should be the exception.js unit test file');
 
  frame = data['sentry.interfaces.Stacktrace'].frames[0];
- equal(frame.function, 'outlandishClaim');
+ equal(frame["function"], 'outlandishClaim');
  equal(frame.lineno, '7');
 
  // if the browser provides the arguments in the error
  // verify they were parsed
  if (caughtErr.stack.indexOf("I am Batman") !== -1) {
- equal(frame.vars.arguments[0], '"I am Batman"');
- equal(frame.vars.arguments[1], '"Seriously"');
+ equal(frame.vars["arguments"][0], '"I am Batman"');
+ equal(frame.vars["arguments"][1], '"Seriously"');
  }
 
  frame = data['sentry.interfaces.Stacktrace'].frames[1];
- equal(frame.function, 'giveMeAnError');
+ equal(frame["function"], 'giveMeAnError');
  equal(frame.lineno, '3');
  }
  });

test/process.js

@@ -15,7 +15,8 @@ $(document).ready(function() {
  lineno = 12;
 
  test("should correctly capture the data", function() {
- Raven.process(message, fileurl, lineno, undefined, timestamp);
+ Raven.process(message, fileurl, lineno, undefined);
+ notEqual(ajax_calls.length, 0);
  var data = JSON.parse(ajax_calls[0].data);
 
  equal(data['culprit'], fileurl);
@@ -26,7 +27,8 @@ $(document).ready(function() {
  });
 
  test("should correctly generate Sentry headers", function() {
- Raven.process(message, fileurl, lineno, undefined, timestamp);
+ Raven.process(message, fileurl, lineno, undefined);
+ notEqual(ajax_calls.length, 0);
  var values = parseAuthHeader(ajax_calls[0].headers['X-Sentry-Auth']);
 
  equal(values.sentry_key, 'e89652ec30b94d9db6ea6f28580ab499',
@@ -41,16 +43,18 @@ $(document).ready(function() {
 
 	test("should hit an external url for signature if desired", function() {
  Raven.config({"signatureUrl": "/api/sign-error/"});
- Raven.process(message, fileurl, lineno, undefined, timestamp);
+ Raven.process(message, fileurl, lineno, undefined);
+
+ notEqual(ajax_calls.length, 0);
 
  // The first Ajax call in this case should be to the signature URL
  equal(ajax_calls[0].url, '/api/sign-error/');
- equal(ajax_calls[0].data.timestamp, timestamp);
  notEqual(ajax_calls[1].headers['X-Sentry-Auth'].indexOf('dummy-signature'), -1);
 	});
 
 	test("should omit 'at' if there is no line number provided", function() {
  Raven.process('ManuallyThrownError');
+ notEqual(ajax_calls.length, 0);
 
  var data = JSON.parse(ajax_calls[0].data);
 
@@ -74,6 +78,7 @@ $(document).ready(function() {
 
  test("should send a proper url", function() {
  Raven.process("Fail");
+ notEqual(ajax_calls.length, 0);
 
  var data = JSON.parse(ajax_calls[0].data);
  equal(data["sentry.interfaces.Http"].url.indexOf('undefined'), -1, "If the url contains the string 'undefined' it probably means there is an issue.");