From e53419bb590b9ee2d5e9ade5029b00d804fdb61e Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 26 Jun 2015 01:47:59 -0700 Subject: [PATCH 1/3] fix should be bufferWithCount --- seed/loopbackMigration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/loopbackMigration.js b/seed/loopbackMigration.js index 1a86352e46..31a0ef5545 100644 --- a/seed/loopbackMigration.js +++ b/seed/loopbackMigration.js @@ -7,6 +7,7 @@ var Rx = require('rx'), secrets = require('../config/secrets'); var MongoClient = mongodb.MongoClient; +Rx.config.longStackSupport = true; var providers = [ 'facebook', @@ -173,7 +174,7 @@ var commentCount = dbObservable .flatMap(function(dats) { return insertMany(dats.db, 'comment', dats.comments, { w: 1 }); }) - .buffer(20) + .bufferWithCount(20) .count(); Rx.Observable.combineLatest( @@ -198,7 +199,6 @@ Rx.Observable.combineLatest( console.error('an error occured', err, err.stack); }, function() { - console.log('finished with ', count); process.exit(0); } From 66e4138b361df3dbdb3a97d6b801234093b364f6 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 26 Jun 2015 01:51:27 -0700 Subject: [PATCH 2/3] fix buffer return from database query --- seed/loopbackMigration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/loopbackMigration.js b/seed/loopbackMigration.js index 31a0ef5545..f6b98b8b7b 100644 --- a/seed/loopbackMigration.js +++ b/seed/loopbackMigration.js @@ -165,6 +165,7 @@ var commentCount = dbObservable .flatMap(function(db) { return createQuery(db, 'comments', {}); }) + .bufferWithCount(20) .withLatestFrom(dbObservable, function(comments, db) { return { comments: comments, @@ -174,7 +175,6 @@ var commentCount = dbObservable .flatMap(function(dats) { return insertMany(dats.db, 'comment', dats.comments, { w: 1 }); }) - .bufferWithCount(20) .count(); Rx.Observable.combineLatest( From 4db1f441fe96a848e30aabbe9e20767aeb2655d3 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Fri, 26 Jun 2015 18:11:44 -0700 Subject: [PATCH 3/3] bump loopback passport --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fe7c38bd8..b7f3b12659 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "lodash": "^3.9.3", "loopback": "https://github.com/FreeCodeCamp/loopback.git#fix/no-password", "loopback-boot": "^2.8.0", - "loopback-component-passport": "git://github.com/FreeCodeCamp/loopback-component-passport.git#feature/emailOptional", + "loopback-component-passport": "1.4.0", "loopback-connector-mongodb": "^1.10.0", "lusca": "~1.0.2", "method-override": "~2.3.0",