jshint improvements

.jshintrc

@@ -72,7 +72,7 @@
     "couch"         : false,    // CouchDB
     "devel"         : true,     // Development/debugging (alert, confirm, etc)
     "dojo"          : false,    // Dojo Toolkit
-    "jasmine"       : false,    // Jasmine
+    "jasmine"       : true,    // Jasmine
     "jquery"        : false,    // jQuery
     "mocha"         : true,     // Mocha
     "mootools"      : false,    // MooTools
@@ -89,5 +89,14 @@
     "yui"           : false,    // Yahoo User Interface
 
     // Custom Globals
-    "globals"       : {}        // additional predefined global variables
+    "globals"       : {
+        "angular": true,
+        "describe": true,
+        "it": true,
+        "expect": true,
+        "beforeEach": true,
+        "afterEach": true,
+        "module": true,
+        "inject": true
+    }        // additional predefined global variables
 }

app/controllers/articles.js

@@ -3,6 +3,7 @@
 /**
  * Module dependencies.
  */
+var StandardError = require('standard-error');
 var db = require('../../config/sequelize');
 
 /**
@@ -33,7 +34,7 @@ exports.create = function(req, res) {
     // save and return and instance of article on the res object. 
     db.Article.create(req.body).then(function(article){
         if(!article){
-            return res.send('users/signup', {errors: err});
+            return res.send('users/signup', {errors: new StandardError('Article could not be created')});
         } else {
             return res.jsonp(article);
         }
@@ -111,7 +112,7 @@ exports.all = function(req, res) {
  * Article authorizations routing middleware
  */
 exports.hasAuthorization = function(req, res, next) {
-    if (req.article.User.id != req.user.id) {
+    if (req.article.User.id !== req.user.id) {
       return res.send(401, 'User is not authorized');
     }
     next();

app/controllers/users.js

@@ -50,7 +50,7 @@ exports.session = function(req, res) {
 /**
  * Create user
  */
-exports.create = function(req, res) {
+exports.create = function(req, res, next) {
     var message = null;
 
     var user = db.User.build(req.body);
@@ -62,7 +62,9 @@ exports.create = function(req, res) {
 
     user.save().then(function(){
       req.login(user, function(err){
-        if(err) return next(err);
+        if(err) {
+            return next(err);
+        }
         res.redirect('/');
       });
     }).catch(function(err){
@@ -84,8 +86,10 @@ exports.me = function(req, res) {
  * Find user by id
  */
 exports.user = function(req, res, next, id) {
-    User.find({where : { id: id }}).then(function(user){
-      if (!user) return next(new Error('Failed to load User ' + id));
+    db.User.find({where : { id: id }}).then(function(user){
+      if (!user) {
+          return next(new Error('Failed to load User ' + id));
+      }
       req.profile = user;
       next();
     }).catch(function(err){
@@ -98,7 +102,7 @@ exports.user = function(req, res, next, id) {
  */
 exports.requiresLogin = function(req, res, next) {
     if (!req.isAuthenticated()) {
-        return res.send(401, 'User is not authorized');
+        return res.status(401).send('User is not authorized');
     }
     next();
 };
@@ -107,8 +111,8 @@ exports.requiresLogin = function(req, res, next) {
  * User authorizations routing middleware
  */
 exports.hasAuthorization = function(req, res, next) {
-    if (req.profile.id != req.user.id) {
-      return res.send(401, 'User is not authorized');
+    if (req.profile.id !== req.user.id) {
+      return res.status(401).send('User is not authorized');
     }
     next();
 };

app/models/user.js

@@ -32,7 +32,9 @@ module.exports = function(sequelize, DataTypes) {
 					return this.encryptPassword(plainText, this.salt) === this.hashedPassword;
 				},
 				encryptPassword: function(password, salt) {
-					if (!password || !salt) return '';
+					if (!password || !salt) {
+                        return '';
+                    }
 					salt = new Buffer(salt, 'base64');
 					return crypto.pbkdf2Sync(password, salt, 10000, 64).toString('base64');
 				}

gruntfile.js

@@ -34,7 +34,8 @@ module.exports = function(grunt) {
         jshint: {
             all:['gruntfile.js', 'public/js/**/*.js', 'test/mocha/**/*.js', 'test/karma/**/*.js', 'app/**/*.js'],
             options: {
-                jshintrc: '.jshintrc'
+                jshintrc: '.jshintrc',
+                reporter: require('jshint-stylish')
             }
         },
         copy: {

package.json

@@ -4,7 +4,7 @@
   "version": "0.2.0",
   "private": false,
   "author": "Jeff Potter",
-  "license" : "MIT",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/jpotts18/mean-stack-relational.git"
@@ -35,6 +35,7 @@
     "grunt-copy": "latest",
     "grunt-env": "latest",
     "jade": "1.3.1",
+    "jshint-stylish": "^2.0.1",
     "lodash": "latest",
     "method-override": "2.3.2",
     "morgan": "1.5.2",
@@ -47,6 +48,7 @@
     "proxyquire": "^1.6.0",
     "sequelize": "^3.2.0",
     "serve-favicon": "2.2.0",
+    "standard-error": "^1.1.0",
     "view-helpers": "latest",
     "winston": "latest"
   },

public/js/controllers/articles.js

@@ -21,7 +21,7 @@ angular.module('mean.articles').controller('ArticlesController', ['$scope', '$ro
             article.$remove();  
 
             for (var i in $scope.articles) {
-                if ($scope.articles[i] == article) {
+                if ($scope.articles[i] === article) {
                     $scope.articles.splice(i, 1);
                 }
             }

public/js/init.js

@@ -1,6 +1,8 @@
 angular.element(document).ready(function() {
     //Fixing facebook bug with redirect
-    if (window.location.hash == "#_=_") window.location.hash = "#!";
+    if (window.location.hash === "#_=_") {
+        window.location.hash = "#!";
+    }
 
     //Then init the app
     angular.bootstrap(document, ['mean']);