Made _ accessible from views again for backwards compatibility.

lib/hooks/request/index.js

@@ -53,10 +53,11 @@ module.exports = function (sails) {
 	function mixinLocals (req,res) {
 
 		res.locals({
-			session: req.session,
-			title: sails.config.appName + (req.param('action') ? (' | ' + _.str.capitalize(req.param('action'))) : ''),
-			req: req,
-			res: res
+			_		: _,
+			session	: req.session,
+			title	: sails.config.appName + (req.param('action') ? (' | ' + _.str.capitalize(req.param('action'))) : ''),
+			req		: req,
+			res		: res
 		});
 	}
 

package.json

@@ -7,17 +7,13 @@
   "keywords": [
     "mvc",
     "web-framework",
-    "rails",
-    "ruby-on-rails",
     "express",
     "sails",
     "sailsjs",
     "sails.js",
     "REST",
     "API",
     "orm",
-    "mysql",
-    "active-record",
     "socket.io"
   ],
   "main": "./lib/index",

test/start.js

@@ -1,21 +1,10 @@
 var sys = require('sys'),
 	exec = require('child_process').exec,
-	parley = require('parley'),
-	test_timeout = '60000',
-	$ = new parley();
+	test_timeout = '60000';
 
 // Final exit code (for travis)
 var result = 0;
 
-// Build deferred log
-var $log = function (msg) {
-	return $(function (msg, xcb) {
-	  	console.log(msg);
-		xcb();
-		// Exit with code based on result of tests
-		if (msg === 'Tests complete.') process.exit(result);
-	})(msg);
-};
 
 // Execute a cmd, then trigger callback when it finishes
 function runTest(cmd, cb) {
@@ -32,6 +21,9 @@ var $runTest = function (cmd) {
 	return $(runTest)(cmd);
 };
 
+$log('Testing waterline (ORM)...');
+$runTest('node ./node_modules/mocha/bin/mocha --ignore-leaks --recursive  -R dot -t '+ test_timeout +' test/waterline');
+
 
 $log('Running tests...');