TheThing/nconf-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #67 from flatiron/gh-65

Browse source 
Fix for #65
This commit is contained in:
Charlie Robbins 2012-12-20 15:06:38 -08:00
commit e26f1af48c
2 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/nconf/stores/memory.js
View file

@ -42,7 +42,7 @@ Memory.prototype.get = function (key) {
// //
while (path.length > 0) { while (path.length > 0) {
key = path.shift(); key = path.shift();
if (target && key in target) { if (target && typeof target !== 'string' && key in target) {
target = target[key]; target = target[key];
continue; continue;
} }

34
test/stores/memory-store-test.js
View file

@ -17,7 +17,8 @@ vows.describe('nconf/stores/memory').addBatch({
"should respond with true": function (store) { "should respond with true": function (store) {
assert.isTrue(store.set('foo:bar:bazz', 'buzz')); assert.isTrue(store.set('foo:bar:bazz', 'buzz'));
assert.isTrue(store.set('falsy:number', 0)); assert.isTrue(store.set('falsy:number', 0));
assert.isTrue(store.set('falsy:string', '')); assert.isTrue(store.set('falsy:string:empty', ''));
assert.isTrue(store.set('falsy:string:value', 'value'));
assert.isTrue(store.set('falsy:boolean', false)); assert.isTrue(store.set('falsy:boolean', false));
assert.isTrue(store.set('falsy:object', null)); assert.isTrue(store.set('falsy:object', null));
} }
@ -26,19 +27,42 @@ vows.describe('nconf/stores/memory').addBatch({
"should respond with the correct value": function (store) { "should respond with the correct value": function (store) {
assert.equal(store.get('foo:bar:bazz'), 'buzz'); assert.equal(store.get('foo:bar:bazz'), 'buzz');
assert.equal(store.get('falsy:number'), 0); assert.equal(store.get('falsy:number'), 0);
assert.equal(store.get('falsy:string'), ''); assert.equal(store.get('falsy:string:empty'), '');
assert.equal(store.get('falsy:string:value'), 'value');
assert.equal(store.get('falsy:boolean'), false); assert.equal(store.get('falsy:boolean'), false);
assert.equal(store.get('falsy:object'), null); assert.equal(store.get('falsy:object'), null);
}, },
"should not fail when retrieving non-existent keys": function (store) { "should not fail when retrieving non-existent keys": {
"at the root level": function (store) {
assert.doesNotThrow(function() { assert.doesNotThrow(function() {
assert.equal(store.get('this:key:does:not:exist'), undefined); assert.equal(store.get('this:key:does:not:exist'), undefined);
}, TypeError); }, TypeError);
}, },
"should not fail when drilling into non-objects": function (store) { "within numbers": function (store) {
assert.doesNotThrow(function() { assert.doesNotThrow(function() {
assert.equal(store.get('falsy:number:uh:oh'), undefined); assert.equal(store.get('falsy:number:not:exist'), undefined);
}, TypeError); }, TypeError);
},
"within booleans": function (store) {
assert.doesNotThrow(function() {
assert.equal(store.get('falsy:boolean:not:exist'), undefined);
}, TypeError);
},
"within objects": function (store) {
assert.doesNotThrow(function() {
assert.equal(store.get('falsy:object:not:exist'), undefined);
}, TypeError);
},
"within empty strings": function (store) {
assert.doesNotThrow(function() {
assert.equal(store.get('falsy:string:empty:not:exist'), undefined);
}, TypeError);
},
"within empty strings": function (store) {
assert.doesNotThrow(function() {
assert.equal(store.get('falsy:string:value:not:exist'), undefined);
}, TypeError);
}
} }
}, },
"the clear() method": { "the clear() method": {