add JsonP logging support + change to opts obj init

techjacker · techjacker · commit 86594a475dae · 2013-10-02T17:16:32.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-node_modules
+node_modules
+*.sublime*
+npm-debug.log
diff --git a/lib/error-response.js b/lib/error-response.js
@@ -5,11 +5,14 @@
 var	_    = require('underscore');
 
 var errResponse = function (err, res) {
-	// if passed response object then return the appropriate response
+
+	var payload = {error: err && err.name || "Error"},
+		errResCode = err && err.resCode || 500,
+		resCode = (this.jsonP === true) ? 200 : err && err.resCode || 500;
+
 	if (err && res && _.isFunction(res.send)) {
-		res.send(err && err.resCode || 500, {
-			error: err && err.name || "Error"
-		});
+		(this.jsonP === true) && (payload.resCode = errResCode);
+		res.send(resCode, payload);
 	}
 };
 
diff --git a/lib/main.js b/lib/main.js
@@ -1,16 +1,14 @@
-/*jslint nomen: true, plusplus: false, sloppy: true, white:true*/
-/*jshint nomen: false, curly: true, plusplus: false, expr:true, undef:true, newcap:true, latedef:true, camelcase:true  */
-/*global module: false, iScroll:false, setTimeout: false, document:false, WebKitCSSMatrix:false, _: false, Backbone: false, backbone: false, $: false, define: false, require: false, console: false, window:false */
-
 var productionLogging   = require('./production'),
 	devLogging			= require('./development'),
 	printError			= require('./print-error'),
 	errResponse			= require('./error-response'),
 	_                   = require('underscore');
 
-var LogClass = function (env, app) {
-	this.env = env;
-	this.app = app;
+// var LogClass = function (env, app) {
+var LogClass = function (opts) {
+	this.env = opts.env;
+	this.app = opts.app;
+	this.jsonP = opts.jsonP;
 	_(this).bindAll('errResponse', 'printError', 'productionLogging', 'devLogging', 'log');
 };
 
@@ -42,12 +40,13 @@ LogClass.prototype.log = function (err, req, res, next) {
 		_.isFunction(next) && next();
 	}
 
-	// always return the error
 	return err;
 };
 
 module.exports = {
 	LogClass: LogClass,
-	production: (new LogClass('production')).log,
-	development: (new LogClass('development')).log
+	production: (new LogClass({env: 'production'})).log,
+	development: (new LogClass({env: 'development'})).log,
+	productionJsonP: (new LogClass({env: 'production', jsonP: true})).log,
+	developmentJsonP: (new LogClass({env: 'development', jsonP: true})).log
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "log-errors",
-  "version": "3.4.2",
+  "version": "4.0.0",
   "license": "BSD",
   "description": "environment aware error logger that can easily be plugged into express.js",
   "tags": [
diff --git a/test/main.test.js b/test/main.test.js
@@ -1,11 +1,8 @@
-/*jslint nomen: true, plusplus: false, sloppy: true, white:true*/
-/*jshint nomen: false, curly: true, plusplus: false, expr:true, undef:true, newcap:true, latedef:true, camelcase:true  */
-/*global module: false, iScroll:false, setTimeout: false, document:false, WebKitCSSMatrix:false, _: false, Backbone: false, backbone: false, $: false, define: false, require: false, console: false, window:false */
-
 var test = require('tap').test,
 	main = require('./../lib/main'),
 	LogClass = main.LogClass,
 	prodLogger = main.production,
+	prodLoggerJsonP = main.productionJsonP,
 	devLogger = main.development;
 
 
@@ -46,9 +43,36 @@ test('next shd be called if it is a function and there is no error', function(t)
 
 test('constructor sets class attrs', function(t) {
 	var app = {something: "else"};
-	t.equal((new LogClass('production')).env, 'production', 'prod logger environment set correctly');
-	t.equal((new LogClass('development')).env, 'development', 'dev logger environment set correctly');
-	t.equal((new LogClass('development', app)).app, app, 'app attr set correctly in dev');
-	t.equal((new LogClass('production', app)).app, app, 'app attr set correctly in prod');
+	t.equal((new LogClass({"env": 'production'})).env, 'production', 'prod logger environment set correctly');
+	t.equal((new LogClass({"env": 'development'})).env, 'development', 'dev logger environment set correctly');
+	t.equal((new LogClass({"env": 'development', "app": app})).app, app, 'app attr set correctly in dev');
+	t.equal((new LogClass({"env": 'production', "app": app})).app, app, 'app attr set correctly in prod');
 	t.end();
 });
+
+
+
+/*--------------------------------------
+jsonP tests
+---------------------------------------*/
+test('handle jsonP', function(t) {
+
+	var errInput = {
+		resCode: 402,
+		name: 'weirdError'
+	},
+	payloadExpected = {
+		resCode: errInput.resCode,
+		error: errInput.name
+	},
+	responseObj = {
+		send: function (resCode, payload) {
+			t.deepEqual(payload, payloadExpected, 'error object returned');
+			t.equal(resCode, 200, 'returns 200 response code');
+			t.end();
+		}
+	};
+
+	prodLoggerJsonP(errInput, {}, responseObj);
+
+});

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "log-errors",`
`3`		`- "version": "3.4.2",`
	`3`	`+ "version": "4.0.0",`
`4`	`4`	`"license": "BSD",`
`5`	`5`	`"description": "environment aware error logger that can easily be plugged into express.js",`
`6`	`6`	`"tags": [`