[MediaWiki-commits] [Gerrit] Update restbase to 0b094b4 - change (mediawiki...deploy)
GWicke has submitted this change and it was merged.
Change subject: Update restbase to 0b094b4
..
Update restbase to 0b094b4
List of changes:
0b094b4 Switch to our own copy of content-type
xxx Update node module dependencies
Change-Id: Ife88a97cb7d0ee13497dca19105a65da52499075
---
A node_modules/content-type/.travis.yml
M node_modules/content-type/index.js
M node_modules/content-type/package.json
A node_modules/content-type/test/contentType_format.js
A node_modules/content-type/test/contentType_parse.js
M
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
M restbase
7 files changed, 248 insertions(+), 25 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/node_modules/content-type/.travis.yml
b/node_modules/content-type/.travis.yml
new file mode 100644
index 000..dced2bc
--- /dev/null
+++ b/node_modules/content-type/.travis.yml
@@ -0,0 +1,12 @@
+language: node_js
+node_js:
+ - "0.6"
+ - "0.8"
+ - "0.10"
+ - "0.12"
+sudo: false
+script:
+ - "test $TRAVIS_NODE_VERSION != '0.6' || npm test"
+ - "test $TRAVIS_NODE_VERSION = '0.6' || npm run-script test-ci"
+after_script:
+ - "test $TRAVIS_NODE_VERSION != '0.6' && npm install coveralls@2 && cat
./coverage/lcov.info | coveralls"
diff --git a/node_modules/content-type/index.js
b/node_modules/content-type/index.js
index 6a2ea9f..312823b 100644
--- a/node_modules/content-type/index.js
+++ b/node_modules/content-type/index.js
@@ -17,8 +17,10 @@
* qdtext= HTAB / SP / %x21 / %x23-5B / %x5D-7E / obs-text
* obs-text = %x80-FF
* quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text )
+ *
+ * Additionally, we accept "/" in parameter values.
*/
-var paramRegExp = /; *([!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) *=
*("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)
*/g
+var paramRegExp = /; *([!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) *=
*("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'\*\+\-\.\^_`\|~\/0-9A-Za-z]+)
*/g
var textRegExp = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/
var tokenRegExp = /^[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+$/
diff --git a/node_modules/content-type/package.json
b/node_modules/content-type/package.json
index 995a411..b38f994 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -16,7 +16,7 @@
],
"repository": {
"type": "git",
-"url": "https://github.com/jshttp/content-type;
+"url": "git://github.com/jshttp/content-type"
},
"devDependencies": {
"istanbul": "0.3.5",
@@ -36,29 +36,13 @@
"test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly
-- --reporter spec --check-leaks test/",
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter
dot --check-leaks test/"
},
- "gitHead": "3aa58f9c5a358a3634b8601602177888b4a477d8",
+ "readme": "# content-type\n\n[![NPM Version][npm-image]][npm-url]\n[![NPM
Downloads][downloads-image]][downloads-url]\n[![Node.js
Version][node-version-image]][node-version-url]\n[![Build
Status][travis-image]][travis-url]\n[![Test
Coverage][coveralls-image]][coveralls-url]\n\nCreate and parse HTTP
Content-Type header according to RFC 7231\n\n## Installation\n\n```sh\n$ npm
install content-type\n```\n\n## API\n\n```js\nvar contentType =
require('content-type')\n```\n\n### contentType.parse(string)\n\n```js\nvar obj
= contentType.parse('image/svg+xml; charset=utf-8')\n```\n\nParse a content
type string. This will return an object with the following\nproperties
(examples are shown for the string `'image/svg+xml; charset=utf-8'`):\n\n -
`type`: The media type (the type and subtype, always lower case).\n Example:
`'image/svg+xml'`\n\n - `parameters`: An object of the parameters in the media
type (name of parameter\n always lower case). Example: `{charset:
'utf-8'}`\n\nThrows a `TypeError` if the string is missing or invalid.\n\n###
contentType.parse(req)\n\n```js\nvar obj = contentType.parse(req)\n```\n\nParse
the `content-type` header from the given `req`. Short-cut
for\n`contentType.parse(req.headers['content-type'])`.\n\nThrows a `TypeError`
if the `Content-Type` header is missing or invalid.\n\n###
contentType.parse(res)\n\n```js\nvar obj = contentType.parse(res)\n```\n\nParse
the `content-type` header set on the given `res`. Short-cut
for\n`contentType.parse(res.getHeader('content-type'))`.\n\nThrows a
`TypeError` if the `Content-Type` header is missing or invalid.\n\n###
contentType.format(obj)\n\n```js\nvar str = contentType.format({type:
'image/svg+xml'})\n```\n\nFormat an object into a content type string. This
will return a string of the\ncontent type for the given object with the
following properties (examples are\nshown that
[MediaWiki-commits] [Gerrit] Update restbase to 0b094b4 - change (mediawiki...deploy)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252384
Change subject: Update restbase to 0b094b4
..
Update restbase to 0b094b4
List of changes:
0b094b4 Switch to our own copy of content-type
xxx Update node module dependencies
Change-Id: Ife88a97cb7d0ee13497dca19105a65da52499075
---
A node_modules/content-type/.travis.yml
M node_modules/content-type/index.js
M node_modules/content-type/package.json
A node_modules/content-type/test/contentType_format.js
A node_modules/content-type/test/contentType_parse.js
M
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
M restbase
7 files changed, 248 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/84/252384/1
diff --git a/node_modules/content-type/.travis.yml
b/node_modules/content-type/.travis.yml
new file mode 100644
index 000..dced2bc
--- /dev/null
+++ b/node_modules/content-type/.travis.yml
@@ -0,0 +1,12 @@
+language: node_js
+node_js:
+ - "0.6"
+ - "0.8"
+ - "0.10"
+ - "0.12"
+sudo: false
+script:
+ - "test $TRAVIS_NODE_VERSION != '0.6' || npm test"
+ - "test $TRAVIS_NODE_VERSION = '0.6' || npm run-script test-ci"
+after_script:
+ - "test $TRAVIS_NODE_VERSION != '0.6' && npm install coveralls@2 && cat
./coverage/lcov.info | coveralls"
diff --git a/node_modules/content-type/index.js
b/node_modules/content-type/index.js
index 6a2ea9f..312823b 100644
--- a/node_modules/content-type/index.js
+++ b/node_modules/content-type/index.js
@@ -17,8 +17,10 @@
* qdtext= HTAB / SP / %x21 / %x23-5B / %x5D-7E / obs-text
* obs-text = %x80-FF
* quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text )
+ *
+ * Additionally, we accept "/" in parameter values.
*/
-var paramRegExp = /; *([!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) *=
*("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)
*/g
+var paramRegExp = /; *([!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) *=
*("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'\*\+\-\.\^_`\|~\/0-9A-Za-z]+)
*/g
var textRegExp = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/
var tokenRegExp = /^[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+$/
diff --git a/node_modules/content-type/package.json
b/node_modules/content-type/package.json
index 995a411..b38f994 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -16,7 +16,7 @@
],
"repository": {
"type": "git",
-"url": "https://github.com/jshttp/content-type;
+"url": "git://github.com/jshttp/content-type"
},
"devDependencies": {
"istanbul": "0.3.5",
@@ -36,29 +36,13 @@
"test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly
-- --reporter spec --check-leaks test/",
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter
dot --check-leaks test/"
},
- "gitHead": "3aa58f9c5a358a3634b8601602177888b4a477d8",
+ "readme": "# content-type\n\n[![NPM Version][npm-image]][npm-url]\n[![NPM
Downloads][downloads-image]][downloads-url]\n[![Node.js
Version][node-version-image]][node-version-url]\n[![Build
Status][travis-image]][travis-url]\n[![Test
Coverage][coveralls-image]][coveralls-url]\n\nCreate and parse HTTP
Content-Type header according to RFC 7231\n\n## Installation\n\n```sh\n$ npm
install content-type\n```\n\n## API\n\n```js\nvar contentType =
require('content-type')\n```\n\n### contentType.parse(string)\n\n```js\nvar obj
= contentType.parse('image/svg+xml; charset=utf-8')\n```\n\nParse a content
type string. This will return an object with the following\nproperties
(examples are shown for the string `'image/svg+xml; charset=utf-8'`):\n\n -
`type`: The media type (the type and subtype, always lower case).\n Example:
`'image/svg+xml'`\n\n - `parameters`: An object of the parameters in the media
type (name of parameter\n always lower case). Example: `{charset:
'utf-8'}`\n\nThrows a `TypeError` if the string is missing or invalid.\n\n###
contentType.parse(req)\n\n```js\nvar obj = contentType.parse(req)\n```\n\nParse
the `content-type` header from the given `req`. Short-cut
for\n`contentType.parse(req.headers['content-type'])`.\n\nThrows a `TypeError`
if the `Content-Type` header is missing or invalid.\n\n###
contentType.parse(res)\n\n```js\nvar obj = contentType.parse(res)\n```\n\nParse
the `content-type` header set on the given `res`. Short-cut
for\n`contentType.parse(res.getHeader('content-type'))`.\n\nThrows a
`TypeError` if the `Content-Type` header is missing or invalid.\n\n###
contentType.format(obj)\n\n```js\nvar str = contentType.format({type:
'image/svg+xml'})\n```\n\nFormat an object into a content type string. This
will return a string of the\ncontent type for
