[MediaWiki-commits] [Gerrit] Turn on all options when running tests; fix some minor issue... - change (mediawiki...bundler)
jenkins-bot has submitted this change and it was merged.
Change subject: Turn on all options when running tests; fix some minor issues
in modules.js.
..
Turn on all options when running tests; fix some minor issues in modules.js.
Change-Id: If0c8554eb9e2c971605035be5b0329d4649d9711
---
M bin/mw-ocg-bundler
M lib/modules.js
M test/samples.js
3 files changed, 18 insertions(+), 10 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-ocg-bundler b/bin/mw-ocg-bundler
index 8c6f3ef..a7aabd9 100755
--- a/bin/mw-ocg-bundler
+++ b/bin/mw-ocg-bundler
@@ -236,6 +236,7 @@
compat: !!program.compat, // For pediapress compatibility.
follow: !!program.follow, // Follow redirects.
saveRedirects: !!program.saveRedirects, // Save redirect info.
+ fetchModules: !!program.fetchModules, // For full HTML tree.
restbaseApi: program.restbaseApi ?
// Be user-friendly: strip trailing /page/html/ if
present.
program.restbaseApi.replace(/\/page\/html\/?$/, '/') :
diff --git a/lib/modules.js b/lib/modules.js
index 7704afa..4d6ab7f 100644
--- a/lib/modules.js
+++ b/lib/modules.js
@@ -17,18 +17,21 @@
};
// Returns a promise for the metadata of modules
-Modules.prototype.fetchdata =
-Promise.guard(MODULE_REQUEST_LIMIT, function(module, page, oldid) {
- return this.api.request(module.wiki, {
+Modules.prototype.fetchData =
+Promise.guard(MODULE_REQUEST_LIMIT, function(wiki, title, revision) {
+ return this.api.request(wiki, {
action: 'parse',
prop: 'modules|jsconfigvars',
- page: page,
- oldid: oldid,
+ page: title,
+ oldid: revision,
}).then(function(resp) {
- resp = resp.parse.modules;
- var pageid = Object.keys(resp)[0];
- resp = resp[pageid];
- return resp;
+ resp = resp.parse;
+ // Trim down the size of the response by omitting redundant
fields.
+ return {
+ modules: resp.modules,
+ modulescripts: resp.modulescripts,
+ modulestyles: resp.modulestyles,
+ jsconfigvars: resp.jsconfigvars,
+ };
});
});
-
diff --git a/test/samples.js b/test/samples.js
index 39395c2..f2d140f 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -31,6 +31,10 @@
apiVersion: 'restbase1',
size: IMAGESIZE,
debug: TRAVIS,
+ compat: true,
+ follow: true,
+ saveRedirects: true,
+ fetchModules: true,
log: function() {
if (!TRAVIS) {
return; }
var time = new
Date().toISOString().slice(11,23);
--
To view, visit https://gerrit.wikimedia.org/r/250313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0c8554eb9e2c971605035be5b0329d4649d9711
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: Adishaporwal
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn on all options when running tests; fix some minor issue... - change (mediawiki...bundler)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250313
Change subject: Turn on all options when running tests; fix some minor issues
in modules.js.
..
Turn on all options when running tests; fix some minor issues in modules.js.
Change-Id: If0c8554eb9e2c971605035be5b0329d4649d9711
---
M bin/mw-ocg-bundler
M lib/modules.js
M test/samples.js
3 files changed, 18 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
refs/changes/13/250313/1
diff --git a/bin/mw-ocg-bundler b/bin/mw-ocg-bundler
index 8c6f3ef..a7aabd9 100755
--- a/bin/mw-ocg-bundler
+++ b/bin/mw-ocg-bundler
@@ -236,6 +236,7 @@
compat: !!program.compat, // For pediapress compatibility.
follow: !!program.follow, // Follow redirects.
saveRedirects: !!program.saveRedirects, // Save redirect info.
+ fetchModules: !!program.fetchModules, // For full HTML tree.
restbaseApi: program.restbaseApi ?
// Be user-friendly: strip trailing /page/html/ if
present.
program.restbaseApi.replace(/\/page\/html\/?$/, '/') :
diff --git a/lib/modules.js b/lib/modules.js
index 7704afa..4d6ab7f 100644
--- a/lib/modules.js
+++ b/lib/modules.js
@@ -17,18 +17,21 @@
};
// Returns a promise for the metadata of modules
-Modules.prototype.fetchdata =
-Promise.guard(MODULE_REQUEST_LIMIT, function(module, page, oldid) {
- return this.api.request(module.wiki, {
+Modules.prototype.fetchData =
+Promise.guard(MODULE_REQUEST_LIMIT, function(wiki, title, revision) {
+ return this.api.request(wiki, {
action: 'parse',
prop: 'modules|jsconfigvars',
- page: page,
- oldid: oldid,
+ page: title,
+ oldid: revision,
}).then(function(resp) {
- resp = resp.parse.modules;
- var pageid = Object.keys(resp)[0];
- resp = resp[pageid];
- return resp;
+ resp = resp.parse;
+ // Trim down the size of the response by omitting redundant
fields.
+ return {
+ modules: resp.modules,
+ modulescripts: resp.modulescripts,
+ modulestyles: resp.modulestyles,
+ jsconfigvars: resp.jsconfigvars,
+ };
});
});
-
diff --git a/test/samples.js b/test/samples.js
index 39395c2..f2d140f 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -31,6 +31,10 @@
apiVersion: 'restbase1',
size: IMAGESIZE,
debug: TRAVIS,
+ compat: true,
+ follow: true,
+ saveRedirects: true,
+ fetchModules: true,
log: function() {
if (!TRAVIS) {
return; }
var time = new
Date().toISOString().slice(11,23);
--
To view, visit https://gerrit.wikimedia.org/r/250313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0c8554eb9e2c971605035be5b0329d4649d9711
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
