Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327772 )
Change subject: Replace .url with .uri; bump preq and html-metadata; rel v0.4.4
......................................................................
Replace .url with .uri; bump preq and html-metadata; rel v0.4.4
preq and request prefer to be supplied the .uri property instead of
.url, so use that one instead. While internally both of these libraries
map either prop name to .uri, there are some edge cases in redirects
where Citoid doesn't work, so switch to .uri.
Change-Id: I7812ddb125e7fb558e32129a0e0dff6355a79d35
---
M lib/CitoidService.js
M lib/Scraper.js
M lib/ZoteroService.js
M lib/crossRefRequest.js
M lib/pubMedRequest.js
M lib/unshorten.js
M package.json
7 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index a01925c..0d82ed3 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -217,7 +217,7 @@
};
var requestOptions = {
- url : isbnLink,
+ uri : isbnLink,
headers: {
'User-Agent': this.userAgent
},
@@ -276,7 +276,7 @@
};
var requestOptions = {
- url : isbnLink,
+ uri : isbnLink,
headers: {
'User-Agent': citoidService.userAgent
},
@@ -433,7 +433,7 @@
var urlOpts = {};
// Options for obtaining url the DOI resolves to
var resolveOpts = {
- url : doiLink,
+ uri : doiLink,
method: 'head',
followRedirect : false,
headers: {
diff --git a/lib/Scraper.js b/lib/Scraper.js
index d352a49..d3b0036 100644
--- a/lib/Scraper.js
+++ b/lib/Scraper.js
@@ -65,7 +65,7 @@
logger.log('debug/scraper', "Using native scraper on " + url);
return preq({
- url: url,
+ uri: url,
followAllRedirects: true,
jar: cr.jar, // Set cookie jar for request
encoding: null, // returns page in Buffer object
@@ -514,4 +514,4 @@
}
module.exports.itemTypeFromPress = itemTypeFromPress;
-module.exports.addItemType = addItemType;
\ No newline at end of file
+module.exports.addItemType = addItemType;
diff --git a/lib/ZoteroService.js b/lib/ZoteroService.js
index b743128..4d84df9 100644
--- a/lib/ZoteroService.js
+++ b/lib/ZoteroService.js
@@ -122,7 +122,7 @@
*/
ZoteroService.prototype.zoteroExportRequest =
BBPromise.method(function(citation, format){
var options = {
- url: this.exportURL,
+ uri: this.exportURL,
method: 'POST',
body: JSON.stringify(citation),
qs: {format: format},
diff --git a/lib/crossRefRequest.js b/lib/crossRefRequest.js
index 7e1cc76..ace2e43 100644
--- a/lib/crossRefRequest.js
+++ b/lib/crossRefRequest.js
@@ -26,7 +26,7 @@
var url = "https://search.crossref.org/dois?q="; + urlEncodedDOI;
return preq({
- url: url,
+ uri: url,
headers: {
'User-Agent': userAgent
}
diff --git a/lib/pubMedRequest.js b/lib/pubMedRequest.js
index b79fc35..785b28a 100644
--- a/lib/pubMedRequest.js
+++ b/lib/pubMedRequest.js
@@ -26,7 +26,7 @@
var url =
"https://www.ncbi.nlm.nih.gov/pmc/utils/idconv/v1.0/?tool=citoid&email=citoid@mediawiki&format=json&ids=";
+ escapedId;
return preq({
- url: url,
+ uri: url,
headers: {
'User-Agent': userAgent
}
diff --git a/lib/unshorten.js b/lib/unshorten.js
index b0d39fb..6695bc3 100644
--- a/lib/unshorten.js
+++ b/lib/unshorten.js
@@ -27,7 +27,7 @@
* returned).
*/
method: 'get',
- url: url,
+ uri: url,
};
var initialRequest = true;
@@ -36,18 +36,18 @@
var maxRedirects = conf.maxRedirects || 5;
function detectRedirect (response) {
- if (response.headers.hasOwnProperty('location') && (opts.url !==
response.headers['location'])) {
- return followRedirect(response.headers['location'], opts.url);
+ if (response.headers.hasOwnProperty('location') && (opts.uri !==
response.headers['location'])) {
+ return followRedirect(response.headers['location'], opts.uri);
}
- if (response.headers.hasOwnProperty('content-location') && (opts.url
!== response.headers['content-location'])) {
- return followRedirect(response.headers['content-location'],
opts.url);
+ if (response.headers.hasOwnProperty('content-location') && (opts.uri
!== response.headers['content-location'])) {
+ return followRedirect(response.headers['content-location'],
opts.uri);
}
if (initialRequest) {
throw new Error('No redirect detected in unshorten');
}
- return opts.url;
+ return opts.uri;
}
function followRedirect (redirLocation, prevUrl) {
@@ -66,7 +66,7 @@
logger.log('trace/unshorten', 'Assembled relative redirect: '
+ allowedUrl);
}
- opts.url = allowedUrl;
+ opts.uri = allowedUrl;
initialRequest = false;
return preq(opts).then(detectRedirect);
@@ -75,7 +75,7 @@
return hostIsAllowed(url, conf, logger)
.then(function (allowedUrl) {
- opts.url = allowedUrl;
+ opts.uri = allowedUrl;
return preq(opts)
.then(detectRedirect)
diff --git a/package.json b/package.json
index ac8c412..269f0a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "citoid",
- "version": "0.4.3",
+ "version": "0.4.4",
"description": "Converts search terms such as URL or DOI into citations.",
"homepage": "https://www.mediawiki.org/wiki/Citoid";,
"license": "Apache-2.0",
@@ -22,11 +22,11 @@
"core-js": "2.4.1",
"express": "4.14.0",
"extend": "3.0.0",
- "html-metadata": "1.6.0",
+ "html-metadata": "1.6.2",
"iconv-lite": "0.4.15",
"ip": "1.1.0",
"js-yaml": "3.7.0",
- "preq": "0.4.12",
+ "preq": "0.5.2",
"request": "^2.67.0",
"service-runner": "2.1.13",
"striptags": "2.1.1",
--
To view, visit https://gerrit.wikimedia.org/r/327772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7812ddb125e7fb558e32129a0e0dff6355a79d35
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
