Merged upstream changes

app/controllers/articles.js

@@ -2,7 +2,6 @@
  * Module dependencies.
  */
 var mongoose = require('mongoose'),
-    async = require('async'),
     Article = mongoose.model('Article'),
     _ = require('underscore');
 
@@ -88,4 +87,4 @@ exports.all = function(req, res) {
             res.jsonp(articles);
         }
     });
-};
+};

app/controllers/index.js

@@ -2,12 +2,11 @@
  * Module dependencies.
  */
 var mongoose = require('mongoose'),
-    async = require('async'),
     _ = require('underscore');
 
 
 exports.render = function(req, res) {
     res.render('index', {
         user: req.user ? JSON.stringify(req.user) : "null"
     });
-};
+};

app/views/includes/foot.jade

@@ -4,8 +4,8 @@ script(type='text/javascript', src='lib/angular-cookies/angular-cookies.js')
 script(type='text/javascript', src='lib/angular-resource/angular-resource.js')
 
 //Angular UI
-script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
 script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')
+script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
 script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js')
 
 //Application Init

config/config.js

@@ -4,4 +4,4 @@ var _ = require('underscore');
 
 module.exports = _.extend(
     require(__dirname + '/../config/env/all.js'),
-    require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.json') || {});
+    require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.js') || {});

config/env/development.js

@@ -0,0 +1,26 @@
+module.exports = {
+    db: "mongodb://localhost/mean-dev",
+    app: {
+        name: "MEAN - A Modern Stack - Development"
+    },
+    facebook: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/facebook/callback"
+    },
+    twitter: {
+        clientID: "CONSUMER_KEY",
+        clientSecret: "CONSUMER_SECRET",
+        callbackURL: "http://localhost:3000/auth/twitter/callback"
+    },
+    github: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/github/callback"
+    },
+    google: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/google/callback"
+    }
+}

config/env/production.js

@@ -0,0 +1,26 @@
+module.exports = {
+    db: "mongodb://localhost/mean",
+    app: {
+        name: "MEAN - A Modern Stack - Production"
+    },
+    facebook: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/facebook/callback"
+    },
+    twitter: {
+        clientID: "CONSUMER_KEY",
+        clientSecret: "CONSUMER_SECRET",
+        callbackURL: "http://localhost:3000/auth/twitter/callback"
+    },
+    github: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/github/callback"
+    },
+    google: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/google/callback"
+    }
+}

config/env/test.js

@@ -0,0 +1,27 @@
+module.exports = {
+    db: "mongodb://localhost/mean-test",
+    port: 3001,
+    app: {
+        name: "MEAN - A Modern Stack - Test"
+    },
+    facebook: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/facebook/callback"
+    },
+    twitter: {
+        clientID: "CONSUMER_KEY",
+        clientSecret: "CONSUMER_SECRET",
+        callbackURL: "http://localhost:3000/auth/twitter/callback"
+    },
+    github: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/github/callback"
+    },
+    google: {
+        clientID: "APP_ID",
+        clientSecret: "APP_SECRET",
+        callbackURL: "http://localhost:3000/auth/google/callback"
+    }
+}

config/express.js

