GWicke has submitted this change and it was merged.
Change subject: Update restbase & dependencies for v0.2.1
......................................................................
Update restbase & dependencies for v0.2.1
Change-Id: Ic9cb6bed517e9269049b9a8949bdf731db06e5be
---
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
M node_modules/preq/node_modules/bluebird/js/browser/bluebird.js
M node_modules/preq/node_modules/bluebird/js/main/join.js
M node_modules/preq/node_modules/bluebird/js/main/timers.js
M node_modules/preq/node_modules/bluebird/js/zalgo/join.js
M node_modules/preq/node_modules/bluebird/js/zalgo/timers.js
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/restbase-cassandra/index.js
M node_modules/restbase-cassandra/lib/index.js
M
node_modules/restbase-cassandra/node_modules/assert/node_modules/util/node_modules/inherits/package.json
M node_modules/restbase-cassandra/node_modules/async/package.json
M node_modules/restbase-cassandra/node_modules/bluebird/js/browser/bluebird.js
M node_modules/restbase-cassandra/node_modules/bluebird/js/main/join.js
M node_modules/restbase-cassandra/node_modules/bluebird/js/main/timers.js
M node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/join.js
M node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/timers.js
M node_modules/restbase-cassandra/node_modules/bluebird/package.json
M
node_modules/restbase-cassandra/node_modules/restify/node_modules/lru-cache/package.json
M node_modules/restbase-cassandra/package.json
M restbase
23 files changed, 164 insertions(+), 90 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git
a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
index 84e7559..92eaac6 100644
--- a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
+++ b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
@@ -53,7 +53,5 @@
],
"directories": {},
"_shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
- "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";,
- "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[](http://travis-ci.org/substack/node-mkdirp)\n\n#
example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n
\nmkdirp('/tmp/foo/bar/baz', function (err) {\n if (err)
console.error(err)\n else
console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now
/tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp =
require('mkdirp');\n```\n\n## mkdirp(dir, opts, cb)\n\nCreate a new directory
and any necessary subdirectories at `dir` with octal\npermission string
`opts.mode`. If `opts` is a non-object, it will be treated as\nthe
`opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 &
(~process.umask())`.\n\n`cb(err, made)` fires with the error or the first
directory `made`\nthat had to be created, if any.\n\nYou can optionally pass in
an alternate `fs` implementation by passing in\n`opts.fs`. Your implementation
should have `opts.fs.mkdir(path, mode, cb)` and\n`opts.fs.stat(path,
cb)`.\n\n## mkdirp.sync(dir, opts)\n\nSynchronously create a new directory and
any necessary subdirectories at `dir`\nwith octal permission string
`opts.mode`. If `opts` is a non-object, it will be\ntreated as the
`opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 &
(~process.umask())`.\n\nReturns the first directory that had to be created, if
any.\n\nYou can optionally pass in an alternate `fs` implementation by passing
in\n`opts.fs`. Your implementation should have `opts.fs.mkdirSync(path, mode)`
and\n`opts.fs.statSync(path)`.\n\n# usage\n\nThis package also ships with a
`mkdirp` command.\n\n```\nusage: mkdirp [DIR1,DIR2..] {OPTIONS}\n\n Create
each supplied directory including any necessary parent directories that\n
don't yet exist.\n \n If the directory already exists, do nothing.\n\nOPTIONS
are:\n\n -m, --mode If a directory needs to be created, set the mode as an
octal\n permission string.\n\n```\n\n# install\n\nWith
[npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\nto get the
library, or\n\n```\nnpm install -g mkdirp\n```\n\nto get the command.\n\n#
license\n\nMIT\n",
- "readmeFilename": "readme.markdown"
+ "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
}
diff --git
a/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
index d181aaf..7cd80f4 100644
--- a/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/node_modules/minimist/package.json
@@ -62,7 +62,5 @@
],
"directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
- "readme": "# minimist\n\nparse argument options\n\nThis module is the guts
of optimist's argument parser without all the\nfanciful
decoration.\n\n[](http://ci.testling.com/substack/minimist)\n\n[](http://travis-ci.org/substack/minimist)\n\n#
example\n\n``` js\nvar argv =
require('minimist')(process.argv.slice(2));\nconsole.dir(argv);\n```\n\n```\n$
node example/parse.js -a beep -b boop\n{ _: [], a: 'beep', b: 'boop'
}\n```\n\n```\n$ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar
baz\n{ _: [ 'foo', 'bar', 'baz' ],\n x: 3,\n y: 4,\n n: 5,\n a: true,\n b:
true,\n c: true,\n beep: 'boop' }\n```\n\n# methods\n\n``` js\nvar parseArgs
= require('minimist')\n```\n\n## var argv = parseArgs(args, opts={})\n\nReturn
an argument object `argv` populated with the array arguments from
`args`.\n\n`argv._` contains all the arguments that didn't have an option
associated with\nthem.\n\nNumeric-looking arguments will be returned as numbers
unless `opts.string` or\n`opts.boolean` is set for that argument name.\n\nAny
arguments after `'--'` will not be parsed and will end up in
`argv._`.\n\noptions can be:\n\n* `opts.string` - a string or array of strings
argument names to always treat as\nstrings\n* `opts.boolean` - a string or
array of strings to always treat as booleans\n* `opts.alias` - an object
mapping string names to strings or arrays of string\nargument names to use as
aliases\n* `opts.default` - an object mapping string argument names to default
values\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install
minimist\n```\n\n# license\n\nMIT\n",
- "readmeFilename": "readme.markdown"
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index f209212..92eaac6 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "[email protected]",
+ "_from": "mkdirp@~0.5.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
@@ -53,7 +53,5 @@
],
"directories": {},
"_shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
- "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";,
- "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[](http://travis-ci.org/substack/node-mkdirp)\n\n#
example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n
\nmkdirp('/tmp/foo/bar/baz', function (err) {\n if (err)
console.error(err)\n else
console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now
/tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp =
require('mkdirp');\n```\n\n## mkdirp(dir, opts, cb)\n\nCreate a new directory
and any necessary subdirectories at `dir` with octal\npermission string
`opts.mode`. If `opts` is a non-object, it will be treated as\nthe
`opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 &
(~process.umask())`.\n\n`cb(err, made)` fires with the error or the first
directory `made`\nthat had to be created, if any.\n\nYou can optionally pass in
an alternate `fs` implementation by passing in\n`opts.fs`. Your implementation
should have `opts.fs.mkdir(path, mode, cb)` and\n`opts.fs.stat(path,
cb)`.\n\n## mkdirp.sync(dir, opts)\n\nSynchronously create a new directory and
any necessary subdirectories at `dir`\nwith octal permission string
`opts.mode`. If `opts` is a non-object, it will be\ntreated as the
`opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 &
(~process.umask())`.\n\nReturns the first directory that had to be created, if
any.\n\nYou can optionally pass in an alternate `fs` implementation by passing
in\n`opts.fs`. Your implementation should have `opts.fs.mkdirSync(path, mode)`
and\n`opts.fs.statSync(path)`.\n\n# usage\n\nThis package also ships with a
`mkdirp` command.\n\n```\nusage: mkdirp [DIR1,DIR2..] {OPTIONS}\n\n Create
each supplied directory including any necessary parent directories that\n
don't yet exist.\n \n If the directory already exists, do nothing.\n\nOPTIONS
are:\n\n -m, --mode If a directory needs to be created, set the mode as an
octal\n permission string.\n\n```\n\n# install\n\nWith
[npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\nto get the
library, or\n\n```\nnpm install -g mkdirp\n```\n\nto get the command.\n\n#
license\n\nMIT\n",
- "readmeFilename": "readme.markdown"
+ "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
}
diff --git
a/node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
b/node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
index 25a90e8..af046a9 100644
---
a/node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
+++
b/node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
@@ -74,6 +74,5 @@
"tarball": "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/nan/-/nan-1.3.0.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
}
diff --git a/node_modules/preq/node_modules/bluebird/js/browser/bluebird.js
b/node_modules/preq/node_modules/bluebird/js/browser/bluebird.js
index bbf733f..5a1e1f5 100644
--- a/node_modules/preq/node_modules/bluebird/js/browser/bluebird.js
+++ b/node_modules/preq/node_modules/bluebird/js/browser/bluebird.js
@@ -1,5 +1,5 @@
/**
- * bluebird build version 2.3.10
+ * bluebird build version 2.3.11
* Features enabled: core, race, call_get, generators, map, nodeify,
promisify, props, reduce, settle, some, progress, cancel, using, filter, any,
each, timers
*/
/**
@@ -1570,8 +1570,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -1582,7 +1583,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
@@ -4797,7 +4797,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -4849,14 +4849,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git a/node_modules/preq/node_modules/bluebird/js/main/join.js
b/node_modules/preq/node_modules/bluebird/js/main/join.js
index 8391ede..076512b 100644
--- a/node_modules/preq/node_modules/bluebird/js/main/join.js
+++ b/node_modules/preq/node_modules/bluebird/js/main/join.js
@@ -82,8 +82,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -94,7 +95,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
diff --git a/node_modules/preq/node_modules/bluebird/js/main/timers.js
b/node_modules/preq/node_modules/bluebird/js/main/timers.js
index 6683ba3..bd4a6fb 100644
--- a/node_modules/preq/node_modules/bluebird/js/main/timers.js
+++ b/node_modules/preq/node_modules/bluebird/js/main/timers.js
@@ -28,7 +28,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -80,14 +80,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git a/node_modules/preq/node_modules/bluebird/js/zalgo/join.js
b/node_modules/preq/node_modules/bluebird/js/zalgo/join.js
index 8391ede..076512b 100644
--- a/node_modules/preq/node_modules/bluebird/js/zalgo/join.js
+++ b/node_modules/preq/node_modules/bluebird/js/zalgo/join.js
@@ -82,8 +82,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -94,7 +95,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
diff --git a/node_modules/preq/node_modules/bluebird/js/zalgo/timers.js
b/node_modules/preq/node_modules/bluebird/js/zalgo/timers.js
index 6683ba3..bd4a6fb 100644
--- a/node_modules/preq/node_modules/bluebird/js/zalgo/timers.js
+++ b/node_modules/preq/node_modules/bluebird/js/zalgo/timers.js
@@ -28,7 +28,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -80,14 +80,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git a/node_modules/preq/node_modules/bluebird/package.json
b/node_modules/preq/node_modules/bluebird/package.json
index 843f970..5218bd4 100644
--- a/node_modules/preq/node_modules/bluebird/package.json
+++ b/node_modules/preq/node_modules/bluebird/package.json
@@ -1,7 +1,7 @@
{
"name": "bluebird",
"description": "Full featured Promises/A+ implementation with exceptionally
good performance",
- "version": "2.3.10",
+ "version": "2.3.11",
"keywords": [
"promise",
"performance",
@@ -70,10 +70,10 @@
"LICENSE",
"zalgo.js"
],
- "gitHead": "cdfdcf6aa6adb69d9bec73625ef91e66579e9ce7",
- "_id": "[email protected]",
- "_shasum": "a3d76a6e734f60bda9cf8d8e092c7969d8018beb",
- "_from": "bluebird@^2.3.2",
+ "gitHead": "bd97da362617dcc0a29b719e1bab3165353ef786",
+ "_id": "[email protected]",
+ "_shasum": "15bb78ed32abf27b090640c0f85e4b91f615c8b6",
+ "_from": "bluebird@^2.3.10",
"_npmVersion": "1.4.21",
"_npmUser": {
"name": "esailija",
@@ -86,10 +86,9 @@
}
],
"dist": {
- "shasum": "a3d76a6e734f60bda9cf8d8e092c7969d8018beb",
- "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.3.10.tgz";
+ "shasum": "15bb78ed32abf27b090640c0f85e4b91f615c8b6",
+ "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.3.10.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz";
}
diff --git a/node_modules/restbase-cassandra/index.js
b/node_modules/restbase-cassandra/index.js
index d14b96e..24942fa 100644
--- a/node_modules/restbase-cassandra/index.js
+++ b/node_modules/restbase-cassandra/index.js
@@ -19,7 +19,7 @@
}
function RBCassandra (options) {
- this.config = options.config;
+ this.conf = options.conf;
this.log = options.log;
this.setup = this.setup.bind(this);
this.store = null;
@@ -173,7 +173,7 @@
var self = this;
// Set up storage backend
var backend = require('./lib/index');
- return backend(self.config.storage)
+ return backend(self.conf)
.then(function(store) {
self.store = store;
// console.log('RB setup complete', self.handler);
@@ -189,19 +189,6 @@
* object
*/
function makeRBCassandra (options) {
- // XXX: move to global config
- options.config = {
- sysdomain: "system.storoid", // reverse DNS notation
- storage: {
- "contactPoints": ["localhost"],
- "id": "<uuid>",
- "keyspace": "system",
- "username": "test",
- "password": "test",
- "poolSize": 70,
- }
- };
-
var rb = new RBCassandra(options);
return rb.setup();
}
diff --git a/node_modules/restbase-cassandra/lib/index.js
b/node_modules/restbase-cassandra/lib/index.js
index 7861196..519b121 100644
--- a/node_modules/restbase-cassandra/lib/index.js
+++ b/node_modules/restbase-cassandra/lib/index.js
@@ -15,6 +15,12 @@
function makeClient (options) {
+ if (!options.keyspace) {
+ options.keyspace = 'system';
+ }
+ if (!options.contactPoints) {
+ options.contactPoints = options.hosts;
+ }
var client = promisifyClient(new cass.Client(options));
var reconnectCB = function(err) {
diff --git
a/node_modules/restbase-cassandra/node_modules/assert/node_modules/util/node_modules/inherits/package.json
b/node_modules/restbase-cassandra/node_modules/assert/node_modules/util/node_modules/inherits/package.json
index c532ca6..71098e4 100644
---
a/node_modules/restbase-cassandra/node_modules/assert/node_modules/util/node_modules/inherits/package.json
+++
b/node_modules/restbase-cassandra/node_modules/assert/node_modules/util/node_modules/inherits/package.json
@@ -29,5 +29,5 @@
},
"homepage": "https://github.com/isaacs/inherits";,
"_id": "[email protected]",
- "_from": "inherits@~2.0.1"
+ "_from": "[email protected]"
}
diff --git a/node_modules/restbase-cassandra/node_modules/async/package.json
b/node_modules/restbase-cassandra/node_modules/async/package.json
index 4901903..fbdc082 100644
--- a/node_modules/restbase-cassandra/node_modules/async/package.json
+++ b/node_modules/restbase-cassandra/node_modules/async/package.json
@@ -39,5 +39,5 @@
"readmeFilename": "README.md",
"homepage": "https://github.com/caolan/async";,
"_id": "[email protected]",
- "_from": "[email protected]"
+ "_from": "async@~0.9.0"
}
diff --git
a/node_modules/restbase-cassandra/node_modules/bluebird/js/browser/bluebird.js
b/node_modules/restbase-cassandra/node_modules/bluebird/js/browser/bluebird.js
index bbf733f..5a1e1f5 100644
---
a/node_modules/restbase-cassandra/node_modules/bluebird/js/browser/bluebird.js
+++
b/node_modules/restbase-cassandra/node_modules/bluebird/js/browser/bluebird.js
@@ -1,5 +1,5 @@
/**
- * bluebird build version 2.3.10
+ * bluebird build version 2.3.11
* Features enabled: core, race, call_get, generators, map, nodeify,
promisify, props, reduce, settle, some, progress, cancel, using, filter, any,
each, timers
*/
/**
@@ -1570,8 +1570,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -1582,7 +1583,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
@@ -4797,7 +4797,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -4849,14 +4849,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git
a/node_modules/restbase-cassandra/node_modules/bluebird/js/main/join.js
b/node_modules/restbase-cassandra/node_modules/bluebird/js/main/join.js
index 8391ede..076512b 100644
--- a/node_modules/restbase-cassandra/node_modules/bluebird/js/main/join.js
+++ b/node_modules/restbase-cassandra/node_modules/bluebird/js/main/join.js
@@ -82,8 +82,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -94,7 +95,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
diff --git
a/node_modules/restbase-cassandra/node_modules/bluebird/js/main/timers.js
b/node_modules/restbase-cassandra/node_modules/bluebird/js/main/timers.js
index 6683ba3..bd4a6fb 100644
--- a/node_modules/restbase-cassandra/node_modules/bluebird/js/main/timers.js
+++ b/node_modules/restbase-cassandra/node_modules/bluebird/js/main/timers.js
@@ -28,7 +28,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -80,14 +80,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git
a/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/join.js
b/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/join.js
index 8391ede..076512b 100644
--- a/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/join.js
+++ b/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/join.js
@@ -82,8 +82,9 @@
};
}
-
-
+function reject(reason) {
+ this._reject(reason);
+}
Promise.join = function Promise$Join() {
var last = arguments.length - 1;
@@ -94,7 +95,6 @@
var ret = new Promise(INTERNAL);
ret._setTrace(void 0);
var holder = new Holder(last, fn);
- var reject = ret._reject;
var callbacks = thenCallbacks;
for (var i = 0; i < last; ++i) {
var maybePromise = cast(arguments[i], void 0);
diff --git
a/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/timers.js
b/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/timers.js
index 6683ba3..bd4a6fb 100644
--- a/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/timers.js
+++ b/node_modules/restbase-cassandra/node_modules/bluebird/js/zalgo/timers.js
@@ -28,7 +28,7 @@
var arg0 = arguments[2];
var arg1 = arguments[3];
var arg2 = len >= 5 ? arguments[4] : void 0;
- setTimeout(function() {
+ return setTimeout(function() {
fn(arg0, arg1, arg2);
}, ms|0);
};
@@ -80,14 +80,29 @@
return delay(this, ms);
};
+function successClear(value) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ return value;
+}
+
+function failureClear(reason) {
+ var handle = this;
+ if (handle instanceof Number) handle = +handle;
+ clearTimeout(handle);
+ throw reason;
+}
+
Promise.prototype.timeout = function Promise$timeout(ms, message) {
ms = +ms;
var ret = new Promise(INTERNAL);
ret._propagateFrom(this, 7);
ret._follow(this);
- _setTimeout(afterTimeout, ms, ret, message, ms);
- return ret.cancellable();
+ var handle = _setTimeout(afterTimeout, ms, ret, message, ms);
+ return ret.cancellable()
+ ._then(successClear, failureClear, void 0, handle, void 0);
};
};
diff --git a/node_modules/restbase-cassandra/node_modules/bluebird/package.json
b/node_modules/restbase-cassandra/node_modules/bluebird/package.json
index 9b2c6da..5218bd4 100644
--- a/node_modules/restbase-cassandra/node_modules/bluebird/package.json
+++ b/node_modules/restbase-cassandra/node_modules/bluebird/package.json
@@ -1,7 +1,7 @@
{
"name": "bluebird",
"description": "Full featured Promises/A+ implementation with exceptionally
good performance",
- "version": "2.3.10",
+ "version": "2.3.11",
"keywords": [
"promise",
"performance",
@@ -70,9 +70,9 @@
"LICENSE",
"zalgo.js"
],
- "gitHead": "cdfdcf6aa6adb69d9bec73625ef91e66579e9ce7",
- "_id": "[email protected]",
- "_shasum": "a3d76a6e734f60bda9cf8d8e092c7969d8018beb",
+ "gitHead": "bd97da362617dcc0a29b719e1bab3165353ef786",
+ "_id": "[email protected]",
+ "_shasum": "15bb78ed32abf27b090640c0f85e4b91f615c8b6",
"_from": "bluebird@^2.3.10",
"_npmVersion": "1.4.21",
"_npmUser": {
@@ -86,10 +86,9 @@
}
],
"dist": {
- "shasum": "a3d76a6e734f60bda9cf8d8e092c7969d8018beb",
- "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.3.10.tgz";
+ "shasum": "15bb78ed32abf27b090640c0f85e4b91f615c8b6",
+ "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.3.10.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz";
}
diff --git
a/node_modules/restbase-cassandra/node_modules/restify/node_modules/lru-cache/package.json
b/node_modules/restbase-cassandra/node_modules/restify/node_modules/lru-cache/package.json
index 9c45e47..dda9767 100644
---
a/node_modules/restbase-cassandra/node_modules/restify/node_modules/lru-cache/package.json
+++
b/node_modules/restbase-cassandra/node_modules/restify/node_modules/lru-cache/package.json
@@ -30,6 +30,6 @@
"homepage": "https://github.com/isaacs/node-lru-cache";,
"_id": "[email protected]",
"_shasum": "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb",
- "_from": "lru-cache@2",
+ "_from": "lru-cache@^2.5.0",
"_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
}
diff --git a/node_modules/restbase-cassandra/package.json
b/node_modules/restbase-cassandra/package.json
index 023fc2e..a77f63b 100644
--- a/node_modules/restbase-cassandra/package.json
+++ b/node_modules/restbase-cassandra/package.json
@@ -1,7 +1,7 @@
{
"name": "restbase-cassandra",
"description": "RESTBase table storage on Cassandra",
- "version": "0.2.0",
+ "version": "0.2.1",
"dependencies": {
"assert": "^1.1.1",
"async": "0.x.x",
@@ -22,8 +22,8 @@
},
"readme": "# [RESTBase](https://github.com/gwicke/restbase) table storage on
Cassandra\n\nProvides a high-level table storage service abstraction similar to
Amazon\nDynamoDB or Google DataStore, with a Cassandra backend. See [the
design\ndocs](https://github.com/gwicke/restbase-cassandra/tree/master/doc)
for\ndetails and background.\n\nThis is the default table storage backend
for\n[RESTBase](https://github.com/gwicke/restbase), and automatically
installed as\nan npm module dependency (`restbase-cassandra`). See the install
instructions\nthere.\n \n## Status\nPrototype, not quite ready for
production.\n\n[](https://travis-ci.org/gwicke/restbase-cassandra)\n\nFeatures:\n-
basic table storage service with REST interface, backed by Cassandra\n-
multi-tenant design: domain creation, prepared for per-domain ACLs\n- table
creation with declarative JSON schemas\n- secondary index creation and basic
maintenance\n- data insertion and retrieval by primary key, including range
queries\n\n### Next steps\n- More refined [secondary\n
index](https://github.com/gwicke/restbase-cassandra/blob/master/doc/SecondaryIndexes.md)\n
implementation\n - range queries on secondary indexes\n- Refine HTTP
interface & response formats, especially paging\n- Authentication (OAuth2 / JWT
/ JWS / auth service callbacks) and ACLs\n-
[Transactions](https://github.com/gwicke/restbase-cassandra/blob/master/doc/Transactions.md):\n
light-weight CAS and 2PC\n- Get ready for production: robustness,
performance, logging\n- Basic schema evolution support\n\n## Contributors\n*
Gabriel Wicke <[email protected]>\n* Hardik Juneja
<[email protected]>\n",
"readmeFilename": "Readme.md",
- "gitHead": "199d4dc8c085045c6dd9c700658d3f8432868c5d",
- "_id": "[email protected]",
- "_shasum": "75f6a33330ab18a5fe70f81793753725988d1140",
- "_from": "restbase-cassandra@^0.2.0"
+ "gitHead": "9584edbc59cf2ba444e7de05176afc56e46470cf",
+ "_id": "[email protected]",
+ "_shasum": "e4befbaf970805069b7740d78c80a2878d4879a5",
+ "_from": "restbase-cassandra@^0.2.1"
}
diff --git a/restbase b/restbase
index 266f33f..cd0d101 160000
--- a/restbase
+++ b/restbase
-Subproject commit 266f33f4380a703a0f58e9e10019127339a25b4c
+Subproject commit cd0d1013d0e5f9d645ddbb273671825e0e142447
--
To view, visit https://gerrit.wikimedia.org/r/171897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9cb6bed517e9269049b9a8949bdf731db06e5be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
