Skip to content

Commit cc5008f

Browse files
author
Joe Alves
committed
q is out; bluebird now rules the day
1 parent 4a400eb commit cc5008f

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

generated/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"angular-mocks": "^1.4.0",
1414
"angular-ui-router": "^0.2.15",
1515
"babel": "^5.0.12",
16+
"bluebird": "^2.9.34",
1617
"body-parser": "^1.12.0",
1718
"bootstrap": "^3.3.4",
1819
"chai": "^2.1.0",
@@ -51,7 +52,6 @@
5152
"passport-google-oauth": "^0.1.5",
5253
"passport-local": "^1.0.0",
5354
"passport-twitter": "^1.0.2",
54-
"q": "^1.2.0",
5555
"run-sequence": "^1.0.2",
5656
"serve-favicon": "^2.2.0",
5757
"sinon": "^1.13.0",

generated/seed.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ Refer to the q documentation for why and how q.invoke is used.
2020
*/
2121

2222
var mongoose = require('mongoose');
23-
var connectToDb = require('./server/db');
24-
var User = mongoose.model('User');
25-
var q = require('q');
23+
var Promise = require('bluebird');
2624
var chalk = require('chalk');
27-
28-
var getCurrentUserData = function () {
29-
return q.ninvoke(User, 'find', {});
30-
};
25+
var User = Promise.promisifyAll(mongoose.model('User'));
26+
var connectToDb = require('./server/db');
3127

3228
var seedUsers = function () {
3329

@@ -42,12 +38,12 @@ var seedUsers = function () {
4238
}
4339
];
4440

45-
return q.invoke(User, 'create', users);
41+
return User.createAsync(users);
4642

4743
};
4844

4945
connectToDb.then(function () {
50-
getCurrentUserData().then(function (users) {
46+
User.findAsync({}).then(function (users) {
5147
if (users.length === 0) {
5248
return seedUsers();
5349
} else {
@@ -61,4 +57,4 @@ connectToDb.then(function () {
6157
console.error(err);
6258
process.kill(1);
6359
});
64-
});
60+
});

generated/server/db/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
var Q = require('q');
2+
var Promise = require('bluebird');
33
var path = require('path');
44
var chalk = require('chalk');
55

@@ -13,7 +13,7 @@ var db = mongoose.connect(DATABASE_URI).connection;
1313
// anywhere the User model needs to be used.
1414
require('./models');
1515

16-
var startDbPromise = new Q(function (resolve, reject) {
16+
var startDbPromise = new Promise(function (resolve, reject) {
1717
db.on('open', resolve);
1818
db.on('error', reject);
1919
});
@@ -23,4 +23,4 @@ startDbPromise.then(function () {
2323
console.log(chalk.green('MongoDB connection opened!'));
2424
});
2525

26-
module.exports = startDbPromise;
26+
module.exports = startDbPromise;

0 commit comments

Comments
 (0)