finished refactoring variable names

packages/fxa-geodb/examples/fxa-geodb-example.js

@@ -1,12 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+var path = require('path');
 
 (function() {
   'use strict';
   var geoDb = require('../src/fxa-geodb')({
-    db: __dirname + '/../db/cities-db.mmdb',
-    db_backup: __dirname + '/../db/cities-db.mmdb-backup'
+    dbPath: path.join(__dirname, '..', 'db', 'cities-db.mmdb'),
+    backupDbPath: path.join(__dirname, '..', 'db', 'cities-db.mmdb-backup')
   });
   // New York timezone IP: 128.192.8.8
   // Beijing: 123.121.221.194

packages/fxa-geodb/scripts/max-loader.js

@@ -19,14 +19,14 @@ mozlog.config({
 });
 var log = mozlog();
 
-var target = path.join(process.cwd(), '../db');
+var target = path.join(process.cwd(), '..', 'db');
 // create db folder
 mkdirp.sync(target);
 
 log.info('Downloading to %s', target);
 
 // import the list of files to download
-var sources = require('../sources.json');
+var sources = require(path.join(__dirname, '..', 'sources.json'));
 var remainingDownloads = [];
 
 // push each file-load-function onto the remainingDownloads queue

packages/fxa-geodb/src/fxa-geodb.js

@@ -3,8 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // these are defaults, can be overloaded by configuring options
-var db = __dirname + '/../db/cities-db.mmdb';
-var db_backup = __dirname + '/../db/cities-db.mmdb-backup';
+var path = require('path');
+
+var DEFAULT_DB_PATH = path.join(__dirname, '..', 'db', 'cities-db.mmdb');
+var DEFAULT_BACKUP_DB_PATH = path.join(__dirname, '..', 'db', 'cities-db.mmdb-backup');
 var ERRORS = require('../lib/errors');
 var maxmind = require('maxmind');
 var Promise = require('bluebird');
@@ -12,8 +14,8 @@ var Promise = require('bluebird');
 module.exports = function (options) {
   'use strict';
   options = options || {};
-  db = options.db || db;
-  db_backup = options.db_backup || db_backup;
+  var dbPath = options.dbPath || DEFAULT_DB_PATH;
+  var backupDbPath = options.backupDbPath || DEFAULT_BACKUP_DB_PATH;
 
   return function (ip) {
     return new Promise(function (resolve, reject) {
@@ -22,9 +24,10 @@ module.exports = function (options) {
         reject({
           message: ERRORS.IS_INVALID
         });
+        return;
       }
 
-      var city_lookup, city_data;
+      var dbLookup, locationData;
       // ip is valid, try looking it up
       // the nested try..catch is to ensure that
       // we always have at least one valid database check
@@ -32,52 +35,53 @@ module.exports = function (options) {
       // `db_backup` as free version or when `db` fails
       // to load for some reason
       try {
-        city_lookup = maxmind.open(db);
-        city_data = city_lookup.get(ip);
+        dbLookup = maxmind.open(dbPath);
+        locationData = dbLookup.get(ip);
       } catch (err) {
         // if it failed with primary database,
         // try with backup database
         try {
-          city_lookup = maxmind.open(db_backup);
-          city_data = city_lookup.get(ip);
+          dbLookup = maxmind.open(backupDbPath);
+          locationData = dbLookup.get(ip);
         } catch (err) {
           // if that fails, then return a reject
           reject({
             message: ERRORS.UNABLE_TO_FETCH_DATA
           });
+          return;
         }
       }
 
-      if (city_data == null) {
+      if (locationData == null) {
         reject({
           message: ERRORS.UNABLE_TO_FETCH_DATA
         });
+        return;
       }
 
       // return an object with city, country, continent,
       // latitude, and longitude, and timezone
       var location = new function () {
-        if (city_data.location) {
-          this.accuracy = city_data.location.accuracy_radius;
-          this.ll = {
-            latitude: city_data.location.latitude,
-            longitude: city_data.location.longitude
+        if (locationData.location) {
+          this.accuracy = locationData.location.accuracy_radius;
+          this.latLong = {
+            latitude: locationData.location.latitude,
+            longitude: locationData.location.longitude
           };
-          this.time_zone = city_data.location.time_zone;
+          this.timeZone = locationData.location.time_zone;
         }
 
-        if (city_data.city) {
-          this.city = city_data.city.names.en;
+        if (locationData.city) {
+          this.city = locationData.city.names.en;
         }
 
-        if (city_data.continent) {
-          this.continent = city_data.continent.names.en;
+        if (locationData.continent) {
+          this.continent = locationData.continent.names.en;
         }
 
-        if (city_data.country) {
-          this.country = city_data.country.names.en;
+        if (locationData.country) {
+          this.country = locationData.country.names.en;
         }
-        this.city_data = city_data;
       };
       resolve(location);
     });

packages/fxa-geodb/test/fxa-geodb.js

@@ -51,7 +51,7 @@ describe('fxa-geodb', function () {
   it('returns an object with location data when supplied with a valid ip address', function () {
     // 8.8.8.8 is Google's nameservers, will probably always stay constant
     ip = '8.8.8.8';
-    const ll = {
+    var latLong = {
       latitude: 37.386,
       longitude: -122.0838
     };
@@ -60,8 +60,8 @@ describe('fxa-geodb', function () {
         assert.equal(location.country, 'United States', 'Country not returned correctly');
         assert.equal(location.city, 'Mountain View', 'City not returned correctly');
         assert.equal(location.continent, 'North America', 'Continent not returned correctly');
-        assert.deepEqual(location.ll, ll, 'LatLong not returned correctly');
-        assert.equal(location.time_zone, 'America/Los_Angeles', 'Timezone not returned correctly');
+        assert.deepEqual(location.latLong, latLong, 'LatLong not returned correctly');
+        assert.equal(location.timeZone, 'America/Los_Angeles', 'Timezone not returned correctly');
       }, function (err) {
         assert.equal(err.message, ERRORS.UNABLE_TO_FETCH_DATA, 'Incorrect error message');
       });
@@ -85,7 +85,7 @@ describe('fxa-geodb', function () {
         assert.equal(location.country, 'United States', 'Country not returned correctly');
         assert.equal(typeof location.city, 'undefined', 'City not undefined');
         assert.equal(location.continent, 'North America', 'Continent not returned correctly');
-        assert.equal(typeof location.time_zone, 'undefined', 'Timezone not undefined');
+        assert.equal(typeof location.timeZone, 'undefined', 'Timezone not undefined');
       }, function (err) {
         assert.equal(err.message, ERRORS.UNABLE_TO_FETCH_DATA, 'Incorrect error message');
       });