Commit graph

179 commits

Author SHA1 Message Date
Charlie Robbins
818526ca62 Merge pull request #63 from SchoonologyRRL/patch-1
Updated Memory.merge to handle null values
2012-12-20 22:56:54 -08:00
Michael Schoonmaker
5d2ebfbe9f Added test to confirm merging an Object and null behaves as expected. 2012-12-20 19:02:36 -08:00
indexzero
d77c55d4ba [dist] Version bump. 0.6.7 2012-12-20 18:13:50 -05:00
Michael Hart
bb57c497d3 Prefer this fix for #65 to 6045618 2012-12-20 18:12:42 -05:00
indexzero
aec2b4eb46 [dist] Version bump. 0.6.6 2012-12-20 18:07:16 -05:00
Charlie Robbins
e26f1af48c Merge pull request #67 from flatiron/gh-65
Fix for #65
2012-12-20 15:06:38 -08:00
indexzero
60456186d7 [fix] Fix for #65 2012-12-20 18:03:37 -05:00
indexzero
0d795ecf81 [test] Better tests to show #65 2012-12-20 14:08:36 -05:00
indexzero
f19f0b6c39 [test] Added failing test to illustrate #65 2012-12-20 14:01:04 -05:00
Maciej Małecki
bcbaf3a133 [dist] Bump version to 0.6.5 2012-11-02 18:17:08 +01:00
Maciej Małecki
8b65e195eb [test] Test on newer node versions 2012-11-02 18:09:17 +01:00
Michael Schoonmaker
ed41c51850 Updated Memory.merge to handle null values
Previously, if the Memory store was merged with an object containing a null value, the following Error occurred:

TypeError: Object.keys called on non-object
    at Function.keys (native)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:199:17)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:200:17)
    at Array.every (native)
    at Memory.merge (/.../node_modules/nconf/lib/nconf/stores/memory.js:199:29)
    at common.merge (/.../node_modules/nconf/lib/nconf/common.js:99:13)
    at Array.forEach (native)
    at common.merge (/.../node_modules/nconf/lib/nconf/common.js:98:22)
    at Array.forEach (native)
    at Object.common.merge (/.../node_modules/nconf/lib/nconf/common.js:97:8)

