Mobrovac has submitted this change and it was merged.
Change subject: Update restbase to 8deb9bc
......................................................................
Update restbase to 8deb9bc
List of changes:
68b3bc9 key_value mod: Support supplying the TID properly on store
e405cce key_value mod: Bug fix: remove instances of revisions
ec55f5a WIP new validator features
c945ba2 Added more features to the validator
6aff81b Fixed number validator support
a650a03 Fixed failing jscs
5ef5c55 Added type coersion and docs
393ea58 Minor improvements in generated code
a4157e4 Safer regex testing and rebase
673800d key_value mod: Use a retention policy for bucket tables
f01a81a Parsoid mod: Bug fix: Translate scrub_wikitext and bodyOnly always
e47d06b key_value mod: When storing a record, use its ETag if provided
8fc0c7a Parsoid mod: Log bodyOnly only if in original request and delete
content-length
xxxxxxx Update node module dependencies
Change-Id: I9c838b04732749bd97f3678623e50d39d0f0b966
---
M node_modules/core-util-is/package.json
M node_modules/preq/node_modules/request/node_modules/node-uuid/.npmignore
M node_modules/preq/node_modules/request/node_modules/node-uuid/bower.json
M node_modules/preq/node_modules/request/node_modules/node-uuid/component.json
M node_modules/preq/node_modules/request/node_modules/node-uuid/package.json
M node_modules/preq/node_modules/request/node_modules/node-uuid/test/test.js
M node_modules/preq/node_modules/request/node_modules/node-uuid/uuid.js
M
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
M
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
M restbase
10 files changed, 73 insertions(+), 50 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/core-util-is/package.json
b/node_modules/core-util-is/package.json
index bb455d1..89cb713 100644
--- a/node_modules/core-util-is/package.json
+++ b/node_modules/core-util-is/package.json
@@ -49,6 +49,5 @@
],
"directories": {},
"_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
- "_resolved":
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";,
- "scripts": {}
+ "_resolved":
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
}
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/.npmignore
b/node_modules/preq/node_modules/request/node_modules/node-uuid/.npmignore
index fd4f2b0..8886139 100644
--- a/node_modules/preq/node_modules/request/node_modules/node-uuid/.npmignore
+++ b/node_modules/preq/node_modules/request/node_modules/node-uuid/.npmignore
@@ -1,2 +1,4 @@
node_modules
.DS_Store
+.nyc_output
+coverage
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/bower.json
b/node_modules/preq/node_modules/request/node_modules/node-uuid/bower.json
index 1656dc8..815062d 100644
--- a/node_modules/preq/node_modules/request/node_modules/node-uuid/bower.json
+++ b/node_modules/preq/node_modules/request/node_modules/node-uuid/bower.json
@@ -1,6 +1,6 @@
{
"name": "node-uuid",
- "version": "1.4.3",
+ "version": "1.4.2",
"homepage": "https://github.com/broofa/node-uuid";,
"authors": [
"Robert Kieffer <[email protected]>"
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/component.json
b/node_modules/preq/node_modules/request/node_modules/node-uuid/component.json
index 149f84b..ace2134 100644
---
a/node_modules/preq/node_modules/request/node_modules/node-uuid/component.json
+++
b/node_modules/preq/node_modules/request/node_modules/node-uuid/component.json
@@ -2,7 +2,7 @@
"name": "node-uuid",
"repo": "broofa/node-uuid",
"description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
- "version": "1.4.3",
+ "version": "1.4.0",
"author": "Robert Kieffer <[email protected]>",
"contributors": [
{"name": "Christoph Tavan <[email protected]>", "github":
"https://github.com/ctavan"}
@@ -15,4 +15,4 @@
"uuid.js"
],
"license": "MIT"
-}
+}
\ No newline at end of file
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/package.json
b/node_modules/preq/node_modules/request/node_modules/node-uuid/package.json
index a21fe9b..e9777a5 100644
--- a/node_modules/preq/node_modules/request/node_modules/node-uuid/package.json
+++ b/node_modules/preq/node_modules/request/node_modules/node-uuid/package.json
@@ -1,64 +1,80 @@
{
- "name": "node-uuid",
- "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
- "url": "http://github.com/broofa/node-uuid";,
- "keywords": [
- "uuid",
- "guid",
- "rfc4122"
- ],
"author": {
"name": "Robert Kieffer",
"email": "[email protected]"
},
+ "bin": {
+ "uuid": "./bin/uuid"
+ },
+ "bugs": {
+ "url": "https://github.com/broofa/node-uuid/issues";
+ },
"contributors": [
+ {
+ "name": "AJ ONeal",
+ "email": "[email protected]"
+ },
{
"name": "Christoph Tavan",
"email": "[email protected]"
}
],
- "bin": {
- "uuid": "./bin/uuid"
+ "dependencies": {},
+ "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
+ "devDependencies": {
+ "nyc": "^2.2.0"
},
- "scripts": {
- "test": "node test/test.js"
- },
+ "directories": {},
+ "homepage": "https://github.com/broofa/node-uuid";,
+ "installable": true,
+ "keywords": [
+ "guid",
+ "rfc4122",
+ "uuid"
+ ],
"lib": ".",
- "main": "./uuid.js",
- "repository": {
- "type": "git",
- "url": "https://github.com/broofa/node-uuid.git";
- },
- "version": "1.4.3",
"licenses": [
{
"type": "MIT",
"url": "https://raw.github.com/broofa/node-uuid/master/LICENSE.md";
}
],
- "gitHead": "886463c660a095dfebfa69603921a8d156fdb12c",
- "bugs": {
- "url": "https://github.com/broofa/node-uuid/issues";
- },
- "homepage": "https://github.com/broofa/node-uuid";,
- "_id": "[email protected]",
- "_shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
- "_from": "node-uuid@~1.4.3",
- "_npmVersion": "1.4.28",
- "_npmUser": {
- "name": "broofa",
- "email": "[email protected]"
- },
+ "main": "./uuid.js",
"maintainers": [
{
"name": "broofa",
"email": "[email protected]"
+ },
+ {
+ "name": "coolaj86",
+ "email": "[email protected]"
}
],
- "dist": {
- "shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
- "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+ "name": "node-uuid",
+ "optionalDependencies": {},
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/broofa/node-uuid.git";
},
- "directories": {},
- "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+ "scripts": {
+ "coverage": "nyc npm test && nyc report",
+ "test": "node test/test.js"
+ },
+ "url": "http://github.com/broofa/node-uuid";,
+ "version": "1.4.4",
+ "gitHead": "672f3834ed02c798aa021c618d0a5666c8da000d",
+ "_id": "[email protected]",
+ "_shasum": "24bbbc18e4717e2e161681dade13853e4f9b26e7",
+ "_from": "node-uuid@~1.4.3",
+ "_npmVersion": "3.3.6",
+ "_nodeVersion": "5.0.0",
+ "_npmUser": {
+ "name": "coolaj86",
+ "email": "[email protected]"
+ },
+ "dist": {
+ "shasum": "24bbbc18e4717e2e161681dade13853e4f9b26e7",
+ "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.4.tgz";
+ },
+ "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.4.tgz";
}
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/test/test.js
b/node_modules/preq/node_modules/request/node_modules/node-uuid/test/test.js
index 2469225..5f1113d 100644
--- a/node_modules/preq/node_modules/request/node_modules/node-uuid/test/test.js
+++ b/node_modules/preq/node_modules/request/node_modules/node-uuid/test/test.js
@@ -1,6 +1,9 @@
if (!this.uuid) {
// node.js
uuid = require('../uuid');
+ if (!/_rb/.test(uuid._rng.toString())) {
+ throw new Error("should use crypto for node.js");
+ }
}
//
diff --git
a/node_modules/preq/node_modules/request/node_modules/node-uuid/uuid.js
b/node_modules/preq/node_modules/request/node_modules/node-uuid/uuid.js
index 0a61769..020a77a 100644
--- a/node_modules/preq/node_modules/request/node_modules/node-uuid/uuid.js
+++ b/node_modules/preq/node_modules/request/node_modules/node-uuid/uuid.js
@@ -11,23 +11,26 @@
// returns 128-bits of randomness, since that's what's usually required
var _rng;
+ // Allow for MSIE11 msCrypto
+ var _crypto = _global.crypto || _global.msCrypto;
+
// Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
//
// Moderately fast, high quality
- if (typeof(_global.require) == 'function') {
+ if ('function' === typeof require) {
try {
- var _rb = _global.require('crypto').randomBytes;
+ var _rb = require('crypto').randomBytes;
_rng = _rb && function() {return _rb(16);};
} catch(e) {}
}
- if (!_rng && _global.crypto && crypto.getRandomValues) {
+ if (!_rng && _crypto && _crypto.getRandomValues) {
// WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
//
// Moderately fast, high quality
var _rnds8 = new Uint8Array(16);
_rng = function whatwgRNG() {
- crypto.getRandomValues(_rnds8);
+ _crypto.getRandomValues(_rnds8);
return _rnds8;
};
}
@@ -223,6 +226,7 @@
uuid.parse = parse;
uuid.unparse = unparse;
uuid.BufferClass = BufferClass;
+ uuid._rng = _rng;
if (typeof(module) != 'undefined' && module.exports) {
// Publish as node.js module
@@ -230,7 +234,7 @@
} else if (typeof define === 'function' && define.amd) {
// Publish as AMD module
define(function() {return uuid;});
-
+
} else {
// Publish as global (in browsers)
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
index 34c2887..76d5799 100644
---
a/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
+++
b/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json
@@ -57,7 +57,7 @@
"homepage": "https://github.com/caolan/async#readme";,
"_id": "[email protected]",
"_shasum": "aea74d5e61c1f899613bf64bda66d4c78f2fd17d",
- "_from": "async@^0.9.0",
+ "_from": "async@~0.9.0",
"_npmVersion": "2.9.0",
"_nodeVersion": "2.0.1",
"_npmUser": {
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
index 37f1cb0..76d5799 100644
---
a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
+++
b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
@@ -79,6 +79,5 @@
"tarball": "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
}
diff --git a/restbase b/restbase
index 140518b..8deb9bc 160000
--- a/restbase
+++ b/restbase
-Subproject commit 140518b793d95b0b3c48e6f92b8be8430a78994e
+Subproject commit 8deb9bce0b743bb91e6746ac07a708f2cb68bc07
--
To view, visit https://gerrit.wikimedia.org/r/252687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c838b04732749bd97f3678623e50d39d0f0b966
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
