version 1.1.86

examples/account/libs/custom-reqmodel.js

@@ -9,8 +9,8 @@ var indigo = require(__appDir + '/indigo');
 module.exports = function(appconf) {
 	var reqmodel = indigo.libs('reqmodel')(appconf);
 
-	return function(req, contextPath, next) {
-		reqmodel(req, contextPath, function() {
+	return function(contextPath, req, res, next) {
+		reqmodel(contextPath, req, res, function() {
 			req.model.baseStaticUrl =  '/static';
 			req.model.imageBaseUrl = contextPath + req.model.baseStaticUrl + '/images';
 			next();

indigo.js

@@ -182,7 +182,7 @@ var indigo =
 
 		//http://localhost:8585/indigo/account/en/templates/login
 		app.use('/indigo/:routerPath/:locale/templates/:pageId', function(req, res) {
-			reqModel(req, null, function() {
+			reqModel(null, req, res, function() {
 				locales.init(req, req.params.locale);
 
 				var url = '/' + req.session.locale + '/templates/' + req.params.routerPath + '/' + req.params.pageId + '.html',
@@ -320,7 +320,7 @@ var indigo =
 		};
 
 		if (!req.model) {
-			req.model = reqModel(req, null, next);
+			req.model = reqModel(null, req, res, next);
 		} else {
 			next();
 		}

libs/errorHandler.js

@@ -176,7 +176,7 @@ var errorHandler = function() {
 			var self = this;
 			app.use(function(req, res, next) {
 				if (!req.headers.referer) {
-					indigo.reqModel(req,  null, function() {
+					indigo.reqModel(null, req, res, function() {
 						self.render({statusCode: 404}, req, res, next);
 					});
 				} else {

libs/reqmodel.js

@@ -48,8 +48,8 @@
  * module.exports = function(appconf) {
  *	var reqmodel = indigo.libs('reqmodel')(appconf);
  *
- *	return function(req, contextPath, next) {
- *		reqmodel(req, contextPath, function() {
+ *	return function(contextPath, req, res, next) {
+ *		reqmodel(contextPath, req, res, function() {
  *			req.model.newModelKey = 'newModelValue';
  *			next();
  *		});
@@ -68,7 +68,7 @@ function reqmodel(appconf) {
 	env = env || 'dev';
 	minify = env === 'dev' ? '' : '.min';
 
-	return function(req, contextPath, next) {
+	return function(contextPath, req, res, next) {
 		req.model = {
 			req: req,
 			environment: env,

libs/routers.js

@@ -78,7 +78,7 @@ var routers =
 						.all(function(req, res, next) {
 							debug(req.method, req.url, req.originalUrl);
 							req.moduleWebDir = router.moduleWebDir;
-							reqModel(req, conf.base, next);
+							reqModel(conf.base, req, res, next);
 						})[method](callback);
 				};
 			};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "indigojs",
-  "version": "1.1.85",
+  "version": "1.1.86",
   "description": "IndigoJS is an open source, JavaScript/NodeJS localization framework",
   "main": "indigo.js",
   "scripts": {

test/unittest/indigo.js

@@ -80,30 +80,29 @@ describe('UnitTests Indigo APIs', function () {
 	});
 
 	it('should test RU locale', function (done) {
-		var req = {
-			baseUrl: '/indigojs',
-			params: {
-				countryCode: 'ru'
+		var locales = null,
+			req = {
+				baseUrl: '/indigojs',
+				params: {
+					countryCode: 'ru'
+				},
+				session: {},
+				headers: {
+					'accept-language': acceptLanguage
+				}
 			},
-			session: {},
-			headers: {
-				'accept-language': acceptLanguage
-			}
-		};
-		require(__appDir + '/libs/reqmodel')(indigo.appconf)(req, null, function() {
-			var locales = null,
-				res = {
-					render: function(url, model) {
-						assert.equal(model.contextPath, '/indigojs');
-						assert.equal(model.locality.locale, 'ru');
-						assert.equal(model.locality.langugage, 'ru');
-						assert.equal(locales.account.greeting, 'Здравствуйте');
-						done();
-					}
-				};
-
+			res = {
+				render: function(url, model) {
+					assert.equal(model.contextPath, '/indigojs');
+					assert.equal(model.locality.locale, 'ru');
+					assert.equal(model.locality.langugage, 'ru');
+					assert.equal(locales.account.greeting, 'Здравствуйте');
+					done();
+				}
+			};
+
+		require(__appDir + '/libs/reqmodel')(indigo.appconf)(null, req, res, function() {
 			locales = indigo.getLocale(req, 'countryCode'); //req.params.countryCode
-
 			indigo.render(req, res, '/login', locales);
 		});
 	});

test/unittest/libs/reqmodel.js

@@ -10,7 +10,7 @@ describe('libs/reqmodel', function () {
 
 	it('should assign to default dev environment', function (done) {
 		var req = {baseUrl: '/indigojs'};
-		reqmodel(appconf)(req, null, function() {
+		reqmodel(appconf)(null, req, null, function() {
 			assert.equal(req.model.contextPath, '/indigojs');
 			assert.equal(req.model.environment, 'dev');
 			assert.equal(req.model.minify, '');
@@ -23,7 +23,7 @@ describe('libs/reqmodel', function () {
 	it('should verify environment is dev', function (done) {
 		appconf.environment = 'dev';
 		var req = {baseUrl: '/indigojs'};
-		reqmodel(appconf)(req, '/newBaseURL', function() {
+		reqmodel(appconf)('/newBaseURL', req, null, function() {
 			assert.equal(req.model.contextPath, '/newBaseURL');
 			assert.equal(req.model.environment, 'dev');
 			assert.equal(req.model.minify, '');
@@ -36,7 +36,7 @@ describe('libs/reqmodel', function () {
 	it('should verify environment is prod', function (done) {
 		appconf.environment = 'prod';
 		var req = {baseUrl: '/indigojs'};
-		reqmodel(appconf)(req, null, function() {
+		reqmodel(appconf)(null, req, null, function() {
 			assert.equal(req.model.environment, 'prod');
 			assert.equal(req.model.minify, '.min');
 			assert.equal(req.model.extCSS, '.min.css');
@@ -50,7 +50,7 @@ describe('libs/reqmodel', function () {
 			env = process.env.NODE_ENV;
 		appconf.environment = 'dev';
 		process.env.NODE_ENV = 'production';
-		reqmodel(appconf)(req, null, function() {
+		reqmodel(appconf)(null, req, null, function() {
 			assert.equal(req.model.environment, 'prod');
 			assert.equal(req.model.minify, '.min');
 			assert.equal(req.model.extCSS, '.min.css');