Merge pull request balderdashy#840 from xdissent/case-insensitive-views

Case insensitive views

lib/express/index.js

@@ -7,7 +7,8 @@ module.exports = function (sails) {
 	var util		= require( '../util' ),
 	async			= require('async'),
 	startServer		= require('./start')(sails),
-	bodyParserRetry	= require('./bodyParserRetry')(sails);
+	bodyParserRetry	= require('./bodyParserRetry')(sails),
+	View = require('./view');
 
 
 	/**
@@ -48,6 +49,9 @@ module.exports = function (sails) {
 		}
 		else sails.express.server = createServer(sails.express.app);
 
+		// Use View subclass to allow case-insensitive view lookups
+		sails.express.app.set('view', View);
+
 		// Set up location of server-side views and their engine
 		sails.express.app.set('views', sails.config.paths.views);
 

lib/express/view.js

@@ -0,0 +1,34 @@
+var util = require('util'),
+  path = require('path'),
+  glob = require('glob'),
+  ExpressView = require('express/lib/view'),
+  utils = require('express/lib/utils'),
+  basename = path.basename,
+  dirname = path.dirname,
+  join = path.join,
+  globPath = function (path) {
+    return glob.sync(path, {nocase: true});
+  },
+  exists = function (path) {
+    return globPath(path).length > 0;
+  };
+
+function SailsView(name, options) {
+  ExpressView.call(this, name, options);
+};
+
+util.inherits(SailsView, ExpressView);
+
+SailsView.prototype.lookup = function(path) {
+  var ext = this.ext;
+
+  // <path>.<engine>
+  if (!utils.isAbsolute(path)) path = join(this.root, path);
+  if (exists(path)) return globPath(path)[0];
+
+  // <path>/index.<engine>
+  path = join(dirname(path), basename(path, ext), 'index' + ext);
+  if (exists(path)) return globPath(path)[0];
+};
+
+module.exports = SailsView;

test/router/integration/router.specifiedRoutes.test.js

@@ -187,4 +187,56 @@ describe('Specified routes', function() {
 			});
 		});
 	});
+
+	it('should be case-insensitive', function(done) {
+
+		httpHelper.writeRoutes({
+			'get /testRoute': {
+				controller: 'test',
+				action: 'verb'
+			}
+		});
+
+		httpHelper.testRoute('get', 'tEStrOutE', function(err, response) {
+			if (err) done(new Error(err));
+
+			assert(response.body === 'get');
+			done();
+		});
+	});
+
+	it('should accept case-insensitive controller key', function(done) {
+
+		httpHelper.writeRoutes({
+			'get /testRoute': {
+				controller: 'tEsT',
+				action: 'verb'
+			}
+		});
+
+		httpHelper.testRoute('get', 'testRoute', function(err, response) {
+			if (err) done(new Error(err));
+
+			assert(response.body === 'get');
+			done();
+		});
+	});
+
+	it('should accept case-insensitive action key', function(done) {
+
+		httpHelper.writeRoutes({
+			'get /testRoute': {
+				controller: 'test',
+				action: 'capiTalleTTers'
+			}
+		});
+
+		httpHelper.testRoute('get', 'testRoute', function(err, response) {
+			if (err) done(new Error(err));
+
+			assert(response.body === 'CapitalLetters');
+			done();
+		});
+	});
+
 });