abetomo
null+****@clear*****
Wed Aug 30 13:14:01 JST 2017
abetomo 2017-08-14 15:16:43 +0900 (Mon, 14 Aug 2017) New Revision: 41100e8c84616b1dc9bbf373954008aea8be1bdc https://github.com/nroonga/nroonga/commit/41100e8c84616b1dc9bbf373954008aea8be1bdc Merged 2f7c45b: Merge pull request #7 from abetomo/upgrade_node_to_use Message: Stop using msgpack Because `msgpack-node` does not appear to be actively maintained. https://github.com/msgpack/msgpack-node/commits/master Modified files: lib/nroonga.js npm-shrinkwrap.json package.json Modified: lib/nroonga.js (+3 -4) =================================================================== --- lib/nroonga.js 2014-12-22 16:38:29 +0900 (258f30f) +++ lib/nroonga.js 2017-08-14 15:16:43 +0900 (26627db) @@ -1,5 +1,4 @@ var nroonga = module.exports = require('../build/Release/nroonga_bindings.node'); -var msgpack = require('msgpack'); function optionsToCommandString(command, options) { var args, key; @@ -31,7 +30,7 @@ function formatResult(result, command) { return result.toString('UTF-8'); } else { if (result.length > 0) { - return msgpack.unpack(result); + return JSON.parse(result); } else { return null; } @@ -39,7 +38,7 @@ function formatResult(result, command) { } nroonga.Database.prototype.commandSync = function(command, options) { - var overridedOptions = overrideOutputType(options || {}, 'msgpack'); + var overridedOptions = overrideOutputType(options || {}, 'json'); var commandString = optionsToCommandString(command, overridedOptions); var result = this.commandSyncString(commandString); @@ -66,7 +65,7 @@ nroonga.Database.prototype.command = function(command, options, callback) { }; } - overridedOptions = overrideOutputType(options, 'msgpack'); + overridedOptions = overrideOutputType(options, 'json'); commandString = optionsToCommandString(command, overridedOptions); return this.commandString(commandString, wrappedCallback); Modified: npm-shrinkwrap.json (+46 -26) =================================================================== --- npm-shrinkwrap.json 2014-12-22 16:38:29 +0900 (3d7fb86) +++ npm-shrinkwrap.json 2017-08-14 15:16:43 +0900 (212eb93) @@ -1,60 +1,80 @@ { "name": "nroonga", - "version": "0.2.4", + "version": "0.2.5", + "lockfileVersion": 1, + "requires": true, "dependencies": { - "msgpack": { - "version": "0.1.8", - "from": "msgpack �� 0.1.8" - }, "coffee-script": { "version": "1.6.2", - "from": "coffee-script@" - }, - "should": { - "version": "1.2.2", - "from": "should@", - "resolved": "https://registry.npmjs.org/should/-/should-1.2.2.tgz" + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.2.tgz", + "integrity": "sha1-/ZyINpweQeMwegoWDXE/IlE8k7M=" }, "mocha": { "version": "1.9.0", - "from": "mocha@", "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.9.0.tgz", + "integrity": "sha1-FBBUsTywPOXOWa7OPWXVygG43wo=", + "requires": { + "commander": "0.6.1", + "debug": "0.7.2", + "diff": "1.0.2", + "growl": "1.7.0", + "jade": "0.26.3", + "mkdirp": "0.3.3", + "ms": "0.3.0" + }, "dependencies": { "commander": { "version": "0.6.1", - "from": "commander �� 0.6.1" + "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=" + }, + "debug": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.2.tgz", + "integrity": "sha1-BWaSyGZwl38RXegpF5GLjouaEPA=" + }, + "diff": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.2.tgz", + "integrity": "sha1-Suc/Gu6Nb89ITxoc53zmUdm38Mk=" }, "growl": { "version": "1.7.0", - "from": "growl �� 1.7.x" + "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz", + "integrity": "sha1-3i1mE20ALhErpw8/EMMc98NQsto=" }, "jade": { "version": "0.26.3", - "from": "jade �� 0.26.3", + "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=", + "requires": { + "commander": "0.6.1", + "mkdirp": "0.3.0" + }, "dependencies": { "mkdirp": { "version": "0.3.0", - "from": "mkdirp �� 0.3.0" + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=" } } }, - "diff": { - "version": "1.0.2", - "from": "diff �� 1.0.2" - }, - "debug": { - "version": "0.7.2", - "from": "debug@*" - }, "mkdirp": { "version": "0.3.3", - "from": "mkdirp �� 0.3.3" + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz", + "integrity": "sha1-WV4lHBNww6aLqyE20ONIuBBa3xM=" }, "ms": { "version": "0.3.0", - "from": "ms �� 0.3.0" + "resolved": "https://registry.npmjs.org/ms/-/ms-0.3.0.tgz", + "integrity": "sha1-A+3DSNYT5mpWSGz9rFO8vomcvWE=" } } + }, + "should": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/should/-/should-1.2.2.tgz", + "integrity": "sha1-DwP3dQZtnqJjJpDJF7EoJPzB1YI=" } } } Modified: package.json (+1 -3) =================================================================== --- package.json 2014-12-22 16:38:29 +0900 (37fc792) +++ package.json 2017-08-14 15:16:43 +0900 (d89540f) @@ -17,9 +17,7 @@ "mocha": "", "should": "" }, - "dependencies": { - "msgpack": "" - }, + "dependencies": {}, "scripts": { "test": "./node_modules/.bin/mocha --reporter list -r should --compilers coffee:coffee-script", "install": "node-gyp rebuild" -------------- next part -------------- HTML����������������������������...Download