This commit prevents that.
2012-09-27 11:26:56 -07:00
Pavan Kumar Sunkara
2ba437807a Merge pull request #62 from tellnes/loadFrom
Fix ini files for memory loadFrom option
2012-09-16 19:32:47 -07:00
Christian Tellnes
8e987b8d3d make it possible to use other formats than json in common.loadFiles and common.loadFilesSync 2012-09-16 17:45:00 +02:00
Bradley Meck
f9b24f1aa6 Merge pull request #61 from flatiron/merge-null
[fix] null values should merge properly instead of throwing errors
2012-09-08 18:11:54 -07:00
Bradley Meck
da39d3cac3 [fix] null values should merge properly instead of throwing errors 2012-09-08 20:10:58 -05:00
Bradley Meck
f21557e783 Merge pull request #60 from flatiron/root-actions
[fix] #59 root get/set should work via null/undefined as key
2012-09-07 12:10:56 -07:00
Bradley Meck
7421836387 [fix] heirarchy fixture file path wrong in tests 2012-09-07 09:40:15 -05:00
Bradley Meck
683f78918c [fix] #59 root get/set should work via null/undefined as key 2012-09-07 09:29:30 -05:00
Joshua Holbrook
ec9a13e901 Merge pull request #54 from eethann/master
Add docs for optimist options hash
2012-08-06 23:24:22 -07:00
Ethan Winn
0f092ab5a4 Added docs for options hash to optimist.
I had to dig a bit to figure out how to get options working on argv,
thought I'd save others the time.
2012-08-07 01:52:29 -04:00
indexzero
7279bc11b3 [dist] Version bump. 0.6.4 2012-07-10 03:21:06 -04:00
indexzero
d96d2544bc [fix] Fix regression introduced by 36e061c4bd 2012-07-10 03:16:54 -04:00
indexzero
7e8d9d6bce [test] Added failing test for .save() regression introduced by @russfrank in 36e061c4bd 2012-07-10 03:16:04 -04:00
indexzero
04e22303bd [minor doc] Update file header in test/provider-test.js 2012-07-10 03:14:00 -04:00
indexzero
c7c6b6f6ef [dist] Version bump. 0.6.3 2012-07-10 01:50:31 -04:00
indexzero
30734301e7 [api test doc] Make options to Provider.prototype.file take more flexible options 2012-07-10 01:50:18 -04:00
indexzero
8b53c12729 [minor] Use locally scoped path variable 2012-07-10 01:47:28 -04:00
indexzero
80a79733d3 [dist] Version bump. 0.6.2 2012-07-10 01:29:58 -04:00
indexzero
7515f66572 [fix] Ensure that all options are passed to Provider.prototype.add in Provider.prototype.file. Fixes #51
[doc] Update README.md and method documentation
[dist] Remove vim comments
2012-07-10 01:27:28 -04:00
indexzero
eeddb70f20 [dist] Version bump. 0.6.1 2012-07-08 01:40:33 -04:00
Pavan Kumar Sunkara
6dd2351991 Merge pull request #49 from mhart/nested-env-configs
Add support for nested configs via env
2012-06-21 01:44:16 -07:00
Michael Hart
9aaafc5a22 Ugh, fixed whitespace 2012-06-21 18:05:52 +10:00
Michael Hart
3c08fad1c9 Changed to as it's more accurate 2012-06-21 18:04:37 +10:00
Michael Hart
e15f787940 Updated README and allowed a simpley syntax 2012-06-21 17:18:22 +10:00
Michael Hart
92d4e9ea14 Added test and updated docs 2012-06-21 17:04:06 +10:00
Michael Hart
8921d0502e Added support for nested configs via env 2012-06-21 16:46:10 +10:00
Michael Hart
6cbc323005 Add reset to the list of destructive commands 2012-06-14 19:40:28 +05:30
Michael Hart
26d81e8dca Merge objects if necessary when traversing stores on get() 2012-06-13 18:28:54 +05:30
Joshua Holbrook
6b1b019353 Merge pull request #40 from tellnes/master
[fix] Fix spelling in error message
2012-05-23 22:29:56 -07:00
Christian Tellnes
83440f9956 fix spelling in error message 2012-05-24 07:27:19 +02:00
Maciej Małecki
87b0dd01c9 [minor] Use fs.exists when available
`path.exists*` was moved to `fs` module in
joyent/node@e10ed097cb.
2012-05-15 11:02:46 +02:00
Christian Howe
1f67d35305 [dist] Fix maintainers field 2012-05-07 03:56:46 +00:00
Jonathan Stewmon
6353d028f7 api and doc change for flatiron/nconf#28 (.file may now take a string instead of an object)
Conflicts:

	lib/nconf/provider.js
2012-05-03 17:10:19 -07:00
Russell Frank
d3e68976c8 Proper teardowns in complete-test.js 2012-05-03 00:16:13 -04:00
Russell Frank
94bdb7dbd8 Added complete-test.js & fixture.
`complete-test.js` correctly tests the modified `save()` method.  It is
an attempt at a more complete functional test of nconf.
2012-05-01 23:27:00 -04:00
Russell Frank
36e061c4bd Fixes to Provider.save() and tests.
Fixed `Provider.save()` to properly ignore stores which do not provide
a saveSync method.  Also, fixed `save()` to properly save asynchronously
when an async `save()` method on a store is provided.

Removed the tests from `nconf-test.js` which expected `save()` to throw
or return an error when a store without `save()` methods was
encountered. Also removed a `console.log` from `provider-test.js`.
2012-05-01 22:44:15 -04:00
Pavan Kumar Sunkara
29eb5f905d [minor] Fix whitespaces 2012-04-15 00:58:55 +05:30
Jordan Harband
6ce0b7aef3 Surfacing additional JSON.stringify arguments in formats.json.stringify, and adding the json_spacing option to the File constructor. 2012-04-13 13:22:42 -07:00
Maciej Małecki
b3699314cf [minor] Use fs.existsSync when available
`path.exists*` was moved to `fs` module in
joyent/node@e10ed097cb.
2012-03-29 13:13:16 +02:00