Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Update collection methods #570

Open
wants to merge 3 commits into
base: 1.0.0
Choose a base branch
from
Open

Update collection methods #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f09701f
Update async to 2.0 and fix collection resource to match
Nov 16, 2016
af08312
Update code related to Collection changes
Nov 16, 2016
4352359
Update examples
Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions collection_each_example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ function filter(apps, cb) {
l.reset();
var i = 0;
function iterator(app, cb) {
cb(i++ % 2 === 0);
cb(null, i++ % 2 === 0);
}

async.series([
function (cb) {
apps.filter(l.i(iterator), l.c(cb, 1));
apps.filter(l.i(iterator), l.c(cb));
},
function (cb) {
apps.filterSeries(l.i(iterator), l.c(cb, 1));
apps.filterSeries(l.i(iterator), l.c(cb));
}
], cb);
}
Expand All @@ -163,15 +163,15 @@ function reject(apps, cb) {
l.reset();
var i = 0;
function iterator(app, cb) {
cb(i++ % 2 === 0);
cb(null, i++ % 2 === 0);
}

async.series([
function (cb) {
apps.reject(l.i(iterator), l.c(cb, 1));
apps.reject(l.i(iterator), l.c(cb));
},
function (cb) {
apps.rejectSeries(l.i(iterator), l.c(cb, 1));
apps.rejectSeries(l.i(iterator), l.c(cb));
}
], cb);
}
Expand All @@ -197,15 +197,15 @@ function detect(apps, cb) {
l.reset();
var i = 0;
function iterator(app, cb) {
cb(0 === i++ % 2);
cb(null, 0 === i++ % 2);
}

async.series([
function (cb) {
apps.detect(l.i(iterator), l.c(cb, 1));
apps.detect(l.i(iterator), l.c(cb));
},
function (cb) {
apps.detectSeries(l.i(iterator), l.c(cb, 1));
apps.detectSeries(l.i(iterator), l.c(cb));
}
], cb);
}
Expand All @@ -214,20 +214,20 @@ function some(apps, cb) {
l.reset();
var i = 0;
function iterator(app, cb) {
cb(0 === i++ % 2);
cb(null, 0 === i++ % 2);
}

apps.some(l.i(iterator), l.c(cb, 1));
apps.some(l.i(iterator), l.c(cb));
}

function every(apps, cb) {
l.reset();
var i = 0;
function iterator(app, cb) {
cb(0 === i++ % 2);
cb(null, 0 === i++ % 2);
}

apps.every(l.i(iterator), l.c(cb, 1));
apps.every(l.i(iterator), l.c(cb));
}

function sortBy(apps, cb) {
Expand All @@ -251,4 +251,4 @@ function concat(apps, cb) {
apps.concatSeries(l.i(iterator), l.c(cb));
}
], cb);
}
}
18 changes: 14 additions & 4 deletions lib/resource/Application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,10 +1225,16 @@ Application.prototype.setDefaultAccountStore = function setDefaultAccountStore(s
return callback(err);
}

res.detectSeries(function(asm, cb){cb(asm.accountStore.href === store.href);}, onAsmFound);
res.detectSeries(function(asm, cb){
cb(null, asm.accountStore.href === store.href);
}, onAsmFound);
});

