version 1.1.64

dgofman · Dec 2, 2015 · c290913 · c290913
1 parent d22ad37
commit c290913
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 17 deletions.
diff --git a/indigo.js b/indigo.js
@@ -200,7 +200,9 @@ var indigo =
 			debug('inject: %s -> %s', url, newUrl);
 			try {
 				req.model.filename = getModuleWebDir(req) + newUrl;
-				req.model.locale = app.locals.locale;
+				for (var name in indigo.app.locals) {
+					req.model[name] = indigo.app.locals[name];
+				}
 				return ejs.render(fs.readFileSync(req.model.filename, 'utf-8'), req.model);
 			} catch(err) {
 				return errorHandler.injectErrorHandler(err).message;
@@ -306,9 +308,9 @@ var indigo =
 			res.status(404);
 			res.setHeader && res.setHeader('path', fileName);
 		}
+
 		res.render(fileName, req.model, function(err, result) {
 			if (err) {
-				console.error(err);
 				indigo.error(err, req, res);
 			} else {
 				res.send(result);

diff --git a/libs/errorHandler.js b/libs/errorHandler.js
@@ -43,12 +43,12 @@ var errorHandler = function(appconf) {
 
 	return errorHandler.render = function(err, req, res, next) {
 		if (err) {
-
-			var model = {
-					code: err.statusCode || res.statusCode
-				},
+			var model = req.model || {},
+				code = err.statusCode || res.statusCode,
 				template = appconf.get('errors:template'),
-				url = appconf.get('errors:' + model.code);
+				url = appconf.get('errors:' + code);
+
+			model.code = code;
 
 			if (model.code === 404) {
 				model.message = 'Not Found';
@@ -64,12 +64,14 @@ var errorHandler = function(appconf) {
 				model.details = 'Please contact your system administrator.';
 			}
 
-			errorHandler.error('ERROR2_' + model.code, err instanceof Error ? err : JSON.stringify(err), model.message, req.url);
+			if (!req.headers || req.headers['error_verbose'] !== 'false') {
+				errorHandler.error('ERROR2_' + model.code, err instanceof Error ? err : JSON.stringify(err), model.message, req.url);
+			}
 
 			if (url && url.length > 0){
 				res.redirect(url);
 			} else {
-				res.status(202).render(__appDir + (template || '/node_modules/indigojs/examples/templates/errors.html'), model);
+				res.status(model.code).render(__appDir + (template || '/node_modules/indigojs/examples/templates/errors.html'), model);
 			}
 			return;
 		}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "indigojs",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "description": "IndigoJS is an open source, JavaScript/NodeJS localization framework",
   "main": "indigo.js",
   "scripts": {

diff --git a/test/mocha/firststep.js b/test/mocha/firststep.js
@@ -18,7 +18,7 @@ describe('Testing FirstStep example', function () {
 		indigo.close(done);
 	});
 
-	it('should test GET', function(done){
+	it('should test GET', function(done) {
 		superagent.get('http://localhost:' + port + '/firststep/index')
 			.end(function(err, res) {
 				assert.equal(res.statusCode, 200);
@@ -27,7 +27,7 @@ describe('Testing FirstStep example', function () {
 		});
 	});
 
-	it('should test GET', function(done){
+	it('should test GET', function(done) {
 		superagent.get('http://localhost:' + port + '/firststep/index')
 			.end(function(err, res) {
 				assert.equal(res.statusCode, 200);

diff --git a/test/mocha/indigo.js b/test/mocha/indigo.js
@@ -47,6 +47,17 @@ describe('Testing Indigo API\'s', function () {
 		});
 	});
 
+	it('should test rendering error with error_verbose=false', function (done) {
+		indigo.start(__appDir +  '/examples/firststep/config/app.json', null, function() {
+			var port = indigo.appconf.get('server:port');
+			superagent.get('http://localhost:' + port + '/firststep/invalidTemplate')
+				.set('error_verbose', false)
+				.end(function() {
+					indigo.close(done);
+			});
+		});
+	});
+
 	it('should test rendering error', function (done) {
 		indigo.start(__appDir +  '/examples/firststep/config/app.json', null, function() {
 			var port = indigo.appconf.get('server:port');

diff --git a/test/unittest/indigo.js b/test/unittest/indigo.js
@@ -47,7 +47,6 @@ describe('UnitTests Indigo APIs', function () {
 				}
 			},res = {
 				render: function(url, model) {
-					console.log(fixPath(url), fixPath(__appDir) + '/examples/account/web/en/login.html');
 					assert.equal(fixPath(url), fixPath(__appDir) + '/examples/account/web/en/login.html');
 					assert.equal(model.locality.locale, 'en-gb');
 					assert.equal(model.locality.langugage, 'en');

diff --git a/test/unittest/libs/errorHandler.js b/test/unittest/libs/errorHandler.js
@@ -38,7 +38,7 @@ describe('libs/errorHandler', function () {
 			{
 			statusCode: 404,
 			status: function(code) {
-				assert.equal(code, 202);
+				assert.equal(code, 404);
 				return {
 					render: function(url, model) {
 						assert.equal(model.code, 404);
@@ -57,7 +57,7 @@ describe('libs/errorHandler', function () {
 			}, {
 			statusCode: 500,
 			status: function(code) {
-				assert.equal(code, 202);
+				assert.equal(code, 500);
 				return {
 					render: function(url, model) {
 						assert.equal(model.code, 500);
@@ -76,7 +76,7 @@ describe('libs/errorHandler', function () {
 			}, {
 			statusCode: 503,
 			status: function(code) {
-				assert.equal(code, 202);
+				assert.equal(code, 503);
 				return {
 					render: function(url, model) {
 						assert.equal(model.code, 503);
@@ -96,7 +96,7 @@ describe('libs/errorHandler', function () {
 			}, {
 			statusCode: 911,
 			status: function(code) {
-				assert.equal(code, 202);
+				assert.equal(code, 911);
 				return {
 					render: function(url, model) {
 						assert.equal(model.code, 911);