@@ -41,8 +41,9 @@ module.exports = function(app, passport, db) {
         //cookieParser should be above session
         app.use(express.cookieParser());
 
-        //bodyParser should be above methodOverride
-        app.use(express.bodyParser());
+        // request body parsing middleware should be above methodOverride
+        app.use(express.urlencoded());
+        app.use(express.json());
         app.use(express.methodOverride());
 
         //express/mongo session storage

config/passport.js

@@ -17,7 +17,7 @@ module.exports = function(passport) {
     passport.deserializeUser(function(id, done) {
         User.findOne({
             _id: id
-        }, function(err, user) {
+        }, '-salt -hashed_password', function(err, user) {
             done(err, user);
         });
     });

config/routes.js

@@ -1,5 +1,3 @@
-var async = require('async');
-
 module.exports = function(app, passport, auth) {
     //User Routes
     var users = require('../app/controllers/users');
@@ -89,4 +87,4 @@ module.exports = function(app, passport, auth) {
     var index = require('../app/controllers/index');
     app.get('/', index.render);
 
-};
+};

package.json

@@ -31,7 +31,6 @@
         "passport-github": "latest",
         "passport-google-oauth": "latest",
         "underscore": "latest",
-        "async": "latest",
         "view-helpers": "latest",
         "mean-logger": "latest",
         "forever": "latest",

public/js/app.js

@@ -1,4 +1,4 @@
-window.app = angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', 'mean.system', 'mean.articles', 'mean.tabs']);
+angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', 'mean.system', 'mean.articles', 'mean.tabs']);
 
 angular.module('mean.system', []);
 angular.module('mean.articles', []);

public/js/config.js

@@ -1,5 +1,5 @@
 //Setting up route
-window.app.config(['$routeProvider',
+angular.module('mean').config(['$routeProvider',
     function($routeProvider) {
         $routeProvider.
         when('/articles', {
@@ -36,7 +36,7 @@ window.app.config(['$routeProvider',
 ]);
 
 //Setting HTML5 Location Mode
-window.app.config(['$locationProvider',
+angular.module('mean').config(['$locationProvider',
     function($locationProvider) {
         $locationProvider.hashPrefix("!");
     }

public/js/controllers/articles.js

@@ -15,13 +15,19 @@ angular.module('mean.articles').controller('ArticlesController', ['$scope', '$ro
     };
 
     $scope.remove = function(article) {
-        article.$remove();  
+        if (article) {
+            article.$remove();  
 
-        for (var i in $scope.articles) {
-            if ($scope.articles[i] == article) {
-                $scope.articles.splice(i, 1);
+            for (var i in $scope.articles) {
+                if ($scope.articles[i] == article) {
+                    $scope.articles.splice(i, 1);
+                }
             }
         }
+        else {
+            $scope.article.$remove();
+            $location.path('articles');
+        }
     };
 
     $scope.update = function() {

public/js/init.js

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

public/js/services/global.js

@@ -1,9 +1,12 @@
-angular.module('mean.system').factory("Global", [function() {
-    var _this = this;
-    _this._data = {
-        user: window.user,
-        authenticated: !! window.user
-    };
+//Global service for global variables
+angular.module('mean.system').factory("Global", [
+    function() {
+        var _this = this;
+        _this._data = {
+            user: window.user,
+            authenticated: !! window.user
+        };
 
-    return _this._data;
-}]);
+        return _this._data;
+    }
+]);

public/views/articles/view.html

@@ -1,6 +1,14 @@
 <section data-ng-controller="ArticlesController" data-ng-init="findOne()">
-	<span>{{article.created | date:'medium'}}</span> /
-	<span>{{article.user.name}}</span>
-	<h2>{{article.title}} <a data-ng-show="global.user._id == article.user._id" href="/#!/articles/{{article._id}}/edit">edit</a></h2>
-	<div>{{article.content}}</div>
-</section>
+    <span>{{article.created | date:'medium'}}</span>/
+    <span>{{article.user.name}}</span>
+    <h2>{{article.title}}</h2>
+    <div data-ng-show="global.user._id == article.user._id">
+        <a class="btn" href="/#!/articles/{{article._id}}/edit">
+        	<i class="icon-edit"></i>
+        </a> 
+        <a class="btn" data-ng-click="remove();">
+            <i class="icon-trash"></i>
+        </a>
+    </div>
+    <div>{{article.content}}</div>
+</section>

server.js

@@ -28,7 +28,7 @@ var walk = function(path) {
         var newPath = path + '/' + file;
         var stat = fs.statSync(newPath);
         if (stat.isFile()) {
-            if (/(.*)\.(js|coffee)/.test(file)) {
+            if (/(.*)\.(js$|coffee$)/.test(file)) {
                 require(newPath);
             }
         } else if (stat.isDirectory()) {

test/article/model.js

@@ -41,7 +41,7 @@ describe('<Unit Test>', function() {
                 });
             });
 
-            it('should be able to show an error when try to save witout title', function(done) {
+            it('should be able to show an error when try to save without title', function(done) {
                 article.title = '';
 
                 return article.save(function(err) {

test/user/model.js

@@ -49,7 +49,7 @@ describe('<Unit Test>', function() {
                 });
             });
 
-            it('should be able to show an error when try to save witout name', function(done) {
+            it('should be able to show an error when try to save without name', function(done) {
                 user.name = '';
                 return user.save(function(err) {
                     should.exist(err);