function onAsmFound(asm) {
function onAsmFound(err, asm) {
if (err) {
throw err;
}

if (asm) {
asm.isDefaultAccountStore = true;
return asm.save(clearCache);
Expand Down Expand Up @@ -1337,10 +1343,14 @@ Application.prototype.setDefaultGroupStore = function setDefaultGroupStore(store
if (err) {
return callback(err);
}
res.detectSeries(function(asm, cb){cb(asm.accountStore.href === store.href);}, onAsmFound);
res.detectSeries(function(asm, cb){cb(null, asm.accountStore.href === store.href);}, onAsmFound);
});

function onAsmFound(asm) {
function onAsmFound(err, asm) {
if (err) {
throw err;
}

if (asm) {
asm.isDefaultGroupStore = true;
return asm.save(updateApp);
Expand Down
35 changes: 17 additions & 18 deletions lib/resource/CollectionResource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ function wrapAsyncCallToAllPages(coll, func, args, callbackWrapper){
[task.collection.items],
!!callbackWrapper.wrapPageArgs ? callbackWrapper.wrapPageArgs(args) : args,
callbackWrapper.wrapPageCallback(parallel_cb.bind(this, null)));

func.apply(this, callArgs);
},
function(parallel_cb){
Expand All @@ -125,7 +126,6 @@ function wrapAsyncCallToAllPages(coll, func, args, callbackWrapper){
if (err || !nextPage){
return parallel_cb(err);
}

q.push({collection: nextPage});
parallel_cb();
});
Expand Down Expand Up @@ -993,16 +993,16 @@ utils.inherits(CollectionResource, Resource);
this.isDone = false;

this.wrapPageCallback = function wrapPageCallback(cb){
return function funcCallback(result){
that.isDone = !result;
return function funcCallback(err, result){
that.isDone = err || !result;
res = res && result;
cb(result);
cb(err, result);
};
};

this.wrapCallback = function(callback ){
return function(){
callback(res);
return function(err){
callback(err, res);
};
};
}
Expand All @@ -1012,16 +1012,16 @@ utils.inherits(CollectionResource, Resource);
this.isDone = false;
var that = this;
this.wrapPageCallback = function wrapPageCallback(cb){
return function funcCallback(result){
return function funcCallback(err, result){
that.isDone = !!result;
res = res || result;
cb(result);
cb(err, result);
};
};

this.wrapCallback = function(callback ){
return function(){
callback(res);
return function(err){
callback(err, res);
};
};
}
Expand All @@ -1032,16 +1032,16 @@ utils.inherits(CollectionResource, Resource);
this.isDone = false;

this.wrapPageCallback = function wrapPageCallback(cb){
return function funcCallback(result){
return function funcCallback(err, result){
that.isDone = !!result;
res = res || result;
cb(res);
cb(err, res);
};
};

this.wrapCallback = function(callback ){
return function(){
callback(res);
return function(err){
callback(err, res);
};
};
}
Expand Down Expand Up @@ -1137,16 +1137,15 @@ utils.inherits(CollectionResource, Resource);
};
}

var W1 = function(){ return new CallbackWrapper(1);};
var W2 = function(){ return new CallbackWrapper(2);};

var methods = {
each: {wrapper: W2}, eachSeries: {wrapper: W2}, eachLimit: {wrapper: W2},
forEach: {wrapper: W2}, forEachSeries: {wrapper: W2}, forEachLimit: {wrapper: W2},
map: {wrapper: W2}, mapSeries: {wrapper: W2}, mapLimit:{wrapper: W2},
filter: {wrapper: W1}, filterSeries: {wrapper: W1},
select: {wrapper: W1}, selectSeries: {wrapper: W1},
reject: {wrapper: W1}, rejectSeries: {wrapper: W1},
filter: {wrapper: W2}, filterSeries: {wrapper: W2},
select: {wrapper: W2}, selectSeries: {wrapper: W2},
reject: {wrapper: W2}, rejectSeries: {wrapper: W2},
reduce: {wrapper: Reduce}, inject: {wrapper: Reduce}, foldl: {wrapper: Reduce},
reduceRight: {wrapper: ReduceRight, method: 'eachSeries'},
foldr: {wrapper: ReduceRight, method: 'eachSeries'},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"test": "grunt"
},
"dependencies": {
"async": "~1.5.2",
"async": "^2.1.2",
"deep-extend": "^0.4.1",
"jwt-simple": "~0.4.0",
"memcached": "~2.2.2",
Expand Down
13 changes: 7 additions & 6 deletions test/it/application_it.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,28 @@ describe('Application',function(){
describe('setDefaultAccountStore',function () {

describe('with a href string property',function(){
var result;
var error;

before(function(done){
app.setDefaultAccountStore(directory.href,function(err){
result = err;
error = err;
done();
});
});
it('should not err',function(){
assert.equal(result,null);
assert.notOk(error);
});
});
describe('with a directory object',function(){
var result;
var error;
before(function(done){
app.setDefaultAccountStore(directory,function(err){
result = err;
error = err;
done();
});
});
it('should not err',function(){
assert.equal(result,null);
assert.notOk(error);
});
});
});
Expand Down
Loading