Merge branch 'pr/130'

Conflicts:
	templates/express/config/express.js

Author: DaftMonk

templates/common/_package.json

@@ -2,10 +2,17 @@
   "name": "<%= _.slugify(appname) %>",
   "version": "0.0.0",
   "dependencies": {
-    "express": "~3.4.3",
+    "express": "~4.0.0",
+    "morgan": "~1.0.0",
+    "body-parser": "~1.0.0",
+    "method-override": "~1.0.0",
+    "static-favicon": "~1.0.1",
+    "cookie-parser": "~1.0.1",
+    "express-session": "~1.0.2",
+    "errorhandler": "~1.0.0",
     "lodash": "~2.4.1"<% if (mongo) { %>,
     "mongoose": "~3.8.8"<% } %><% if (mongoPassportUser) { %>,
-    "connect-mongo": "~0.4.0",
+    "connect-mongo": "mrzepinski/connect-mongo#2135988",
     "passport": "~0.2.0",
     "passport-local": "~0.1.6"<% } %><% if (jade) { %>,
     "jade": "~1.2.0"<% } %><% if (!jade) { %>,

templates/express/config/express.js

@@ -1,16 +1,26 @@
 'use strict';
 
 var express = require('express'),
+    favicon = require('static-favicon'),
+    morgan = require('morgan'),
+    compression = require('compression'),
+    bodyParser = require('body-parser'),
+    methodOverride = require('method-override'),
+    cookieParser = require('cookie-parser'),
+    session = require('express-session'),
+    errorHandler = require('errorhandler'),
     path = require('path'),
     config = require('./config')<% if (mongoPassportUser) { %>,
     passport = require('passport'),
-    mongoStore = require('connect-mongo')(express)<% } %>;
+    mongoStore = require('connect-mongo')(session)<% } %>;
 
 /**
  * Express configuration
  */
 module.exports = function(app) {
-  app.configure('development', function(){
+  var env = app.get('env');
+
+  if ('development' === env) {
     app.use(require('connect-livereload')());
 
     // Disable caching of scripts for easier testing
@@ -26,46 +36,42 @@ module.exports = function(app) {
     app.use(express.static(path.join(config.root, '.tmp')));
     app.use(express.static(path.join(config.root, 'app')));
     app.set('views', config.root + '/app/views');
-  });
+  }
 
-  app.configure('production', function(){
-    app.use(express.compress());
-    app.use(express.favicon(path.join(config.root, 'public', 'favicon.ico')));
+  if ('production' === env) {
+    app.use(compression());
+    app.use(favicon(path.join(config.root, 'public', 'favicon.ico')));
     app.use(express.static(path.join(config.root, 'public')));
     app.set('views', config.root + '/views');
-  });
+  }
 
-  app.configure(function(){<% if (!jade) { %>
-    app.engine('html', require('ejs').renderFile);
-    app.set('view engine', 'html');<% } %><% if (jade) { %>
-    app.set('view engine', 'jade');<% } %>
-    app.use(express.logger('dev'));
-    app.use(express.json());
-    app.use(express.urlencoded());
-    app.use(express.methodOverride());<% if(mongoPassportUser) { %>
-    app.use(express.cookieParser());
+  <% if (!jade) { %>
+  app.engine('html', require('ejs').renderFile);
+  app.set('view engine', 'html');<% } %><% if (jade) { %>
+  app.set('view engine', 'jade');<% } %>
+  app.use(morgan('dev'));
+  app.use(bodyParser());
+  app.use(methodOverride());<% if(mongoPassportUser) { %>
+  app.use(cookieParser());
 
-    // Persist sessions with mongoStore
-    app.use(express.session({
-      secret: 'angular-fullstack secret',
-      store: new mongoStore({
-        url: config.mongo.uri,
-        collection: 'sessions'
-      }, function () {
-          console.log("db connection open");
-      })
-    }));
+  // Persist sessions with mongoStore
+  app.use(session({
+    secret: 'angular-fullstack secret',
+    store: new mongoStore({
+      url: config.mongo.uri,
+      collection: 'sessions'
+    }, function () {
+      console.log('db connection open');
+    })
+  }));
 
-    //use passport session
-    app.use(passport.initialize());
-    app.use(passport.session());
-    <% } %>
-    // Router (only error handlers should come after this)
-    app.use(app.router);
-  });
+  // Use passport session
+  app.use(passport.initialize());
+  app.use(passport.session());
+  <% } %>
 
-  // Error handler
-  app.configure('development', function(){
-    app.use(express.errorHandler());
-  });
+  // Error handler - has to be last
+  if ('development' === app.get('env')) {
+    app.use(errorHandler());
+  }
 };

templates/express/routes.js

@@ -3,32 +3,39 @@
 var api = require('./controllers/api'),
     index = require('./controllers')<% if(mongoPassportUser) { %>,
     users = require('./controllers/users'),
-    session = require('./controllers/session');
-
-var middleware = require('./middleware')<% } %>;
+    session = require('./controllers/session'),
+    middleware = require('./middleware')<% } %>;
 
 /**
  * Application routes
  */
 module.exports = function(app) {
 
   // Server API Routes
-  app.get('/api/awesomeThings', api.awesomeThings);
+  app.route('/api/awesomeThings')
+    .get(api.awesomeThings);
   <% if(mongoPassportUser) { %>
-  app.post('/api/users', users.create);
-  app.put('/api/users', users.changePassword);
-  app.get('/api/users/me', users.me);
-  app.get('/api/users/:id', users.show);
+  app.route('/api/users')
+    .post(users.create)
+    .put(users.changePassword);
+  app.route('/api/users/me')
+    .get(users.me);
+  app.route('/api/users/:id')
+    .get(users.show);
 
-  app.post('/api/session', session.login);
-  app.del('/api/session', session.logout);<% } %>
+  app.route('/api/session')
+    .post(session.login)
+    .delete(session.logout);<% } %>
 
   // All undefined api routes should return a 404
-  app.get('/api/*', function(req, res) {
-    res.send(404);
-  });
-  
+  app.route('/api/*')
+    .get(function(req, res) {
+      res.send(404);
+    });
+
   // All other routes to use Angular routing in app/scripts/app.js
-  app.get('/partials/*', index.partials);
-  app.get('/*',<% if(mongoPassportUser) { %> middleware.setUserCookie,<% } %> index.index);
+  app.route('/partials/*')
+    .get(index.partials);
+  app.route('/*')
+    .get(<% if(mongoPassportUser) { %> middleware.setUserCookie,<% } %> index.index);
 };

templates/express/server.js

@@ -12,10 +12,7 @@ var express = require('express')<% if (mongo) { %>,
 // Set default node environment to development
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-// Application Config
 var config = require('./lib/config/config');<% if (mongo) { %>
-
-// Connect to database
 var db = mongoose.connect(config.mongo.uri, config.mongo.options);
 
 // Bootstrap models
@@ -28,16 +25,13 @@ fs.readdirSync(modelsPath).forEach(function (file) {
 
 // Populate empty DB with sample data
 require('./lib/config/dummydata');<% } %><% if(mongoPassportUser) { %>
-  
+
 // Passport Configuration
 var passport = require('./lib/config/passport');<% } %>
 
+// Setup Express
 var app = express();
-
-// Express settings
 require('./lib/config/express')(app);
-
-// Routing
 require('./lib/routes')(app);
 
 // Start server