Using Request for gittip vendor.

This commit is contained in:
Thaddee Tyl 2014-03-03 02:41:05 +01:00
parent f8ee5dff63
commit 293b99d967
2 changed files with 23 additions and 30 deletions

View File

@ -21,6 +21,7 @@
"canvas": "~1.1.2", "canvas": "~1.1.2",
"phantomjs": "~1.9.2-6", "phantomjs": "~1.9.2-6",
"es6-promise": "~0.1.1", "es6-promise": "~0.1.1",
"request": "~2.34.0",
"camp": "~13.11.9" "camp": "~13.11.9"
}, },
"devDependencies": { "devDependencies": {

View File

@ -4,6 +4,7 @@ var camp = require('camp').start({
}); });
var https = require('https'); var https = require('https');
var http = require('http'); var http = require('http');
var request = require('request');
var fs = require('fs'); var fs = require('fs');
var badge = require('./badge.js'); var badge = require('./badge.js');
var svg2img = require('./svg-to-img.js'); var svg2img = require('./svg-to-img.js');
@ -137,17 +138,12 @@ cache(function(data, match, sendBadge) {
var apiUrl = 'https://www.gittip.com/' + user + '/public.json'; var apiUrl = 'https://www.gittip.com/' + user + '/public.json';
var label = getLabel('tips', data); var label = getLabel('tips', data);
var badgeData = {text:[label, 'n/a'], colorscheme:'lightgrey'}; var badgeData = {text:[label, 'n/a'], colorscheme:'lightgrey'};
var redirectCount = 0; request(apiUrl, function dealWithData(err, res, buffer) {
https.get(apiUrl, function dealWithData(res) { if (err != null) {
// Is it a redirection? badgeData.text[1] = 'inaccessible';
if (res.statusCode === 302 && res.headers.location && redirectCount++ < 1) { sendBadge(format, badgeData);
https.get('https://www.gittip.com/' + res.headers.location, dealWithData);
return; return;
} }
var buffer = '';
res.on('data', function(chunk) { buffer += ''+chunk; });
res.on('end', function(chunk) {
if (chunk) { buffer += ''+chunk; }
try { try {
var data = JSON.parse(buffer); var data = JSON.parse(buffer);
var money = parseInt(data.receiving); var money = parseInt(data.receiving);
@ -168,10 +164,6 @@ cache(function(data, match, sendBadge) {
} }
sendBadge(format, badgeData); sendBadge(format, badgeData);
}); });
}).on('error', function(e) {
badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData);
});
})); }));
// Packagist integration. // Packagist integration.