Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/256689
Change subject: Update restbase to 5e8112a ...................................................................... Update restbase to 5e8112a List of changes: xxxxxxx Update node module dependencies Change-Id: Ieceeaed170f417c1efdb94cff4ae6cb74f068202 --- M node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json M node_modules/swagger-router/lib/reqTemplate.js M node_modules/swagger-router/package.json M node_modules/swagger-router/test/features/reqTemplate.js 4 files changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/89/256689/1 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 062a245..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": { @@ -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/node_modules/swagger-router/lib/reqTemplate.js b/node_modules/swagger-router/lib/reqTemplate.js index 0880d54..13ec874 100644 --- a/node_modules/swagger-router/lib/reqTemplate.js +++ b/node_modules/swagger-router/lib/reqTemplate.js @@ -102,7 +102,7 @@ } }, _encodeURIComponent: function(s) { - s = s || ''; + s = (s === undefined || s === null) ? '' : s; if (/[^\w_-]/.test(s)) { return encodeURIComponent(s); } else { diff --git a/node_modules/swagger-router/package.json b/node_modules/swagger-router/package.json index f4b5dfe..14d5f8f 100644 --- a/node_modules/swagger-router/package.json +++ b/node_modules/swagger-router/package.json @@ -1,6 +1,6 @@ { "name": "swagger-router", - "version": "0.3.2", + "version": "0.3.3", "description": "An efficient swagger 2 based router with support for multiple APIs. For use in RESTBase.", "main": "index.js", "scripts": { @@ -42,10 +42,10 @@ "coveralls": "^2.11.2", "mocha-jscs": "^1.2.0" }, - "gitHead": "3b0e51466aaf13a06aef5c1c1b59f97c57033156", + "gitHead": "65e8d83fb5b3cb52451601376136e6628917c19c", "homepage": "https://github.com/gwicke/swagger-router#readme";, - "_id": "[email protected]", - "_shasum": "ff6cb110213997357400e6b197b70b361f8f8533", + "_id": "[email protected]", + "_shasum": "dd699a8d13a1987ec783c1824c43f72a0631cfbe", "_from": "swagger-router@^0.3.1", "_npmVersion": "2.14.3", "_nodeVersion": "0.10.37", @@ -68,9 +68,9 @@ } ], "dist": { - "shasum": "ff6cb110213997357400e6b197b70b361f8f8533", - "tarball": "http://registry.npmjs.org/swagger-router/-/swagger-router-0.3.2.tgz"; + "shasum": "dd699a8d13a1987ec783c1824c43f72a0631cfbe", + "tarball": "http://registry.npmjs.org/swagger-router/-/swagger-router-0.3.3.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/swagger-router/-/swagger-router-0.3.2.tgz"; + "_resolved": "https://registry.npmjs.org/swagger-router/-/swagger-router-0.3.3.tgz"; } diff --git a/node_modules/swagger-router/test/features/reqTemplate.js b/node_modules/swagger-router/test/features/reqTemplate.js index 46962a8..b5d9833 100644 --- a/node_modules/swagger-router/test/features/reqTemplate.js +++ b/node_modules/swagger-router/test/features/reqTemplate.js @@ -470,16 +470,21 @@ it('should correctly resolve 0 value', function() { var template = new Template({ + uri: 'http://test.com/{rev}', headers: 'test_{test_header}' }); var result = template.expand({ request: { + params: { + rev: 0 + }, headers: { test_header: 0 } } }); assert.deepEqual(result, { + uri: 'http://test.com/0', headers: 'test_0' }); }); -- To view, visit https://gerrit.wikimedia.org/r/256689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieceeaed170f417c1efdb94cff4ae6cb74f068202 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
