anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

add onlyKey opts to storage #getFirst

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-20 10:00:10 -03:00
commit e109550d9b
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/models/Profile.js
View file

@ -45,7 +45,7 @@ Profile.create = function(email, password, storage, cb) {
Profile.any = function(storage, cb) { Profile.any = function(storage, cb) {
storage.getFirst(Profile.key(''), function(err, v, k) { storage.getFirst(Profile.key(''), { onlyKey: true}, function(err, v, k) {
return cb(k ? true : false); return cb(k ? true : false);
}); });
}; };

14
js/models/Storage.js
View file

@ -175,13 +175,21 @@ Storage.prototype.get = function(key, cb) {
}) })
}; };
Storage.prototype.getFirst = function(prefix, cb) { Storage.prototype.getFirst = function(prefix, opts, cb) {
opts = opts || {};
var self = this; var self = this;
this.db.allKeys(function(allKeys) { this.db.allKeys(function(allKeys) {
var keys = _.filter(allKeys, function(k) { var keys = _.filter(allKeys, function(k) {
if ((k === prefix) || k.indexOf(prefix) === 0) return true; if ((k === prefix) || k.indexOf(prefix) === 0) return true;
}); });
if (keys.length === 0) return cb(new Error('not found'));
if (keys.length === 0)
return cb(new Error('not found'));
if (opts.onlyKey)
return cb(null, null, keys[0]);
self._read(keys[0], function(v) { self._read(keys[0], function(v) {
if (_.isNull(v)) return cb(new Error('Could not decrypt data'), null, keys[0]); if (_.isNull(v)) return cb(new Error('Could not decrypt data'), null, keys[0]);
return cb(null, v, keys[0]); return cb(null, v, keys[0]);
@ -206,7 +214,7 @@ Storage.prototype.delete = function(key, cb) {
Storage.prototype.deletePrefix = function(prefix, cb) { Storage.prototype.deletePrefix = function(prefix, cb) {
var self = this; var self = this;
this.getFirst(prefix, function(err, v, k) { this.getFirst(prefix, {}, function(err, v, k) {
if (err || !v) return cb(err); if (err || !v) return cb(err);
self.delete(k, function(err) { self.delete(k, function(err) {

4
js/models/Wallet.js
View file

@ -175,7 +175,7 @@ Wallet.key = function(str) {
Wallet.any = function(storage, cb) { Wallet.any = function(storage, cb) {
storage.getFirst(Wallet.key(''), function(err, v, k) { storage.getFirst(Wallet.key(''), { onlyKey: true}, function(err, v, k) {
return cb(k ? true : false); return cb(k ? true : false);
}); });
}; };
@ -259,7 +259,7 @@ Wallet.read = function(walletId, readOpts, cb) {
err; err;
var obj = {}; var obj = {};
storage.getFirst(Wallet.key(walletId), function(err, ret) { storage.getFirst(Wallet.key(walletId), {}, function(err, ret) {
if (err) return cb(err); if (err) return cb(err);
if (!ret) if (!ret)

2
test/Storage.js
View file

@ -347,7 +347,7 @@ describe('Storage model', function() {
sinon.stub(s, '_read', function(k, cb) { sinon.stub(s, '_read', function(k, cb) {
return cb(data[k]); return cb(data[k]);
}); });
s.getFirst('wallet::id1', function(err, w) { s.getFirst('wallet::id1', {}, function(err, w) {
should.not.exist(err); should.not.exist(err);
w.should.exist; w.should.exist;
w.hasOwnProperty('a').should.be.true; w.hasOwnProperty('a').should.be.true;