[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c9cf513

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/14 )

Change subject: Update restbase to c9cf513
..


Update restbase to c9cf513

List of changes:
f5b0521 Return non-free page images too
8a48937 Made related response more consistent with other endpoints
485278f Added logging when some feed pieces are missing or we've failed to 
fetch the summary
c9cf513 Check for body existence correctly
xxx Update node module dependencies

Change-Id: Ib9d23c9a4169e47e1a54edb74352d02d83cc8480
---
M node_modules/busboy/.travis.yml
M node_modules/busboy/lib/main.js
M node_modules/busboy/package.json
M node_modules/busboy/test/test-types-multipart.js
M node_modules/content-type/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
A node_modules/swagger-router/config.example.yaml
A node_modules/swagger-router/interfaces/mediawiki-content.yaml
M node_modules/swagger-router/lib/reqTemplate.js
M node_modules/swagger-router/package.json
M node_modules/swagger-ui/package.json
M restbase
13 files changed, 466 insertions(+), 43 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/node_modules/busboy/.travis.yml b/node_modules/busboy/.travis.yml
index 28a8b69..4cec49d 100644
--- a/node_modules/busboy/.travis.yml
+++ b/node_modules/busboy/.travis.yml
@@ -7,7 +7,8 @@
   - TRAVIS_NODE_VERSION="0.10"
   - TRAVIS_NODE_VERSION="0.12"
   - TRAVIS_NODE_VERSION="4"
-  - TRAVIS_NODE_VERSION="5"
+  - TRAVIS_NODE_VERSION="6"
+  - TRAVIS_NODE_VERSION="7"
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && 
source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - node --version
diff --git a/node_modules/busboy/lib/main.js b/node_modules/busboy/lib/main.js
index 6c630f2..18f30ce 100644
--- a/node_modules/busboy/lib/main.js
+++ b/node_modules/busboy/lib/main.js
@@ -15,6 +15,7 @@
 
   this._done = false;
   this._parser = undefined;
+  this._finished = false;
 
   this.opts = opts;
   if (opts.headers && typeof opts.headers['content-type'] === 'string')
