Fix JS Hint

ro-ka · Sep 2, 2014 · 7b5f13a · 7b5f13a
1 parent e4edc0b
commit 7b5f13a
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 94 deletions.
diff --git a/lib/api500px.js b/lib/api500px.js
@@ -2,13 +2,13 @@
  * Define the API
  */
 
-var Photos = require("./photos").Photos;
-var Users = require("./users").Users;
-var Blogs = require("./blogs").Blogs;
+var Photos = require("./photos").Photos,
+  Users = require("./users").Users,
+  Blogs = require("./blogs").Blogs,
 
-var API500px = function API500px(consumer_key) {
-  this._configure(consumer_key);
-};
+  API500px = function API500px(consumer_key) {
+    this._configure(consumer_key);
+  };
 
 API500px.prototype._configure = function(consumer_key) {
   this.photos = new Photos(consumer_key);

diff --git a/lib/blogs.js b/lib/blogs.js
@@ -2,34 +2,37 @@
  * Getting blogs
  */
 
-var Request = require("./request").Request;
-
-var Blogs = function Blogs (consumer_key) {
-  this._request = new Request(consumer_key);
-};
+var Request = require("./request").Request,
+  Blogs = function Blogs (consumer_key) {
+    this._request = new Request(consumer_key);
+  };
 
 Blogs.prototype.getById = function(id, parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  this._request.executeRequest('blogs/'+id, parameters, callback);
+  this._request.executeRequest('blogs/' + id, parameters, callback);
 };
 
 Blogs.prototype.getCommentsById = function(id, parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  this._request.executeRequest('blogs/'+id+'/comments', parameters, callback);
+  this._request.executeRequest(
+    'blogs/' + id + '/comments',
+    parameters,
+    callback
+  );
 };
 
 Blogs.prototype.getFresh = function(parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  parameters.feature  = 'fresh';
+  parameters.feature = 'fresh';
 
   this._request.executeRequest('blogs', parameters, callback);
 };
@@ -39,7 +42,7 @@ Blogs.prototype.getByUsername = function(username, parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'user';
+  parameters.feature = 'user';
   parameters.username = username;
 
   this._request.executeRequest('blogs', parameters, callback);
@@ -50,8 +53,8 @@ Blogs.prototype.getByUserId = function(user_id, parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'user';
-  parameters.user_id  = user_id;
+  parameters.feature = 'user';
+  parameters.user_id = user_id;
 
   this._request.executeRequest('blogs', parameters, callback);
 };

diff --git a/lib/photos.js b/lib/photos.js
@@ -2,26 +2,25 @@
  * Getting photos
  */
 
-var Request = require("./request").Request;
-
-var Photos = function Photos (consumer_key) {
-  this._request = new Request(consumer_key);
-};
+var Request = require("./request").Request,
+  Photos = function Photos (consumer_key) {
+    this._request = new Request(consumer_key);
+  };
 
 Photos.prototype.getById = function(photo_id, parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  this._request.executeRequest('photos/'+photo_id, parameters, callback);
+  this._request.executeRequest('photos/' + photo_id, parameters, callback);
 };
 
 Photos.prototype.getByUsername = function(username, parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  parameters.feature  = 'user';
+  parameters.feature = 'user';
   parameters.username = username;
 
   this._request.executeRequest('photos', parameters, callback);
@@ -32,52 +31,55 @@ Photos.prototype.getByUserId = function(user_id, parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'user';
-  parameters.user_id  = user_id;
+  parameters.feature = 'user';
+  parameters.user_id = user_id;
 
   this._request.executeRequest('photos', parameters, callback);
 };
 
-Photos.prototype.getFavoritesByUsername = function(username, parameters, callback) {
-  if (!parameters) {
-    parameters = {};
-  }
+Photos.prototype.getFavoritesByUsername =
+  function(username, parameters, callback) {
+    if (!parameters) {
+      parameters = {};
+    }
 
-  parameters.feature  = 'user_favorites';
-  parameters.username = username;
+    parameters.feature = 'user_favorites';
+    parameters.username = username;
 
-  this._request.executeRequest('photos', parameters, callback);
-};
+    this._request.executeRequest('photos', parameters, callback);
+  };
 
-Photos.prototype.getFavoritesByUserId = function(user_id, parameters, callback) {
-  if (!parameters) {
-    parameters = {};
-  }
+Photos.prototype.getFavoritesByUserId =
+  function(user_id, parameters, callback) {
+    if (!parameters) {
+      parameters = {};
+    }
 
-  parameters.feature  = 'user_favorites';
-  parameters.user_id  = user_id;
+    parameters.feature = 'user_favorites';
+    parameters.user_id = user_id;
 
-  this._request.executeRequest('photos', parameters, callback);
-};
+    this._request.executeRequest('photos', parameters, callback);
+  };
 
-Photos.prototype.getFriendsByUsername = function(username, parameters, callback) {
-  if (!parameters) {
-    parameters = {};
-  }
+Photos.prototype.getFriendsByUsername =
+  function(username, parameters, callback) {
+    if (!parameters) {
+      parameters = {};
+    }
 
-  parameters.feature  = 'user_friends';
-  parameters.username = username;
+    parameters.feature = 'user_friends';
+    parameters.username = username;
 
-  this._request.executeRequest('photos', parameters, callback);
-};
+    this._request.executeRequest('photos', parameters, callback);
+  };
 
 Photos.prototype.getFriendsByUserId = function(user_id, parameters, callback) {
   if (!parameters) {
     parameters = {};
   }
 
-  parameters.feature  = 'user_friends';
-  parameters.user_id  = user_id;
+  parameters.feature = 'user_friends';
+  parameters.user_id = user_id;
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -87,7 +89,7 @@ Photos.prototype.getPopular = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'popular';
+  parameters.feature = 'popular';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -97,7 +99,7 @@ Photos.prototype.getUpcoming = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'upcoming';
+  parameters.feature = 'upcoming';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -107,7 +109,7 @@ Photos.prototype.getEditorsChoice = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'editors';
+  parameters.feature = 'editors';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -117,7 +119,7 @@ Photos.prototype.getFreshToday = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'fresh_today';
+  parameters.feature = 'fresh_today';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -127,7 +129,7 @@ Photos.prototype.getFreshYesterday = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'fresh_yesterday';
+  parameters.feature = 'fresh_yesterday';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -137,7 +139,7 @@ Photos.prototype.getFreshWeek = function(parameters, callback) {
     parameters = {};
   }
 
-  parameters.feature  = 'fresh_week';
+  parameters.feature = 'fresh_week';
 
   this._request.executeRequest('photos', parameters, callback);
 };
@@ -147,7 +149,7 @@ Photos.prototype.searchByTag = function(tag, parameters, callback) {
     parameters = {};
   }
 
-  parameters.tag    = tag;
+  parameters.tag = tag;
 
   this._request.executeRequest('photos/search', parameters, callback);
 };
@@ -157,7 +159,7 @@ Photos.prototype.searchByTerm = function(term, parameters, callback) {
     parameters = {};
   }
 
-  parameters.term   = term;
+  parameters.term = term;
 
   this._request.executeRequest('photos/search', parameters, callback);
 };

diff --git a/lib/request.js b/lib/request.js
@@ -2,11 +2,10 @@
  * Request data from the API
  */
 
-var https = require("https");
-
-var Request = function Request(consumer_key) {
-  this._configure(consumer_key);
-};
+var https = require('https'),
+  Request = function Request(consumer_key) {
+    this._configure(consumer_key);
+  };
 
 Request.prototype._configure = function(consumer_key) {
   this.consumer_key = consumer_key;
@@ -15,35 +14,38 @@ Request.prototype._configure = function(consumer_key) {
 };
 
 Request.prototype.executeRequest = function(method, parameters, callback) {
-  var parameterString = '';
+  var parameterString = '',
+    operator = '?';
 
   if (parameters === undefined) {
     parameters = {};
   }
 
   parameters.consumer_key = this.consumer_key;
 
-  var operator = '?';
   for (var key in parameters) {
     parameterString += (operator + key + '=' + parameters[key]);
     if ( operator === '?' ) {
-      operator  = '&';
+      operator = '&';
     }
   }
 
-  https.get({'host': this.host, 'path': this.baseUrl+method+parameterString }, function(res) {
-    if (res.statusCode && res.statusCode === 200) {
-      var chunks  = '';
-      res.on('data', function(resultData) {
-        chunks  += resultData;
-      });
-      res.on('end', function() {
-        callback(null, JSON.parse(chunks));
-      });
-    } else {
-      callback({code: res.StatusCode});
+  https.get(
+    {'host': this.host, 'path': this.baseUrl + method + parameterString },
+    function(res) {
+      if (res.statusCode && res.statusCode === 200) {
+        var chunks = '';
+        res.on('data', function(resultData) {
+          chunks += resultData;
+        });
+        res.on('end', function() {
+          callback(null, JSON.parse(chunks));
+        });
+      } else {
+        callback({code: res.StatusCode});
+      }
     }
-  }).on('error', function(error) {
+  ).on('error', function(error) {
     callback(error);
   });
 };