Merge branch 'canary' of github.com:DaftMonk/generator-angular-fullstack into pr/543

Conflicts:
	endpoint/templates/name.controller.js

Author: DaftMonk

Diff for: app/templates/_package.json

@@ -15,7 +15,9 @@
     "lodash": "~2.4.1",<% if(filters.jade) { %>
     "jade": "~1.2.0",<% } %><% if(filters.html) { %>
     "ejs": "~0.8.4",<% } %><% if(filters.mongoose) { %>
-    "mongoose": "~3.8.8",<% } %><% if(filters.auth) { %>
+    "mongoose": "~3.8.8",
+    "mongoose-bird": "~0.0.1",
+    <% } %><% if(filters.auth) { %>
     "jsonwebtoken": "^0.3.0",
     "express-jwt": "^0.1.3",
     "passport": "~0.2.0",
@@ -46,7 +48,7 @@
     "grunt-contrib-watch": "~0.6.1",<% if(filters.coffee) { %>
     "grunt-contrib-coffee": "^0.10.1",<% } %><% if(filters.jade) { %>
     "grunt-contrib-jade": "^0.11.0",<% } %><% if(filters.less) { %>
-    "grunt-contrib-less": "^0.11.0",<% } %>
+    "grunt-contrib-less": "^0.11.4",<% } %>
     "grunt-google-cdn": "~0.4.0",
     "grunt-newer": "~0.7.0",
     "grunt-ng-annotate": "^0.2.3",

Diff for: app/templates/server/api/thing/index.spec.js

@@ -37,47 +37,47 @@ describe('Thing API Router:', function() {
   describe('GET /api/things', function() {
 
     it('should route to thing.controller.index', function() {
-      return router.get.withArgs('/', 'thingCtrl.index').should.have.been.calledOnce;
+      router.get.withArgs('/', 'thingCtrl.index').should.have.been.calledOnce;
     });
 
   });<% if(filters.mongoose) { %>
 
   describe('GET /api/things/:id', function() {
 
     it('should route to thing.controller.show', function() {
-      return router.get.withArgs('/:id', 'thingCtrl.show').should.have.been.calledOnce;
+      router.get.withArgs('/:id', 'thingCtrl.show').should.have.been.calledOnce;
     });
 
   });
 
   describe('POST /api/things', function() {
 
     it('should route to thing.controller.create', function() {
-      return router.post.withArgs('/', 'thingCtrl.create').should.have.been.calledOnce;
+      router.post.withArgs('/', 'thingCtrl.create').should.have.been.calledOnce;
     });
 
   });
 
   describe('PUT /api/things/:id', function() {
 
     it('should route to thing.controller.update', function() {
-      return router.put.withArgs('/:id', 'thingCtrl.update').should.have.been.calledOnce;
+      router.put.withArgs('/:id', 'thingCtrl.update').should.have.been.calledOnce;
     });
 
   });
 
   describe('PATCH /api/things/:id', function() {
 
     it('should route to thing.controller.update', function() {
-      return router.patch.withArgs('/:id', 'thingCtrl.update').should.have.been.calledOnce;
+      router.patch.withArgs('/:id', 'thingCtrl.update').should.have.been.calledOnce;
     });
 
   });
 
   describe('DELETE /api/things/:id', function() {
 
     it('should route to thing.controller.destroy', function() {
-      return router.delete.withArgs('/:id', 'thingCtrl.destroy').should.have.been.calledOnce;
+      router.delete.withArgs('/:id', 'thingCtrl.destroy').should.have.been.calledOnce;
     });
 
   });<% } %>

Diff for: app/templates/server/api/thing/thing.controller.js

@@ -7,10 +7,57 @@
  * DELETE  /things/:id          ->  destroy
  */
 
-'use strict';
+'use strict';<% if (filters.mongoose) { %>
 
-var _ = require('lodash');<% if (filters.mongoose) { %>
-var Thing = require('./thing.model');<% } %>
+var _ = require('lodash');
+var Thing = require('./thing.model');
+
+function handleError(res, statusCode){
+  statusCode = statusCode || 500;
+  return function(err){
+    res.send(statusCode, err);
+  };
+}
+
+function responseWithResult(res, statusCode){
+  statusCode = statusCode || 200;
+  return function(entity){
+    if(entity){
+      return res.json(statusCode, entity);
+    }
+  };
+}
+
+function handleEntityNotFound(res){
+  return function(entity){
+    if(!entity){
+      res.send(404);
+      return null;
+    }
+    return entity;
+  };
+}
+
+function saveUpdates(updates){
+  return function(entity){
+    var updated = _.merge(entity, updates);
+    return updated.saveAsync()
+      .then(function () {
+        return updated;
+      });
+  };
+}
+
+function removeEntity(res){
+  return function (entity) {
+    if(entity){
+      return entity.removeAsync()
+        .then(function() {
+          return res.send(204);
+        });
+    }
+  };
+}<% } %>
 
 // Get list of things
 exports.index = function(req, res) {<% if (!filters.mongoose) { %>
@@ -34,56 +81,43 @@ exports.index = function(req, res) {<% if (!filters.mongoose) { %>
   name : 'Deployment Ready',
   info : 'Easily deploy your app to Heroku or Openshift with the heroku and openshift subgenerators'
   }
-  ]);<% } %><% if (filters.mongoose) { %>
-  Thing.find(function (err, things) {
-    if(err) { return handleError(res, err); }
-    return res.json(200, things);
-  });<% } %>
+  ]);<% } if (filters.mongoose) { %>
+  Thing.findAsync()
+    .then(responseWithResult(res))
+    .catch(handleError(res));<% } %>
 };<% if (filters.mongoose) { %>
 
 // Get a single thing
 exports.show = function(req, res) {
-  Thing.findById(req.params.id, function (err, thing) {
-    if(err) { return handleError(res, err); }
-    if(!thing) { return res.send(404); }
-    return res.json(thing);
-  });
+  Thing.findByIdAsync(req.params.id)
+    .then(handleEntityNotFound(res))
+    .then(responseWithResult(res))
+    .catch(handleError(res));
 };
 
 // Creates a new thing in the DB.
 exports.create = function(req, res) {
-  Thing.create(req.body, function(err, thing) {
-    if(err) { return handleError(res, err); }
-    return res.json(201, thing);
-  });
+  Thing.createAsync(req.body)
+    .then(responseWithResult(res, 201))
+    .catch(handleError(res));
 };
 
 // Updates an existing thing in the DB.
 exports.update = function(req, res) {
-  if(req.body._id) { delete req.body._id; }
-  Thing.findById(req.params.id, function (err, thing) {
-    if (err) { return handleError(res, err); }
-    if(!thing) { return res.send(404); }
-    var updated = _.merge(thing, req.body);
-    updated.save(function (err) {
-      if (err) { return handleError(res, err); }
-      return res.json(200, thing);
-    });
-  });
+  if(req.body._id) {
+    delete req.body._id;
+  }
+  Thing.findByIdAsync(req.params.id)
+    .then(handleEntityNotFound(res))
+    .then(saveUpdates(req.body))
+    .then(responseWithResult(res))
+    .catch(handleError(res));
 };
 
 // Deletes a thing from the DB.
 exports.destroy = function(req, res) {
-  Thing.findById(req.params.id, function (err, thing) {
-    if(err) { return handleError(res, err); }
-    if(!thing) { return res.send(404); }
-    thing.remove(function(err) {
-      if(err) { return handleError(res, err); }
-      return res.send(204);
-    });
-  });
-};
-
-function handleError(res, err) {
-  return res.send(500, err);
-}<% } %>
+  Thing.findByIdAsync(req.params.id)
+    .then(handleEntityNotFound(res))
+    .then(removeEntity(res))
+    .catch(handleError(res));
+};<% } %>

