Fixing models auto loading bug

meanjs · Sep 29, 2013 · fe50b41 · fe50b41
1 parent 0cfbafa
commit fe50b41
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/app/controllers/articles.js b/app/controllers/articles.js
@@ -22,7 +22,7 @@ exports.article = function(req, res, next, id) {
 /**
  * Create a article
  */
-exports.create = function(req, res) {            
+exports.create = function(req, res) {
     var article = new Article(req.body);
     article.user = req.user;
 
@@ -32,8 +32,7 @@ exports.create = function(req, res) {
                 errors: err.errors,
                 article: article
             });
-        } 
-        else {
+        } else {
             res.jsonp(article);
         }
     });
@@ -89,4 +88,4 @@ exports.all = function(req, res) {
             res.jsonp(articles);
         }
     });
-};
+};
diff --git a/config/config.js b/config/config.js
@@ -3,5 +3,5 @@ var _ = require('underscore');
 // Load app configuration
 
 module.exports = _.extend(
-  require(__dirname + '/../config/env/all.js'),
-  require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.json') || {}) ;
+    require(__dirname + '/../config/env/all.js'),
+    require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.json') || {});
diff --git a/config/middlewares/authorization.js b/config/middlewares/authorization.js
@@ -5,7 +5,7 @@ exports.requiresLogin = function(req, res, next) {
     if (!req.isAuthenticated()) {
         return res.send(401, 'User is not authorized');
     }
-    next();   
+    next();
 };
 
 /**
@@ -30,4 +30,4 @@ exports.article = {
         }
         next();
     }
-};
+};
diff --git a/config/routes.js b/config/routes.js
@@ -9,7 +9,7 @@ module.exports = function(app, passport, auth) {
 
     //Setting up the users api
     app.post('/users', users.create);
-    
+
     app.post('/users/session', passport.authenticate('local', {
         failureRedirect: '/signin',
         failureFlash: 'Invalid email or password.'

diff --git a/server.js b/server.js
@@ -23,17 +23,18 @@ var db = mongoose.connect(config.db);
 
 //Bootstrap models
 var models_path = __dirname + '/app/models';
-var walk = function (path) {
-  fs.readdirSync(path).forEach(function (file) {
-    var newPath = path + '/' + file;
-    var stat = fs.statSync(newPath);
-    if (stat.isFile()) {
-      require(newPath);
-    }
-    else if (stat.isDirectory()) {
-      walk(newPath);
-    }
-  });
+var walk = function(path) {
+    fs.readdirSync(path).forEach(function(file) {
+        var newPath = path + '/' + file;
+        var stat = fs.statSync(newPath);
+        if (stat.isFile()) {
+            if (/(.*)\.(js|coffee)/.test(file)) {
+                require(newPath);
+            }
+        } else if (stat.isDirectory()) {
+            walk(newPath);
+        }
+    });
 };
 walk(models_path);