clean up/linting/potential leaks

.eslintrc

@@ -0,0 +1,11 @@
+{
+  parserOptions: {
+    ecmaVersion: 5,
+    sourceType: 'module',
+  },
+  rules: {
+    'no-undef': 'error',
+    'no-unused-vars': ['error', { vars: 'local', args: 'after-used' }],
+    'no-use-before-define': 'error'
+  },
+}

api/controllers/BadgeController.js

@@ -5,6 +5,12 @@
  * @help        :: See http://sailsjs.org/#!/documentation/concepts/Controllers
  */
 
+var formatNumber = function(number){
+  if(number > 999999) return (number/1000000).toFixed(1) + 'M';
+  else if (number >999) return (number/1000).toFixed(1) + 'K';
+  else return number;
+};
+
 module.exports = {
 
 	  /**
@@ -77,9 +83,9 @@ module.exports = {
 					downloads = data["sum_indirect"] + data["sum_direct"]
 					statsName = "total downloads"
 				}
-				length = 20+ (String(downloads).length + period.length+1)*6
-				statistics = {
-					downloads:_formatNumber(downloads),
+				var length = 20+ (String(downloads).length + period.length+1)*6
+				var statistics = {
+					downloads:formatNumber(downloads),
 					statsName:statsName,
 					period:period,
 					length:length
@@ -108,25 +114,19 @@ module.exports = {
   */
   getLatestVersion: function(req, res) {
   	var packageName = req.param("packageName");
-  	Package.getLatestVersionNumber(packageName).then(function(package){
-  		if(package===null){
-  			version="not published";
-  			color="#e05d44";
+  	Package.getLatestVersionNumber(packageName).then(function(_package){
+  		if(_package===null){
+  			var version="not published";
+  			var color="#e05d44";
   		}
   		else{
-  			version=package.latest_version.dataValues.version;
-  			color="#33aacc";
+  			var version=_package.latest_version.dataValues.version;
+  			var color="#33aacc";
   		}
-  		length=40+version.length*6;
+  		var length = 40+version.length*6;
       res.type('image/svg+xml');
       res.locals.layout = null;
   		res.view('badges/version_badge.ejs',{data:{version:version,color:color,length:length}});
   	});
   },
 };
-
-_formatNumber=function(number){
-	if(number > 999999) return (number/1000000).toFixed(1) + 'M';
-	else if (number >999) return (number/1000).toFixed(1) + 'K';
-	else return number;
-};

api/controllers/CampusController.js

@@ -3,9 +3,6 @@
  *
  * @description :: Server-side logic for the integration of the campus-app with Rdocs
  */
-var Promise = require('bluebird');
-var _ = require('lodash');
-
 
 module.exports = {
 

api/controllers/CollaboratorController.js

@@ -11,9 +11,7 @@ var request = require('request');
 var Promise = require('bluebird');
 var numeral = require('numeral');
 
-
-
-var self = module.exports = {
+module.exports = {
 
 
 
@@ -64,14 +62,14 @@ var self = module.exports = {
       if(packages === null) return res.notFound();
       else {
         var json = {name: name };
-        repositories = {
+        var repositories = {
           cran: 0,
           bioconductor: 0,
           github: 0
         };
 
-        Promise.map(packages, function(package) {
-          var latest = package.latest_version.toJSON();
+        Promise.map(packages, function(_package) {
+          var latest = _package.latest_version.toJSON();
           if (latest.maintainer.name === name) {
             latest.is_maintainer = true;
           }
@@ -88,12 +86,12 @@ var self = module.exports = {
           if(!json.email && collaborators.length > 0 && collaborators[0].email) {
             json.email = collaborators[0].email;
           }
-          repositories[package.repository.name] = repositories[package.repository.name]+1 || 1;
+          repositories[_package.repository.name] = repositories[_package.repository.name]+1 || 1;
 
           return Package.getPackagePercentile(latest.package_name).then(function(percentileObject) {
             latest.percentile = isNaN(percentileObject.percentile) ? -1 : percentileObject.percentile;
             latest.totalDownloads = percentileObject.total;
-            latest.repoName = package.repository.name;
+            latest.repoName = _package.repository.name;
             return latest;
           });
 
@@ -121,7 +119,7 @@ var self = module.exports = {
   getNumberOfDirectDownloads: function(req,res){
     var name = req.param('name');
     DownloadStatistic.getNumberOfDirectDownloads(name).then(function(results){
-      row = results[0];
+      var row = results[0];
       row.totalStr = row.total ? numeral(row.total).format('0,0') : '';
       res.json(results[0]);
     });

api/controllers/ExampleController.js

@@ -14,7 +14,7 @@ module.exports = {
   * @apiGroup Example
   * @apiPermission require to be authenticated
   * @apiDescription Create a new review in the specified topic.
-  * 
+  *
   *
   *
   * @apiParam {Int} topicId Id of the topic to post to review
@@ -80,7 +80,7 @@ module.exports = {
   *
   * @apiParam {Integer}     exampleId     The id of the example.
   * @apiParam {String}      text          Contents of the updated example (styling via markdown).
-  * 
+  *
   * @apiSuccess {String}    status        done when the operation was successful, forbidden if the user isn't properly authenticated.
   */
   updateExample: function(req, res) {
@@ -113,7 +113,6 @@ module.exports = {
     var limit = Utils.parseLimit(req),
       offset = Utils.parseSkip(req),
       sort = Utils.parseSort(req) || 'created_at DESC';
-    var user = req.user;
 
     return Example.findAll({
       where: {

api/controllers/PackageController.js

@@ -53,25 +53,25 @@ module.exports = {
         { model: PackageVersion, as: 'versions' },
       ],
       order: [[sequelize.fn('ORDER_VERSION', sequelize.col('version')), 'ASC' ]]
-    }).then(function(package) {
-      if(package === null) {
+    }).then(function(_package) {
+      if(_package === null) {
         return res.rstudio_redirect(301, '/search?q=' + encodeURIComponent(packageName));
         //there seems to be a problem with redirected requests if text/html is set as contentype for the ajax request, so I just
         //adapt this so Rstudio still gets the html
       } else if(req.wantsJSON &&!req.param("viewer_pane")==1) {
-        return res.json(package);
+        return res.json(_package);
       } else {
-        if (package.versions.length === 0)
+        if (_package.versions.length === 0)
           return Package.findOne({
             where: {name: packageName},
             include: [{ model: PackageVersion, attributes: ['package_name', 'version', 'id'], as: 'reverse_dependencies'}]
           }).then(function(packageInstance) {
             if(packageInstance === null) return res.notFound();
-            var package = packageInstance.toJSON();
-            package.pageTitle = packageInstance.name;
-            return res.ok(package, 'package/show.ejs');
+            var _package = packageInstance.toJSON();
+            _package.pageTitle = packageInstance.name;
+            return res.ok(_package, 'package/show.ejs');
           });
-        else return res.rstudio_redirect(301, package.versions[package.versions.length - 1].uri);
+        else return res.rstudio_redirect(301, _package.versions[_package.versions.length - 1].uri);
       }
     }).catch(function(err) {
       return res.negotiate(err);
@@ -130,8 +130,8 @@ module.exports = {
       include: [
         { model: TaskView, as: 'inViews', attributes:['name'] }
       ]
-    }).then(function(package){
-      var views = package.inViews;
+    }).then(function(_package){
+      var views = _package.inViews;
       views.forEach(function(view){
         RedisService.del('rdocs_view_show_' + view.name);
       });

api/controllers/PackageVersionController.js

@@ -45,7 +45,7 @@ module.exports = {
     var result = PackageVersion.createWithDescriptionFile({input: req.body});
     result.then(function(value) {
       res.location('/api/packages/' + value.package_name + '/versions/' + value.version);
-      key = 'view_package_version_' + value.package_name + '_' + value.version;
+      var key = 'view_package_version_' + value.package_name + '_' + value.version;
       RedisService.del(key);
       res.json(value);
     }).catch(Sequelize.UniqueConstraintError, function (err) {
@@ -165,7 +165,7 @@ module.exports = {
   },
 
   _getDownloadStatistics: function (res, packageName) {
-    key = 'rdocs_download_stats_' + packageName;
+    var key = 'rdocs_download_stats_' + packageName;
 
     return RedisService.getJSONFromCache(key, res, RedisService.DAILY, function() {
 
@@ -348,7 +348,7 @@ module.exports = {
   * @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.
   * @apiSuccess {Object[]} links                The links in the graph represented as a list.
   * @apiSuccess {Integer}  links.source         The dependant package (as number in the nodes list).
-  * @apiSuccess {Integer}  links.target         The depending package (as number in the nodes list).   
+  * @apiSuccess {Integer}  links.target         The depending package (as number in the nodes list).
   */
   getDependencyGraph: function(req,res) {
     var rootPackage = req.param('name');
@@ -421,7 +421,7 @@ module.exports = {
   * @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.
   * @apiSuccess {Object[]} links                The links in the graph represented as a list.
   * @apiSuccess {Integer}  links.source         The depending package (as number in the nodes list).
-  * @apiSuccess {Integer}  links.target         The dependant package (as number in the nodes list).   
+  * @apiSuccess {Integer}  links.target         The dependant package (as number in the nodes list).
   */
   getReverseDependencyGraph: function(req,res) {
     var rootPackage = req.param('name');

api/controllers/RstudioController.js

@@ -7,6 +7,9 @@
 var Promise = require('bluebird');
 var _ = require('lodash');
 
+var splitByCommaOrNull = function(param){
+  return (typeof param != "undefined" && param.length>0)? param.split(",") : null;
+}
 
 module.exports = {
 
@@ -22,7 +25,7 @@ module.exports = {
 
   **/
   viewResults : function(req,res){
-    matches = req.param("matches")
+    var matches = req.param("matches")
     if(matches === 0){
       return ElasticSearchService.helpSearchQuery(req.param("topic"),['aliases'],true,2).then(function(json){
         return res.ok(json,'rStudio/topic_not_found.ejs');
@@ -54,8 +57,8 @@ module.exports = {
       */
       case "help":
         //parse parameters
-        var packageNames = _splitByCommaOrNull(req.param("packages"));
-        var topicNames = _splitByCommaOrNull(req.param("topic_names"));
+        var packageNames = splitByCommaOrNull(req.param("packages"));
+        var topicNames = splitByCommaOrNull(req.param("topic_names"));
         var topic = req.param("topic");
         var help_data = RStudioService.help(packageNames,topicNames,topic);
         break;
@@ -65,8 +68,8 @@ module.exports = {
       */
       case "help_search":
         //parse parameters
-        var packageNames = _splitByCommaOrNull(req.param('matching_packages'));
-        var topicNames = _splitByCommaOrNull(req.param('matching_titles'));
+        var packageNames = splitByCommaOrNull(req.param('matching_packages'));
+        var topicNames = splitByCommaOrNull(req.param('matching_titles'));
         var pattern = req.param("query");
         var fields = req.param("fields").split(",");
         var fuzzy = (req.param("type") === "fuzzy")? fuzzy = true : fuzzy = false;
@@ -147,6 +150,3 @@ module.exports = {
   }
 };
 
-_splitByCommaOrNull = function(param){
-  return (typeof param != "undefined" && param.length>0)? param.split(",") : null;
-}

api/controllers/TaskViewController.js

@@ -142,17 +142,17 @@ module.exports = {
         }]
       }).then(function(view) {
         var jsonViews = view.toJSON();
-        var packages = _.map(jsonViews.packages, function(package) {
+        var packages = _.map(jsonViews.packages, function(_package) {
           var rating;
-          if(!package.latest_version || package.latest_version.reviews.length === 0) {
+          if(!_package.latest_version || _package.latest_version.reviews.length === 0) {
             rating = 0;
           } else {
-            rating = _.meanBy(package.latest_version.reviews, function(r) {
+            rating = _.meanBy(_package.latest_version.reviews, function(r) {
               return r.rating;
             });
           }
-          package.rating = rating;
-          return package;
+          _package.rating = rating;
+          return _package;
         });
         jsonViews.packages = packages;
         jsonViews.pageTitle = view.name;

api/controllers/WorkerController.js

@@ -20,7 +20,7 @@ module.exports = {
       var packageVersion = req.body.package.version;
       var result = Topic.createWithRdFile({input: req.body, packageName: packageName, packageVersion: packageVersion});
       result.then(function(value) {
-        key = 'view_topic_' + value.id;
+        var key = 'view_topic_' + value.id;
         RedisService.del(key);
         res.json(value);
       })
@@ -69,9 +69,9 @@ module.exports = {
         console.log("Nothing new");
         return res.send(200, "done");
       }
-
+      res.send(200, "scheduled");
       DownloadStatsService.reverseDependenciesCache = {}; //clean old cache
-      Promise.map(diffs, function (nDay) {
+      return Promise.map(diffs, function (nDay) {
         console.log("Started indexing for today - " + nDay + "days");
         return CronService.splittedAggregatedDownloadstats(nDay)
           .catch({message: "empty"}, function() {
@@ -86,7 +86,6 @@ module.exports = {
       .then(function (result) {
         console.log("Finished indexing splitted stats");
         DownloadStatsService.reverseDependenciesCache = {}; //clean cache
-        res.send(200, "done");
       }).catch(function(err) {
         return res.negotiate(err);
       });

api/models/Alias.js

@@ -4,7 +4,7 @@
  * @description :: TODO: You might write a short summary of how this model works and what it represents here.
  * @docs        :: http://sailsjs.org/documentation/concepts/models-and-orm/models
  */
-_ = require('lodash');
+var _ = require('lodash');
 var Promise = require('bluebird');
 
 module.exports = {
@@ -89,7 +89,7 @@ module.exports = {
           group:['topic.name','topic.package_version.id','topic.id','Alias.id','topic.package_version.package_latest.name'],
           order:[sequelize.fn('SUM', sequelize.col('topic.package_version.package_latest.last_month_stats.direct_downloads'))]
         }).then(function(data){
-            allResults = _.map(data,function(record){
+            var allResults = _.map(data,function(record){
             return {
               id:record.topic.id,
               package_name:record.topic.package_version.package_name,
@@ -98,7 +98,7 @@ module.exports = {
               function_description:record.topic.description
               };
           })
-          return allResults; 
+          return allResults;
         }).catch(function(err){
           console.log(err.message);
         });
@@ -140,7 +140,7 @@ module.exports = {
           group:['topic.name','topic.package_version.id','topic.id','Alias.id','topic.package_version.package_latest.name'],
           order:[sequelize.fn('SUM', sequelize.col('topic.package_version.package_latest.last_month_stats.direct_downloads'))]
         }).then(function(data){
-            allResults = _.map(data,function(record){
+            var allResults = _.map(data,function(record){
             return {
               id:record.topic.id,
               package_name:record.topic.package_version.package_name,
@@ -149,7 +149,7 @@ module.exports = {
               function_description:record.topic.description
               };
           })
-          return allResults; 
+          return allResults;
         }).catch(function(err){
           console.log(err.message);
         });
@@ -191,11 +191,11 @@ module.exports = {
           group:['name','package_version.id','id','package_version.package_latest.name'],
           order:[sequelize.fn('SUM', sequelize.col('package_version.package_latest.last_month_stats.direct_downloads'))]
         }).then(function(data){
-          allResults= _.map(data,function(record){
+          var allResults= _.map(data,function(record){
             return Alias.findAll({
               where: {topic_id:record.id}
             }).then(function(aliases){
-              alias = (aliases != null && aliases.length > 0)? aliases[0].name : "";
+              var alias = (aliases != null && aliases.length > 0)? aliases[0].name : "";
               return {
                 id:record.id,
                 package_name:record.package_version.package_name,