Merge pull request #12 from jrs40492/Add-tests-for-v2.0-and-v2.1

Add tests for v2.0 and v2.1

Author: bradbarkhouse

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-.vscode
+.vscode
+results

.npmignore

@@ -0,0 +1 @@
+test

lib/API_v1_0.js

@@ -6,45 +6,49 @@ var util = require('util');
 var libVersion = require('../package.json').version;
 
 // Private Functions
-function __getBaseUrl(league, feed, format, params) {
-  return this.baseUrl + '/' + league + '/' + feed + '.' + format;
-}
-
 function __verifyFeedName(feed) {
-  var isValid = false;
-
-  this.validFeeds.forEach(function (value) {
-    if (value == feed) {
-      isValid = true;
-    }
-  });
+  if (!feed) {
+    return false;
+  }
 
-  return isValid;
+  return this.validFeeds.includes(feed);
 }
 
 function __verifyFormat(format) {
-  var isValid = true;
-
   // Only JSON format supported
-  if (format != 'json') {
-    isValid = false;
+  if (!format || format !== 'json') {
+    return false;
   }
 
-  return isValid;
+  return true;
 }
 
 function __makeOutputFilename(league, season, feed, format, params) {
-  var filename = feed + '-' + league + '-' + season;
+  var filename = `${feed}-${league}-${season}`;
+
+  const keys = Object.keys(params);
+
+  if (keys.includes("gameid")) {
+    filename += `-${params["gameid"]}`;
+  }
 
-  if (Object.keys(params).includes("gameid")) {
-    filename += "-" + params["gameid"];
+  if (keys.includes("fordate")) {
+    filename += `-${params["fordate"]}`;
   }
 
-  if (Object.keys(params).includes("fordate")) {
-    filename += "-" + params["fordate"];
+  if (keys.includes("game")) {
+    filename += `-${params["game"]}`;
   }
 
-  filename += "." + format;
+  if (keys.includes("date")) {
+    filename += `-${params["date"]}`;
+  }
+
+  if (keys.includes("week")) {
+    filename += `-${params["week"]}`;
+  }
+
+  filename += `.${format}`;
 
   return filename;
 }
@@ -75,7 +79,7 @@ function __saveFeed(response, league, season, feed, format, params) {
     }
 
     if (this.verbose) {
-      console.log("File saved as '" + this.storeLocation + filename + "'.");
+      console.log(`File saved as '${this.storeLocation}${filename}'.`);
     }
   }
 }
@@ -114,21 +118,21 @@ var API_v1_0 = function (v, storeT, storeL) {
     'daily_game_schedule',
     'daily_player_stats',
     'game_boxscore',
-    'scoreboard',
     'game_playbyplay',
-    'player_gamelogs',
-    'team_gamelogs',
+    'scoreboard',
     'roster_players',
     'game_startinglineup',
+    'player_gamelogs',
+    'team_gamelogs',
     'active_players',
     'overall_team_standings',
     'conference_team_standings',
     'division_team_standings',
     'playoff_team_standings',
     'player_injuries',
+    'latest_updates',
     'daily_dfs',
     'current_season',
-    'latest_updates'
   ];
 };
 
@@ -150,9 +154,9 @@ API_v1_0.prototype.setAuthCredentials = function (apikey, password) {
 
 API_v1_0.prototype.__determineUrl = function (league, season, feed, format, params) {
   if (feed == "current_season") {
-    return this.baseUrl + '/' + league + '/' + feed + '.' + format;
+    return `${this.baseUrl}/${league}/${feed}.${format}`;
   } else {
-    return this.baseUrl + '/' + league + '/' + season + '/' + feed + '.' + format;
+    return `${this.baseUrl}/${league}/${season}/${feed}.${format}`;
   }
 };
 
@@ -167,17 +171,17 @@ API_v1_0.prototype.getData = function (league, season, feed, format, params = {}
   }
 
   if (!__verifyFeedName.call(this, feed)) {
-    throw new Error("Unknown feed '" + feed + "'.  Known values are: [" + this.validFeeds + "]");
+    throw new Error(`Unknown feed '${feed}'.  Known values are: [${this.validFeeds}]`);
   }
 
   if (!__verifyFormat.call(this, format)) {
-    throw new Error("Unsupported format '" + format + "'.");
+    throw new Error(`Unsupported format '${format}'.`);
   }
 
   var url = this.__determineUrl(league, season, feed, format, params);
 
   if (this.verbose) {
-    console.log("Making API request to '" + url + "'.");
+    console.log(`Making API request to '${url}'.`);
     console.log("  with headers:");
     console.log(this.options.headers);
     console.log(" and params:");
@@ -208,7 +212,7 @@ API_v1_0.prototype.getData = function (league, season, feed, format, params = {}
   }.bind(this))
     .catch(function (err) {
       if (this.verbose) {
-        console.log("err = '" + util.inspect(err, { depth: null }) + "'");
+        console.log(`err = '${util.inspect(err, { depth: null })}'`);
       }
 
       if (err.statusCode == 304) { // Content hasn't changed, read from local file
@@ -238,7 +242,7 @@ API_v1_0.prototype.getData = function (league, season, feed, format, params = {}
 
         deferred.resolve(data);
       } else {
-        throw new Error("API call failed with error: " + err.statusCode);
+        throw new Error(`API call failed with error: ${err.statusCode}`);
       }
     }.bind(this));