Diff for: app/templates/server/api/thing/thing.model(mongoose).js

@@ -1,6 +1,6 @@
 'use strict';
 
-var mongoose = require('mongoose'),
+var mongoose = require('mongoose-bird')(),
     Schema = mongoose.Schema;
 
 var ThingSchema = new Schema({

Diff for: app/templates/server/api/user(auth)/index.spec.js

@@ -47,47 +47,47 @@ describe('User API Router:', function() {
   describe('GET /api/users', function() {
 
     it('should verify admin role and route to user.controller.index', function() {
-      return router.get.withArgs('/', 'authService.hasRole.admin', 'userCtrl.index').should.have.been.calledOnce;
+      router.get.withArgs('/', 'authService.hasRole.admin', 'userCtrl.index').should.have.been.calledOnce;
     });
 
   });
 
   describe('DELETE /api/users/:id', function() {
 
     it('should verify admin role and route to user.controller.destroy', function() {
-      return router.delete.withArgs('/:id', 'authService.hasRole.admin', 'userCtrl.destroy').should.have.been.calledOnce;
+      router.delete.withArgs('/:id', 'authService.hasRole.admin', 'userCtrl.destroy').should.have.been.calledOnce;
     });
 
   });
 
   describe('GET /api/users/me', function() {
 
     it('should be authenticated and route to user.controller.me', function() {
-      return router.get.withArgs('/me', 'authService.isAuthenticated', 'userCtrl.me').should.have.been.calledOnce;
+      router.get.withArgs('/me', 'authService.isAuthenticated', 'userCtrl.me').should.have.been.calledOnce;
     });
 
   });
 
   describe('PUT /api/users/:id/password', function() {
 
     it('should be authenticated and route to user.controller.changePassword', function() {
-      return router.put.withArgs('/:id/password', 'authService.isAuthenticated', 'userCtrl.changePassword').should.have.been.calledOnce;
+      router.put.withArgs('/:id/password', 'authService.isAuthenticated', 'userCtrl.changePassword').should.have.been.calledOnce;
     });
 
   });
 
   describe('GET /api/users/:id', function() {
 
     it('should be authenticated and route to user.controller.show', function() {
-      return router.get.withArgs('/:id', 'authService.isAuthenticated', 'userCtrl.show').should.have.been.calledOnce;
+      router.get.withArgs('/:id', 'authService.isAuthenticated', 'userCtrl.show').should.have.been.calledOnce;
     });
 
   });
 
   describe('POST /api/users', function() {
 
     it('should route to user.controller.create', function() {
-      return router.post.withArgs('/', 'userCtrl.create').should.have.been.calledOnce;
+      router.post.withArgs('/', 'userCtrl.create').should.have.been.calledOnce;
     });
 
   });