jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404244 )
Change subject: Hygiene: move summary route to own file
......................................................................
Hygiene: move summary route to own file
Change-Id: I3f1c11331d4b1ecbc19fa6d5b1a039aa67fee1ec
---
M routes/mobile-sections.js
A routes/summary.js
2 files changed, 51 insertions(+), 25 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 979e2c8..9584add 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -8,7 +8,6 @@
const parsoid = require('../lib/parsoid-access');
const sUtil = require('../lib/util');
const transforms = require('../lib/transforms');
-const Title = require('mediawiki-title').Title;
/**
* The main router object
@@ -352,30 +351,6 @@
mUtil.setETag(res, response.page.revision, response.page.tid);
mUtil.setContentType(res, mUtil.CONTENT_TYPES.mobileSections);
res.json(buildRemaining(response)).end();
- });
-});
-
-/**
-* GET {domain}/v1/page/summary/{title}/{revision?}/{tid?}
-* Extracts a summary of a given wiki page limited to one paragraph of text
-*/
-router.get('/summary/:title/:revision?/:tid?', (req, res) => {
- return BBPromise.props({
- page: parsoid.pageJsonPromise(app, req, false),
- meta: mwapi.getMetadata(app, req),
- title: mwapi.getTitleObj(app, req),
- siteinfo: mwapi.getSiteInfo(app, req)
- }).then((response) => {
- const title = Title.newFromText(req.params.title, response.siteinfo);
- const summary = mUtil.buildSummary(req.params.domain, title,
response.page, response.meta);
- res.status(summary.code);
- if (summary.code === 200) {
- delete summary.code;
- mUtil.setETag(res, summary.revision, summary.tid);
- mUtil.setContentType(res, mUtil.CONTENT_TYPES.summary);
- res.send(summary);
- }
- res.end();
});
});
diff --git a/routes/summary.js b/routes/summary.js
new file mode 100644
index 0000000..8a3b058
--- /dev/null
+++ b/routes/summary.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const BBPromise = require('bluebird');
+const mwapi = require('../lib/mwapi');
+const mUtil = require('../lib/mobile-util');
+const parsoid = require('../lib/parsoid-access');
+const sUtil = require('../lib/util');
+const Title = require('mediawiki-title').Title;
+
+/**
+ * The main router object
+ */
+const router = sUtil.router();
+
+/**
+ * The main application object reported when this module is require()d
+ */
+let app;
+
+/**
+ * GET {domain}/v1/page/summary/{title}/{revision?}/{tid?}
+ * Extracts a summary of a given wiki page limited to one paragraph of text
+ */
+router.get('/summary/:title/:revision?/:tid?', (req, res) => {
+ return BBPromise.props({
+ page: parsoid.pageJsonPromise(app, req, false),
+ meta: mwapi.getMetadata(app, req),
+ title: mwapi.getTitleObj(app, req),
+ siteinfo: mwapi.getSiteInfo(app, req)
+ }).then((response) => {
+ const title = Title.newFromText(req.params.title, response.siteinfo);
+ const summary = mUtil.buildSummary(req.params.domain, title,
response.page, response.meta);
+ res.status(summary.code);
+ if (summary.code === 200) {
+ delete summary.code;
+ mUtil.setETag(res, summary.revision, summary.tid);
+ mUtil.setContentType(res, mUtil.CONTENT_TYPES.summary);
+ res.send(summary);
+ }
+ res.end();
+ });
+});
+
+module.exports = function(appObj) {
+ app = appObj;
+ return {
+ path: '/page',
+ api_version: 1,
+ router
+ };
+};
--
To view, visit https://gerrit.wikimedia.org/r/404244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f1c11331d4b1ecbc19fa6d5b1a039aa67fee1ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
