jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391082 )
Change subject: Bump src/ to ab4dc209 and update mediawiki-title ...................................................................... Bump src/ to ab4dc209 and update mediawiki-title Change-Id: Id36aa619f8abcec81aa641e4848242a72e4c811c --- M node_modules/mediawiki-title/.jscs.json M node_modules/mediawiki-title/.jshintignore D node_modules/mediawiki-title/.npmignore M node_modules/mediawiki-title/.travis.yml M node_modules/mediawiki-title/lib/index.js A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js M node_modules/mediawiki-title/package.json M node_modules/mediawiki-title/test/index.js M src 9 files changed, 310 insertions(+), 62 deletions(-) Approvals: jenkins-bot: Verified Arlolra: Looks good to me, approved diff --git a/node_modules/mediawiki-title/.jscs.json b/node_modules/mediawiki-title/.jscs.json index 189fa2b..7005142 100644 --- a/node_modules/mediawiki-title/.jscs.json +++ b/node_modules/mediawiki-title/.jscs.json @@ -26,6 +26,7 @@ "node_modules/**", "test/**", "coverage/**", - "test.db.**" + "test.db.**", + "lib/mediawiki.Title.phpCharToUpper.js" ] -} \ No newline at end of file +} diff --git a/node_modules/mediawiki-title/.jshintignore b/node_modules/mediawiki-title/.jshintignore index 1c69eee..7e45fc9 100644 --- a/node_modules/mediawiki-title/.jshintignore +++ b/node_modules/mediawiki-title/.jshintignore @@ -1,3 +1,4 @@ coverage node_modules test +lib/mediawiki.Title.phpCharToUpper.js diff --git a/node_modules/mediawiki-title/.npmignore b/node_modules/mediawiki-title/.npmignore deleted file mode 100644 index 269d298..0000000 --- a/node_modules/mediawiki-title/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -coverage -node_modules -npm-debug.log - -# WebStorm IDE files -.idea/* - -# vim temp files -*swp diff --git a/node_modules/mediawiki-title/.travis.yml b/node_modules/mediawiki-title/.travis.yml index c678a5b..c651632 100644 --- a/node_modules/mediawiki-title/.travis.yml +++ b/node_modules/mediawiki-title/.travis.yml @@ -1,9 +1,9 @@ language: node_js node_js: - - "0.10" - - "0.12" - - "4.2" - - "5" + - "4" + - "6" + - "8" + - "node" sudo: false diff --git a/node_modules/mediawiki-title/lib/index.js b/node_modules/mediawiki-title/lib/index.js index aa380b6..9b7c997 100644 --- a/node_modules/mediawiki-title/lib/index.js +++ b/node_modules/mediawiki-title/lib/index.js @@ -1,7 +1,8 @@ "use strict"; -var sanitizeIP = require('./ip'); -var utils = require('./utils'); +var sanitizeIP = require('./ip'); +var utils = require('./utils'); +var phpCharToUpper = require('./mediawiki.Title.phpCharToUpper.js'); /** * A UTF-8 replacement character that's explicitly prohibited in the title @@ -211,6 +212,8 @@ function _capitalizeTitle(result, siteInfo) { var nsCase = siteInfo.namespaces[result.namespace._id + ''].case; if (nsCase === 'first-letter') { + // This special casing is from core's `Language::ucfirst` + // Grep for definitions in core/languages/classes/ if (result.title[0] === 'i' && (siteInfo.general.lang === 'az' || siteInfo.general.lang === 'tr' || siteInfo.general.lang === 'kaa' @@ -218,12 +221,8 @@ result.title = 'İ' + result.title.substr(1); } else if (!/^[A-Z]/.test(result.title)) { var firstCharacter = result.title.charAt(0); - var upperCasedFirstLetter = firstCharacter.toUpperCase(); - // PHP is only capable of upper-casing letters that end up - // as a single character, however JS upper-cases German 'ß' to SS - if (upperCasedFirstLetter.length === firstCharacter.length) { - result.title = upperCasedFirstLetter + result.title.substr(1); - } + var upperCasedFirstLetter = phpCharToUpper(firstCharacter); + result.title = upperCasedFirstLetter + result.title.substr(1); } } return result; diff --git a/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js new file mode 100644 index 0000000..f337911 --- /dev/null +++ b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js @@ -0,0 +1,255 @@ +// This file can't be parsed by JSDuck due to <https://github.com/tenderlove/rkelly/issues/35>. +// (It is excluded in jsduck.json.) +// ESLint suggests unquoting some object keys, which would render the file unparseable by Opera 12. +/* eslint-disable quote-props */ +( function () { + var toUpperMapping = { + 'ß': 'ß', + 'ʼn': 'ʼn', + 'Dž': 'Dž', + 'dž': 'Dž', + 'Lj': 'Lj', + 'lj': 'Lj', + 'Nj': 'Nj', + 'nj': 'Nj', + 'ǰ': 'ǰ', + 'Dz': 'Dz', + 'dz': 'Dz', + 'ʝ': 'Ʝ', + 'ͅ': 'ͅ', + 'ΐ': 'ΐ', + 'ΰ': 'ΰ', + 'և': 'և', + 'ᏸ': 'Ᏸ', + 'ᏹ': 'Ᏹ', + 'ᏺ': 'Ᏺ', + 'ᏻ': 'Ᏻ', + 'ᏼ': 'Ᏼ', + 'ᏽ': 'Ᏽ', + 'ẖ': 'ẖ', + 'ẗ': 'ẗ', + 'ẘ': 'ẘ', + 'ẙ': 'ẙ', + 'ẚ': 'ẚ', + 'ὐ': 'ὐ', + 'ὒ': 'ὒ', + 'ὔ': 'ὔ', + 'ὖ': 'ὖ', + 'ᾀ': 'ᾈ', + 'ᾁ': 'ᾉ', + 'ᾂ': 'ᾊ', + 'ᾃ': 'ᾋ', + 'ᾄ': 'ᾌ', + 'ᾅ': 'ᾍ', + 'ᾆ': 'ᾎ', + 'ᾇ': 'ᾏ', + 'ᾈ': 'ᾈ', + 'ᾉ': 'ᾉ', + 'ᾊ': 'ᾊ', + 'ᾋ': 'ᾋ', + 'ᾌ': 'ᾌ', + 'ᾍ': 'ᾍ', + 'ᾎ': 'ᾎ', + 'ᾏ': 'ᾏ', + 'ᾐ': 'ᾘ', + 'ᾑ': 'ᾙ', + 'ᾒ': 'ᾚ', + 'ᾓ': 'ᾛ', + 'ᾔ': 'ᾜ', + 'ᾕ': 'ᾝ', + 'ᾖ': 'ᾞ', + 'ᾗ': 'ᾟ', + 'ᾘ': 'ᾘ', + 'ᾙ': 'ᾙ', + 'ᾚ': 'ᾚ', + 'ᾛ': 'ᾛ', + 'ᾜ': 'ᾜ', + 'ᾝ': 'ᾝ', + 'ᾞ': 'ᾞ', + 'ᾟ': 'ᾟ', + 'ᾠ': 'ᾨ', + 'ᾡ': 'ᾩ', + 'ᾢ': 'ᾪ', + 'ᾣ': 'ᾫ', + 'ᾤ': 'ᾬ', + 'ᾥ': 'ᾭ', + 'ᾦ': 'ᾮ', + 'ᾧ': 'ᾯ', + 'ᾨ': 'ᾨ', + 'ᾩ': 'ᾩ', + 'ᾪ': 'ᾪ', + 'ᾫ': 'ᾫ', + 'ᾬ': 'ᾬ', + 'ᾭ': 'ᾭ', + 'ᾮ': 'ᾮ', + 'ᾯ': 'ᾯ', + 'ᾲ': 'ᾲ', + 'ᾳ': 'ᾼ', + 'ᾴ': 'ᾴ', + 'ᾶ': 'ᾶ', + 'ᾷ': 'ᾷ', + 'ᾼ': 'ᾼ', + 'ῂ': 'ῂ', + 'ῃ': 'ῌ', + 'ῄ': 'ῄ', + 'ῆ': 'ῆ', + 'ῇ': 'ῇ', + 'ῌ': 'ῌ', + 'ῒ': 'ῒ', + 'ΐ': 'ΐ', + 'ῖ': 'ῖ', + 'ῗ': 'ῗ', + 'ῢ': 'ῢ', + 'ΰ': 'ΰ', + 'ῤ': 'ῤ', + 'ῦ': 'ῦ', + 'ῧ': 'ῧ', + 'ῲ': 'ῲ', + 'ῳ': 'ῼ', + 'ῴ': 'ῴ', + 'ῶ': 'ῶ', + 'ῷ': 'ῷ', + 'ῼ': 'ῼ', + 'ⅰ': 'ⅰ', + 'ⅱ': 'ⅱ', + 'ⅲ': 'ⅲ', + 'ⅳ': 'ⅳ', + 'ⅴ': 'ⅴ', + 'ⅵ': 'ⅵ', + 'ⅶ': 'ⅶ', + 'ⅷ': 'ⅷ', + 'ⅸ': 'ⅸ', + 'ⅹ': 'ⅹ', + 'ⅺ': 'ⅺ', + 'ⅻ': 'ⅻ', + 'ⅼ': 'ⅼ', + 'ⅽ': 'ⅽ', + 'ⅾ': 'ⅾ', + 'ⅿ': 'ⅿ', + 'ⓐ': 'ⓐ', + 'ⓑ': 'ⓑ', + 'ⓒ': 'ⓒ', + 'ⓓ': 'ⓓ', + 'ⓔ': 'ⓔ', + 'ⓕ': 'ⓕ', + 'ⓖ': 'ⓖ', + 'ⓗ': 'ⓗ', + 'ⓘ': 'ⓘ', + 'ⓙ': 'ⓙ', + 'ⓚ': 'ⓚ', + 'ⓛ': 'ⓛ', + 'ⓜ': 'ⓜ', + 'ⓝ': 'ⓝ', + 'ⓞ': 'ⓞ', + 'ⓟ': 'ⓟ', + 'ⓠ': 'ⓠ', + 'ⓡ': 'ⓡ', + 'ⓢ': 'ⓢ', + 'ⓣ': 'ⓣ', + 'ⓤ': 'ⓤ', + 'ⓥ': 'ⓥ', + 'ⓦ': 'ⓦ', + 'ⓧ': 'ⓧ', + 'ⓨ': 'ⓨ', + 'ⓩ': 'ⓩ', + 'ꞵ': 'Ꞵ', + 'ꞷ': 'Ꞷ', + 'ꭓ': 'Ꭓ', + 'ꭰ': 'Ꭰ', + 'ꭱ': 'Ꭱ', + 'ꭲ': 'Ꭲ', + 'ꭳ': 'Ꭳ', + 'ꭴ': 'Ꭴ', + 'ꭵ': 'Ꭵ', + 'ꭶ': 'Ꭶ', + 'ꭷ': 'Ꭷ', + 'ꭸ': 'Ꭸ', + 'ꭹ': 'Ꭹ', + 'ꭺ': 'Ꭺ', + 'ꭻ': 'Ꭻ', + 'ꭼ': 'Ꭼ', + 'ꭽ': 'Ꭽ', + 'ꭾ': 'Ꭾ', + 'ꭿ': 'Ꭿ', + 'ꮀ': 'Ꮀ', + 'ꮁ': 'Ꮁ', + 'ꮂ': 'Ꮂ', + 'ꮃ': 'Ꮃ', + 'ꮄ': 'Ꮄ', + 'ꮅ': 'Ꮅ', + 'ꮆ': 'Ꮆ', + 'ꮇ': 'Ꮇ', + 'ꮈ': 'Ꮈ', + 'ꮉ': 'Ꮉ', + 'ꮊ': 'Ꮊ', + 'ꮋ': 'Ꮋ', + 'ꮌ': 'Ꮌ', + 'ꮍ': 'Ꮍ', + 'ꮎ': 'Ꮎ', + 'ꮏ': 'Ꮏ', + 'ꮐ': 'Ꮐ', + 'ꮑ': 'Ꮑ', + 'ꮒ': 'Ꮒ', + 'ꮓ': 'Ꮓ', + 'ꮔ': 'Ꮔ', + 'ꮕ': 'Ꮕ', + 'ꮖ': 'Ꮖ', + 'ꮗ': 'Ꮗ', + 'ꮘ': 'Ꮘ', + 'ꮙ': 'Ꮙ', + 'ꮚ': 'Ꮚ', + 'ꮛ': 'Ꮛ', + 'ꮜ': 'Ꮜ', + 'ꮝ': 'Ꮝ', + 'ꮞ': 'Ꮞ', + 'ꮟ': 'Ꮟ', + 'ꮠ': 'Ꮠ', + 'ꮡ': 'Ꮡ', + 'ꮢ': 'Ꮢ', + 'ꮣ': 'Ꮣ', + 'ꮤ': 'Ꮤ', + 'ꮥ': 'Ꮥ', + 'ꮦ': 'Ꮦ', + 'ꮧ': 'Ꮧ', + 'ꮨ': 'Ꮨ', + 'ꮩ': 'Ꮩ', + 'ꮪ': 'Ꮪ', + 'ꮫ': 'Ꮫ', + 'ꮬ': 'Ꮬ', + 'ꮭ': 'Ꮭ', + 'ꮮ': 'Ꮮ', + 'ꮯ': 'Ꮯ', + 'ꮰ': 'Ꮰ', + 'ꮱ': 'Ꮱ', + 'ꮲ': 'Ꮲ', + 'ꮳ': 'Ꮳ', + 'ꮴ': 'Ꮴ', + 'ꮵ': 'Ꮵ', + 'ꮶ': 'Ꮶ', + 'ꮷ': 'Ꮷ', + 'ꮸ': 'Ꮸ', + 'ꮹ': 'Ꮹ', + 'ꮺ': 'Ꮺ', + 'ꮻ': 'Ꮻ', + 'ꮼ': 'Ꮼ', + 'ꮽ': 'Ꮽ', + 'ꮾ': 'Ꮾ', + 'ꮿ': 'Ꮿ', + 'ff': 'ff', + 'fi': 'fi', + 'fl': 'fl', + 'ffi': 'ffi', + 'ffl': 'ffl', + 'ſt': 'ſt', + 'st': 'st', + 'ﬓ': 'ﬓ', + 'ﬔ': 'ﬔ', + 'ﬕ': 'ﬕ', + 'ﬖ': 'ﬖ', + 'ﬗ': 'ﬗ' + }; + module.exports = function ( chr ) { + var mapped = toUpperMapping[ chr ]; + return mapped || chr.toUpperCase(); + }; +}() ); diff --git a/node_modules/mediawiki-title/package.json b/node_modules/mediawiki-title/package.json index 8937933..5899a12 100644 --- a/node_modules/mediawiki-title/package.json +++ b/node_modules/mediawiki-title/package.json @@ -2,39 +2,39 @@ "_args": [ [ { - "raw": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", + "raw": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", "scope": null, "escapedName": "mediawiki-title", "name": "mediawiki-title", - "rawSpec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", - "spec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", + "rawSpec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", + "spec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", "type": "remote" }, - "/Users/arlolra/Work/Wikimedia/services/deploy" + "/home/subbu/work/wmf/deploy" ] ], - "_from": "mediawiki-title@0.6.4", - "_id": "mediawiki-title@0.6.4", + "_from": "mediawiki-title@0.6.5", + "_id": "mediawiki-title@0.6.5", "_inCache": true, "_location": "/mediawiki-title", "_phantomChildren": {}, "_requested": { - "raw": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", + "raw": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", "scope": null, "escapedName": "mediawiki-title", "name": "mediawiki-title", - "rawSpec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", - "spec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", + "rawSpec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", + "spec": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", "type": "remote" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", - "_shasum": "b453ded9e0d9d7c97b7914f3100dbe68840c6e03", + "_resolved": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", + "_shasum": "5f2b45b6107ec99acabd31619fae4d36ab809a59", "_shrinkwrap": null, - "_spec": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz", - "_where": "/Users/arlolra/Work/Wikimedia/services/deploy", + "_spec": "mediawiki-title@https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz", + "_where": "/home/subbu/work/wmf/deploy", "author": { "name": "Wikimedia Services Team", "email": "servi...@wikimedia.org" @@ -75,5 +75,5 @@ "coveralls": "cat ./coverage/lcov.info | coveralls", "test": "mocha" }, - "version": "0.6.4" + "version": "0.6.5" } diff --git a/node_modules/mediawiki-title/test/index.js b/node_modules/mediawiki-title/test/index.js index 47a0291..2e44fcb 100644 --- a/node_modules/mediawiki-title/test/index.js +++ b/node_modules/mediawiki-title/test/index.js @@ -211,30 +211,30 @@ [ 'en.wikipedia.org', 'ὒ', 'ὒ' ], [ 'en.wikipedia.org', 'ὔ', 'ὔ' ], [ 'en.wikipedia.org', 'ὖ', 'ὖ' ], - [ 'en.wikipedia.org', 'ᾀ', 'ᾀ' ], - [ 'en.wikipedia.org', 'ᾁ', 'ᾁ' ], - [ 'en.wikipedia.org', 'ᾂ', 'ᾂ' ], - [ 'en.wikipedia.org', 'ᾃ', 'ᾃ' ], - [ 'en.wikipedia.org', 'ᾄ', 'ᾄ' ], - [ 'en.wikipedia.org', 'ᾅ', 'ᾅ' ], - [ 'en.wikipedia.org', 'ᾆ', 'ᾆ' ], - [ 'en.wikipedia.org', 'ᾇ', 'ᾇ' ], - [ 'en.wikipedia.org', 'ᾐ', 'ᾐ' ], - [ 'en.wikipedia.org', 'ᾑ', 'ᾑ' ], - [ 'en.wikipedia.org', 'ᾒ', 'ᾒ' ], - [ 'en.wikipedia.org', 'ᾓ', 'ᾓ' ], - [ 'en.wikipedia.org', 'ᾔ', 'ᾔ' ], - [ 'en.wikipedia.org', 'ᾕ', 'ᾕ' ], - [ 'en.wikipedia.org', 'ᾖ', 'ᾖ' ], - [ 'en.wikipedia.org', 'ᾗ', 'ᾗ' ], - [ 'en.wikipedia.org', 'ᾠ', 'ᾠ' ], - [ 'en.wikipedia.org', 'ᾡ', 'ᾡ' ], - [ 'en.wikipedia.org', 'ᾢ', 'ᾢ' ], - [ 'en.wikipedia.org', 'ᾣ', 'ᾣ' ], - [ 'en.wikipedia.org', 'ᾤ', 'ᾤ' ], - [ 'en.wikipedia.org', 'ᾥ', 'ᾥ' ], - [ 'en.wikipedia.org', 'ᾦ', 'ᾦ' ], - [ 'en.wikipedia.org', 'ᾧ', 'ᾧ' ], + [ 'en.wikipedia.org', 'ᾀ', 'ᾈ' ], + [ 'en.wikipedia.org', 'ᾁ', 'ᾉ' ], + [ 'en.wikipedia.org', 'ᾂ', 'ᾊ' ], + [ 'en.wikipedia.org', 'ᾃ', 'ᾋ' ], + [ 'en.wikipedia.org', 'ᾄ', 'ᾌ' ], + [ 'en.wikipedia.org', 'ᾅ', 'ᾍ' ], + [ 'en.wikipedia.org', 'ᾆ', 'ᾎ' ], + [ 'en.wikipedia.org', 'ᾇ', 'ᾏ' ], + [ 'en.wikipedia.org', 'ᾐ', 'ᾘ' ], + [ 'en.wikipedia.org', 'ᾑ', 'ᾙ' ], + [ 'en.wikipedia.org', 'ᾒ', 'ᾚ' ], + [ 'en.wikipedia.org', 'ᾓ', 'ᾛ' ], + [ 'en.wikipedia.org', 'ᾔ', 'ᾜ' ], + [ 'en.wikipedia.org', 'ᾕ', 'ᾝ' ], + [ 'en.wikipedia.org', 'ᾖ', 'ᾞ' ], + [ 'en.wikipedia.org', 'ᾗ', 'ᾟ' ], + [ 'en.wikipedia.org', 'ᾠ', 'ᾨ' ], + [ 'en.wikipedia.org', 'ᾡ', 'ᾩ' ], + [ 'en.wikipedia.org', 'ᾢ', 'ᾪ' ], + [ 'en.wikipedia.org', 'ᾣ', 'ᾫ' ], + [ 'en.wikipedia.org', 'ᾤ', 'ᾬ' ], + [ 'en.wikipedia.org', 'ᾥ', 'ᾭ' ], + [ 'en.wikipedia.org', 'ᾦ', 'ᾮ' ], + [ 'en.wikipedia.org', 'ᾧ', 'ᾯ' ], [ 'en.wikipedia.org', 'ff', 'ff' ], [ 'en.wikipedia.org', 'fi', 'fi' ], [ 'en.wikipedia.org', 'fl', 'fl' ], @@ -247,6 +247,7 @@ [ 'en.wikipedia.org', 'ﬕ', 'ﬕ' ], [ 'en.wikipedia.org', 'ﬖ', 'ﬖ' ], [ 'en.wikipedia.org', 'ﬗ', 'ﬗ' ], + [ 'en.wikipedia.org', 'ⓝ', 'ⓝ' ], // Special page aliases [ 'en.wikipedia.org', 'Special:NotSpecial', 'Special:NotSpecial' ], [ 'en.wikipedia.org', 'Special:Lonelypages', 'Special:LonelyPages' ], diff --git a/src b/src index 2887b5a..ab4dc20 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 2887b5adf392df1d511ceabf6da6d1c881a50e9a +Subproject commit ab4dc2094dced1267fb13944cc70bfd5a508a65a -- To view, visit https://gerrit.wikimedia.org/r/391082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id36aa619f8abcec81aa641e4848242a72e4c811c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org> Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org> Gerrit-Reviewer: Sbailey <sbai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits