Skip to content

Commit 9f78705

Browse files
author
Ludovic Vannoorenberghe
committed
clean up/linting/potential leaks
1 parent 34d9098 commit 9f78705

23 files changed

+108
-162
lines changed

‎.eslintrc

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
parserOptions: {
3+
ecmaVersion: 5,
4+
sourceType: 'module',
5+
},
6+
rules: {
7+
'no-undef': 'error',
8+
'no-unused-vars': ['error', { vars: 'local', args: 'after-used' }],
9+
'no-use-before-define': 'error'
10+
},
11+
}

‎api/controllers/BadgeController.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
* @help :: See http://sailsjs.org/#!/documentation/concepts/Controllers
66
*/
77

8+
var formatNumber = function(number){
9+
if(number > 999999) return (number/1000000).toFixed(1) + 'M';
10+
else if (number >999) return (number/1000).toFixed(1) + 'K';
11+
else return number;
12+
};
13+
814
module.exports = {
915

1016
/**
@@ -77,9 +83,9 @@ module.exports = {
7783
downloads = data["sum_indirect"] + data["sum_direct"]
7884
statsName = "total downloads"
7985
}
80-
length = 20+ (String(downloads).length + period.length+1)*6
81-
statistics = {
82-
downloads:_formatNumber(downloads),
86+
var length = 20+ (String(downloads).length + period.length+1)*6
87+
var statistics = {
88+
downloads:formatNumber(downloads),
8389
statsName:statsName,
8490
period:period,
8591
length:length
@@ -108,25 +114,19 @@ module.exports = {
108114
*/
109115
getLatestVersion: function(req, res) {
110116
var packageName = req.param("packageName");
111-
Package.getLatestVersionNumber(packageName).then(function(package){
112-
if(package===null){
113-
version="not published";
114-
color="#e05d44";
117+
Package.getLatestVersionNumber(packageName).then(function(_package){
118+
if(_package===null){
119+
var version="not published";
120+
var color="#e05d44";
115121
}
116122
else{
117-
version=package.latest_version.dataValues.version;
118-
color="#33aacc";
123+
var version=_package.latest_version.dataValues.version;
124+
var color="#33aacc";
119125
}
120-
length=40+version.length*6;
126+
var length = 40+version.length*6;
121127
res.type('image/svg+xml');
122128
res.locals.layout = null;
123129
res.view('badges/version_badge.ejs',{data:{version:version,color:color,length:length}});
124130
});
125131
},
126132
};
127-
128-
_formatNumber=function(number){
129-
if(number > 999999) return (number/1000000).toFixed(1) + 'M';
130-
else if (number >999) return (number/1000).toFixed(1) + 'K';
131-
else return number;
132-
};

‎api/controllers/CampusController.js

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
*
44
* @description :: Server-side logic for the integration of the campus-app with Rdocs
55
*/
6-
var Promise = require('bluebird');
7-
var _ = require('lodash');
8-
96

107
module.exports = {
118

‎api/controllers/CollaboratorController.js

+7-9
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ var request = require('request');
1111
var Promise = require('bluebird');
1212
var numeral = require('numeral');
1313

14-
15-
16-
var self = module.exports = {
14+
module.exports = {
1715

1816

1917

@@ -64,14 +62,14 @@ var self = module.exports = {
6462
if(packages === null) return res.notFound();
6563
else {
6664
var json = {name: name };
67-
repositories = {
65+
var repositories = {
6866
cran: 0,
6967
bioconductor: 0,
7068
github: 0
7169
};
7270

73-
Promise.map(packages, function(package) {
74-
var latest = package.latest_version.toJSON();
71+
Promise.map(packages, function(_package) {
72+
var latest = _package.latest_version.toJSON();
7573
if (latest.maintainer.name === name) {
7674
latest.is_maintainer = true;
7775
}
@@ -88,12 +86,12 @@ var self = module.exports = {
8886
if(!json.email && collaborators.length > 0 && collaborators[0].email) {
8987
json.email = collaborators[0].email;
9088
}
91-
repositories[package.repository.name] = repositories[package.repository.name]+1 || 1;
89+
repositories[_package.repository.name] = repositories[_package.repository.name]+1 || 1;
9290

9391
return Package.getPackagePercentile(latest.package_name).then(function(percentileObject) {
9492
latest.percentile = isNaN(percentileObject.percentile) ? -1 : percentileObject.percentile;
9593
latest.totalDownloads = percentileObject.total;
96-
latest.repoName = package.repository.name;
94+
latest.repoName = _package.repository.name;
9795
return latest;
9896
});
9997

@@ -121,7 +119,7 @@ var self = module.exports = {
121119
getNumberOfDirectDownloads: function(req,res){
122120
var name = req.param('name');
123121
DownloadStatistic.getNumberOfDirectDownloads(name).then(function(results){
124-
row = results[0];
122+
var row = results[0];
125123
row.totalStr = row.total ? numeral(row.total).format('0,0') : '';
126124
res.json(results[0]);
127125
});

‎api/controllers/ExampleController.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414
* @apiGroup Example
1515
* @apiPermission require to be authenticated
1616
* @apiDescription Create a new review in the specified topic.
17-
*
17+
*
1818
*
1919
*
2020
* @apiParam {Int} topicId Id of the topic to post to review
@@ -80,7 +80,7 @@ module.exports = {
8080
*
8181
* @apiParam {Integer} exampleId The id of the example.
8282
* @apiParam {String} text Contents of the updated example (styling via markdown).
83-
*
83+
*
8484
* @apiSuccess {String} status done when the operation was successful, forbidden if the user isn't properly authenticated.
8585
*/
8686
updateExample: function(req, res) {
@@ -113,7 +113,6 @@ module.exports = {
113113
var limit = Utils.parseLimit(req),
114114
offset = Utils.parseSkip(req),
115115
sort = Utils.parseSort(req) || 'created_at DESC';
116-
var user = req.user;
117116

118117
return Example.findAll({
119118
where: {

‎api/controllers/PackageController.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,25 @@ module.exports = {
5353
{ model: PackageVersion, as: 'versions' },
5454
],
5555
order: [[sequelize.fn('ORDER_VERSION', sequelize.col('version')), 'ASC' ]]
56-
}).then(function(package) {
57-
if(package === null) {
56+
}).then(function(_package) {
57+
if(_package === null) {
5858
return res.rstudio_redirect(301, '/search?q=' + encodeURIComponent(packageName));
5959
//there seems to be a problem with redirected requests if text/html is set as contentype for the ajax request, so I just
6060
//adapt this so Rstudio still gets the html
6161
} else if(req.wantsJSON &&!req.param("viewer_pane")==1) {
62-
return res.json(package);
62+
return res.json(_package);
6363
} else {
64-
if (package.versions.length === 0)
64+
if (_package.versions.length === 0)
6565
return Package.findOne({
6666
where: {name: packageName},
6767
include: [{ model: PackageVersion, attributes: ['package_name', 'version', 'id'], as: 'reverse_dependencies'}]
6868
}).then(function(packageInstance) {
6969
if(packageInstance === null) return res.notFound();
70-
var package = packageInstance.toJSON();
71-
package.pageTitle = packageInstance.name;
72-
return res.ok(package, 'package/show.ejs');
70+
var _package = packageInstance.toJSON();
71+
_package.pageTitle = packageInstance.name;
72+
return res.ok(_package, 'package/show.ejs');
7373
});
74-
else return res.rstudio_redirect(301, package.versions[package.versions.length - 1].uri);
74+
else return res.rstudio_redirect(301, _package.versions[_package.versions.length - 1].uri);
7575
}
7676
}).catch(function(err) {
7777
return res.negotiate(err);
@@ -130,8 +130,8 @@ module.exports = {
130130
include: [
131131
{ model: TaskView, as: 'inViews', attributes:['name'] }
132132
]
133-
}).then(function(package){
134-
var views = package.inViews;
133+
}).then(function(_package){
134+
var views = _package.inViews;
135135
views.forEach(function(view){
136136
RedisService.del('rdocs_view_show_' + view.name);
137137
});

‎api/controllers/PackageVersionController.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = {
4545
var result = PackageVersion.createWithDescriptionFile({input: req.body});
4646
result.then(function(value) {
4747
res.location('/api/packages/' + value.package_name + '/versions/' + value.version);
48-
key = 'view_package_version_' + value.package_name + '_' + value.version;
48+
var key = 'view_package_version_' + value.package_name + '_' + value.version;
4949
RedisService.del(key);
5050
res.json(value);
5151
}).catch(Sequelize.UniqueConstraintError, function (err) {
@@ -165,7 +165,7 @@ module.exports = {
165165
},
166166

167167
_getDownloadStatistics: function (res, packageName) {
168-
key = 'rdocs_download_stats_' + packageName;
168+
var key = 'rdocs_download_stats_' + packageName;
169169

170170
return RedisService.getJSONFromCache(key, res, RedisService.DAILY, function() {
171171

@@ -348,7 +348,7 @@ module.exports = {
348348
* @apiSuccess {Integer} nodes.group The group to which this package belongs in the graph. The dependency and his dependencies are grouped together. When conflict the second level dependency is grouped with the most popular dependency.
349349
* @apiSuccess {Object[]} links The links in the graph represented as a list.
350350
* @apiSuccess {Integer} links.source The dependant package (as number in the nodes list).
351-
* @apiSuccess {Integer} links.target The depending package (as number in the nodes list).
351+
* @apiSuccess {Integer} links.target The depending package (as number in the nodes list).
352352
*/
353353
getDependencyGraph: function(req,res) {
354354
var rootPackage = req.param('name');
@@ -421,7 +421,7 @@ module.exports = {
421421
* @apiSuccess {Integer} nodes.group The group to which this package belongs in the graph. The reverse dependency and his reverse dependencies are grouped together. When conflict the second level reverse dependency is grouped with the most popular reverse dependency.
422422
* @apiSuccess {Object[]} links The links in the graph represented as a list.
423423
* @apiSuccess {Integer} links.source The depending package (as number in the nodes list).
424-
* @apiSuccess {Integer} links.target The dependant package (as number in the nodes list).
424+
* @apiSuccess {Integer} links.target The dependant package (as number in the nodes list).
425425
*/
426426
getReverseDependencyGraph: function(req,res) {
427427
var rootPackage = req.param('name');

‎api/controllers/RstudioController.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
var Promise = require('bluebird');
88
var _ = require('lodash');
99

10+
var splitByCommaOrNull = function(param){
11+
return (typeof param != "undefined" && param.length>0)? param.split(",") : null;
12+
}
1013

1114
module.exports = {
1215

@@ -22,7 +25,7 @@ module.exports = {
2225
2326
**/
2427
viewResults : function(req,res){
25-
matches = req.param("matches")
28+
var matches = req.param("matches")
2629
if(matches === 0){
2730
return ElasticSearchService.helpSearchQuery(req.param("topic"),['aliases'],true,2).then(function(json){
2831
return res.ok(json,'rStudio/topic_not_found.ejs');
@@ -54,8 +57,8 @@ module.exports = {
5457
*/
5558
case "help":
5659
//parse parameters
57-
var packageNames = _splitByCommaOrNull(req.param("packages"));
58-
var topicNames = _splitByCommaOrNull(req.param("topic_names"));
60+
var packageNames = splitByCommaOrNull(req.param("packages"));
61+
var topicNames = splitByCommaOrNull(req.param("topic_names"));
5962
var topic = req.param("topic");
6063
var help_data = RStudioService.help(packageNames,topicNames,topic);
6164
break;
@@ -65,8 +68,8 @@ module.exports = {
6568
*/
6669
case "help_search":
6770
//parse parameters
68-
var packageNames = _splitByCommaOrNull(req.param('matching_packages'));
69-
var topicNames = _splitByCommaOrNull(req.param('matching_titles'));
71+
var packageNames = splitByCommaOrNull(req.param('matching_packages'));
72+
var topicNames = splitByCommaOrNull(req.param('matching_titles'));
7073
var pattern = req.param("query");
7174
var fields = req.param("fields").split(",");
7275
var fuzzy = (req.param("type") === "fuzzy")? fuzzy = true : fuzzy = false;
@@ -147,6 +150,3 @@ module.exports = {
147150
}
148151
};
149152

150-
_splitByCommaOrNull = function(param){
151-
return (typeof param != "undefined" && param.length>0)? param.split(",") : null;
152-
}

‎api/controllers/TaskViewController.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -142,17 +142,17 @@ module.exports = {
142142
}]
143143
}).then(function(view) {
144144
var jsonViews = view.toJSON();
145-
var packages = _.map(jsonViews.packages, function(package) {
145+
var packages = _.map(jsonViews.packages, function(_package) {
146146
var rating;
147-
if(!package.latest_version || package.latest_version.reviews.length === 0) {
147+
if(!_package.latest_version || _package.latest_version.reviews.length === 0) {
148148
rating = 0;
149149
} else {
150-
rating = _.meanBy(package.latest_version.reviews, function(r) {
150+
rating = _.meanBy(_package.latest_version.reviews, function(r) {
151151
return r.rating;
152152
});
153153
}
154-
package.rating = rating;
155-
return package;
154+
_package.rating = rating;
155+
return _package;
156156
});
157157
jsonViews.packages = packages;
158158
jsonViews.pageTitle = view.name;

‎api/controllers/WorkerController.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
var packageVersion = req.body.package.version;
2121
var result = Topic.createWithRdFile({input: req.body, packageName: packageName, packageVersion: packageVersion});
2222
result.then(function(value) {
23-
key = 'view_topic_' + value.id;
23+
var key = 'view_topic_' + value.id;
2424
RedisService.del(key);
2525
res.json(value);
2626
})
@@ -69,9 +69,9 @@ module.exports = {
6969
console.log("Nothing new");
7070
return res.send(200, "done");
7171
}
72-
72+
res.send(200, "scheduled");
7373
DownloadStatsService.reverseDependenciesCache = {}; //clean old cache
74-
Promise.map(diffs, function (nDay) {
74+
return Promise.map(diffs, function (nDay) {
7575
console.log("Started indexing for today - " + nDay + "days");
7676
return CronService.splittedAggregatedDownloadstats(nDay)
7777
.catch({message: "empty"}, function() {
@@ -86,7 +86,6 @@ module.exports = {
8686
.then(function (result) {
8787
console.log("Finished indexing splitted stats");
8888
DownloadStatsService.reverseDependenciesCache = {}; //clean cache
89-
res.send(200, "done");
9089
}).catch(function(err) {
9190
return res.negotiate(err);
9291
});

‎api/models/Alias.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @description :: TODO: You might write a short summary of how this model works and what it represents here.
55
* @docs :: http://sailsjs.org/documentation/concepts/models-and-orm/models
66
*/
7-
_ = require('lodash');
7+
var _ = require('lodash');
88
var Promise = require('bluebird');
99

1010
module.exports = {
@@ -89,7 +89,7 @@ module.exports = {
8989
group:['topic.name','topic.package_version.id','topic.id','Alias.id','topic.package_version.package_latest.name'],
9090
order:[sequelize.fn('SUM', sequelize.col('topic.package_version.package_latest.last_month_stats.direct_downloads'))]
9191
}).then(function(data){
92-
allResults = _.map(data,function(record){
92+
var allResults = _.map(data,function(record){
9393
return {
9494
id:record.topic.id,
9595
package_name:record.topic.package_version.package_name,
@@ -98,7 +98,7 @@ module.exports = {
9898
function_description:record.topic.description
9999
};
100100
})
101-
return allResults;
101+
return allResults;
102102
}).catch(function(err){
103103
console.log(err.message);
104104
});
@@ -140,7 +140,7 @@ module.exports = {
140140
group:['topic.name','topic.package_version.id','topic.id','Alias.id','topic.package_version.package_latest.name'],
141141
order:[sequelize.fn('SUM', sequelize.col('topic.package_version.package_latest.last_month_stats.direct_downloads'))]
142142
}).then(function(data){
143-
allResults = _.map(data,function(record){
143+
var allResults = _.map(data,function(record){
144144
return {
145145
id:record.topic.id,
146146
package_name:record.topic.package_version.package_name,
@@ -149,7 +149,7 @@ module.exports = {
149149
function_description:record.topic.description
150150
};
151151
})
152-
return allResults;
152+
return allResults;
153153
}).catch(function(err){
154154
console.log(err.message);
155155
});
@@ -191,11 +191,11 @@ module.exports = {
191191
group:['name','package_version.id','id','package_version.package_latest.name'],
192192
order:[sequelize.fn('SUM', sequelize.col('package_version.package_latest.last_month_stats.direct_downloads'))]
193193
}).then(function(data){
194-
allResults= _.map(data,function(record){
194+
var allResults= _.map(data,function(record){
195195
return Alias.findAll({
196196
where: {topic_id:record.id}
197197
}).then(function(aliases){
198-
alias = (aliases != null && aliases.length > 0)? aliases[0].name : "";
198+
var alias = (aliases != null && aliases.length > 0)? aliases[0].name : "";
199199
return {
200200
id:record.id,
201201
package_name:record.package_version.package_name,

0 commit comments

Comments
 (0)