From 7bb233e269a3c711dc6119a186b46078680b9586 Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Tue, 19 Feb 2013 16:32:21 +0800 Subject: [PATCH 1/3] Fix package version exposing --- index.js | 2 +- test/jugglingdb_test.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 test/jugglingdb_test.js diff --git a/index.js b/index.js index d981af93..cdc8cbf8 100644 --- a/index.js +++ b/index.js @@ -25,7 +25,7 @@ try { if (process.versions.node < '0.6') { exports.version = JSON.parse(fs.readFileSync(__dirname + '/package.json')).version; } else { - exports.version = require('../package').version; + exports.version = require('./package').version; } } catch (e) {} diff --git a/test/jugglingdb_test.js b/test/jugglingdb_test.js new file mode 100644 index 00000000..2ec306f4 --- /dev/null +++ b/test/jugglingdb_test.js @@ -0,0 +1,8 @@ +var juggling = require('../index'); +require('./spec_helper').init(module.exports); + +it('should expose version', function (test) { + console.log('version:', juggling.version); + test.ok(juggling.version); + test.done(); +}); From b9eaba01668174d10558f704d42b4c6a13c0856e Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Tue, 19 Feb 2013 16:32:44 +0800 Subject: [PATCH 2/3] Coding style in helper --- test/spec_helper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec_helper.js b/test/spec_helper.js index d0c13d69..cff21113 100644 --- a/test/spec_helper.js +++ b/test/spec_helper.js @@ -11,7 +11,7 @@ try { } var group_name = false, EXT_EXP; -function it (should, test_case) { +function it(should, test_case) { check_external_exports(); if (group_name) { EXT_EXP[group_name][should] = test_case; @@ -39,7 +39,7 @@ function context(name, tests) { global.context = context; -exports.init = function (external_exports) { +exports.init = function init(external_exports) { EXT_EXP = external_exports; if (external_exports.done) { external_exports.done(); From 56db6934541d7985963db33603ca0a8b0d018afa Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Tue, 19 Feb 2013 16:33:09 +0800 Subject: [PATCH 3/3] List support for non-object values --- lib/list.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/list.js b/lib/list.js index 3de6daec..f985185a 100644 --- a/lib/list.js +++ b/lib/list.js @@ -174,7 +174,11 @@ List.prototype.map = function(cb) { }; function ListItem(data, parent) { - for (var i in data) this[i] = data[i]; + if (typeof data === 'object') { + for (var i in data) this[i] = data[i]; + } else { + this.id = data; + } Object.defineProperty(this, 'parent', { writable: false, enumerable: false,