@@ -25,10 +26,16 @@
 inherits(Busboy, WritableStream);
 
 Busboy.prototype.emit = function(ev) {
-  if (ev === 'finish' && !this._done)
-this._parser && this._parser.end();
-  else
-WritableStream.prototype.emit.apply(this, arguments);
+  if (ev === 'finish') {
+if (!this._done) {
+  this._parser && this._parser.end();
+  return;
+} else if (this._finished) {
+  return;
+}
+this._finished = true;
+  }
+  WritableStream.prototype.emit.apply(this, arguments);
 };
 
 Busboy.prototype.parseHeaders = function(headers) {
@@ -36,7 +43,7 @@
   if (headers['content-type']) {
 var parsed = parseParams(headers['content-type']),
 matched, type;
-for (var i = 0; i < TYPES_LEN; ++i) {
+for (var i = 0; i < TYPES.length; ++i) {
   type = TYPES[i];
   if (typeof type.detect === 'function')
 matched = type.detect(parsed);
@@ -74,15 +81,9 @@
   this._parser.write(chunk, cb);
 };
 
-var TYPES = [], TYPES_LEN = 0;
-fs.readdirSync(__dirname + '/types').forEach(function(type) {
-  if (!/\.js$/.test(type))
-return;
-  var typemod = require(__dirname + '/types/' + type);
-  if (typemod.detect) {
-TYPES.push(typemod);
-++TYPES_LEN;
-  }
-});
+var TYPES = [
+  require('./types/multipart'),
+  require('./types/urlencoded'),
+];
 
 module.exports = Busboy;
diff --git a/node_modules/busboy/package.json b/node_modules/busboy/package.json
index 9cc8737..6acd2be 100644
--- a/node_modules/busboy/package.json
+++ b/node_modules/busboy/package.json
@@ -14,19 +14,19 @@
 ]
   ],
   "_from": "busboy@>=0.2.12 <0.3.0",
-  "_id": "busboy@0.2.13",
+  "_id": "busboy@0.2.14",
   "_inCache": true,
   "_location": "/busboy",
-  "_nodeVersion": "5.8.0",
+  "_nodeVersion": "6.9.1",
   "_npmOperationalInternal": {
-"host": "packages-13-west.internal.npmjs.com",
-"tmp": "tmp/busboy-0.2.13.tgz_1458666955253_0.557709296233952"
+"host": "packages-12-west.internal.npmjs.com",
+"tmp": "tmp/busboy-0.2.14.tgz_1484764782815_0.4685383520554751"
   },
   "_npmUser": {
 "name": "mscdex",
 "email": "msc...@mscdex.net"
   },
-  "_npmVersion": "3.7.3",
+  "_npmVersion": "3.10.8",
   "_phantomChildren": {},
   "_requested": {
 "raw": "busboy@^0.2.12",
@@ -40,8 +40,8 @@
   "_requiredBy": [
 "/hyperswitch"
   ],
-  "_resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";,
-  "_shasum": "90fc4f6a3967d815616fc976bfa8e56aed0c58b6",
+  "_resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";,
+  "_shasum": "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453",
   "_shrinkwrap": null,
   "_spec": "busboy@^0.2.12",
   "_where": "/opt/service/node_modules/hyperswitch",
@@ -60,8 +60,8 @@
   "devDependencies": {},
   "directories": {},
   "dist": {
-"shasum": "90fc4f6a3967d815616fc976bfa8e56aed0c58b6",
-

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c9cf513

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/14 )

Change subject: Update restbase to c9cf513
..

Update restbase to c9cf513

List of changes:
f5b0521 Return non-free page images too
8a48937 Made related response more consistent with other endpoints
485278f Added logging when some feed pieces are missing or we've failed to 
fetch the summary
c9cf513 Check for body existence correctly
xxx Update node module dependencies

Change-Id: Ib9d23c9a4169e47e1a54edb74352d02d83cc8480
---
M node_modules/busboy/.travis.yml
M node_modules/busboy/lib/main.js
M node_modules/busboy/package.json
M node_modules/busboy/test/test-types-multipart.js
M node_modules/content-type/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
A node_modules/swagger-router/config.example.yaml
A node_modules/swagger-router/interfaces/mediawiki-content.yaml
M node_modules/swagger-router/lib/reqTemplate.js
M node_modules/swagger-router/package.json
M node_modules/swagger-ui/package.json
M restbase
13 files changed, 466 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/14/14/1

diff --git a/node_modules/busboy/.travis.yml b/node_modules/busboy/.travis.yml
index 28a8b69..4cec49d 100644
--- a/node_modules/busboy/.travis.yml
+++ b/node_modules/busboy/.travis.yml
@@ -7,7 +7,8 @@
   - TRAVIS_NODE_VERSION="0.10"
   - TRAVIS_NODE_VERSION="0.12"
   - TRAVIS_NODE_VERSION="4"
-  - TRAVIS_NODE_VERSION="5"
+  - TRAVIS_NODE_VERSION="6"
+  - TRAVIS_NODE_VERSION="7"
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && 
source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - node --version
diff --git a/node_modules/busboy/lib/main.js b/node_modules/busboy/lib/main.js
index 6c630f2..18f30ce 100644
--- a/node_modules/busboy/lib/main.js
+++ b/node_modules/busboy/lib/main.js
@@ -15,6 +15,7 @@
 
   this._done = false;
   this._parser = undefined;
+  this._finished = false;
 
   this.opts = opts;
   if (opts.headers && typeof opts.headers['content-type'] === 'string')
@@ -25,10 +26,16 @@
 inherits(Busboy, WritableStream);
 
 Busboy.prototype.emit = function(ev) {
-  if (ev === 'finish' && !this._done)
-this._parser && this._parser.end();
-  else
-WritableStream.prototype.emit.apply(this, arguments);
+  if (ev === 'finish') {
+if (!this._done) {
+  this._parser && this._parser.end();
+  return;
+} else if (this._finished) {
+  return;
+}
+this._finished = true;
+  }
+  WritableStream.prototype.emit.apply(this, arguments);
 };
 
 Busboy.prototype.parseHeaders = function(headers) {
@@ -36,7 +43,7 @@
   if (headers['content-type']) {
 var parsed = parseParams(headers['content-type']),
 matched, type;
-for (var i = 0; i < TYPES_LEN; ++i) {
+for (var i = 0; i < TYPES.length; ++i) {
   type = TYPES[i];
   if (typeof type.detect === 'function')
 matched = type.detect(parsed);
@@ -74,15 +81,9 @@
   this._parser.write(chunk, cb);
 };
 
-var TYPES = [], TYPES_LEN = 0;
-fs.readdirSync(__dirname + '/types').forEach(function(type) {
-  if (!/\.js$/.test(type))
-return;
-  var typemod = require(__dirname + '/types/' + type);
-  if (typemod.detect) {
-TYPES.push(typemod);
-++TYPES_LEN;
-  }
-});
+var TYPES = [
+  require('./types/multipart'),
+  require('./types/urlencoded'),
+];
 
 module.exports = Busboy;
diff --git a/node_modules/busboy/package.json b/node_modules/busboy/package.json
index 9cc8737..6acd2be 100644
--- a/node_modules/busboy/package.json
+++ b/node_modules/busboy/package.json
@@ -14,19 +14,19 @@
 ]
   ],
   "_from": "busboy@>=0.2.12 <0.3.0",
-  "_id": "busboy@0.2.13",
+  "_id": "busboy@0.2.14",
   "_inCache": true,
   "_location": "/busboy",
-  "_nodeVersion": "5.8.0",
+  "_nodeVersion": "6.9.1",
   "_npmOperationalInternal": {
-"host": "packages-13-west.internal.npmjs.com",
-"tmp": "tmp/busboy-0.2.13.tgz_1458666955253_0.557709296233952"
+"host": "packages-12-west.internal.npmjs.com",
+"tmp": "tmp/busboy-0.2.14.tgz_1484764782815_0.4685383520554751"
   },
   "_npmUser": {
 "name": "mscdex",
 "email": "msc...@mscdex.net"
   },
-  "_npmVersion": "3.7.3",
+  "_npmVersion": "3.10.8",
   "_phantomChildren": {},
   "_requested": {
 "raw": "busboy@^0.2.12",
@@ -40,8 +40,8 @@
   "_requiredBy": [
 "/hyperswitch"
   ],
-  "_resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";,
-  "_shasum": "90fc4f6a3967d815616fc976bfa8e56aed0c58b6",
+  "_resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";,
+  "_shasum": "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453",
   "_shrinkwrap": null,
   "_spec": "busboy@^0.2.12",
   "_where": "/opt/service/node_modules/hyperswitch",
@@ -60,8 +60,8 @@
   "devDependencies": {},
   "directories": {},
   "dist": {
-"shasum": "90fc4f6a3967