Merge pull request #30 from vehicle-history/updated-and-jshinted

Updated dependencies and jshinted

.jshintrc

@@ -1,4 +1,6 @@
 {
+  "esnext":     true,
+  "bitwise":    false,
   "asi":        false,
   "browser":    false,
   "camelcase":  true,
@@ -29,5 +31,7 @@
   "supernew":   true,
   "trailing":   true,
   "undef":      true,
-  "unused":     true
+  "unused":     true,
+  "maxlen":     100,
+  "latedef":    true
 }

.tachikoma.yml

@@ -0,0 +1 @@
+strategy: 'david'

lib/builder/event/changeOwnerEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var ChangeOwnerEventBuilder = require('../../model/response/event/changeOwnerEvent').ChangeOwnerEventBuilder;
 

lib/builder/event/changedRegistrationLocationEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var ChangedRegistrationLocationEventBuilder = require('../../model/response/event/changedRegistrationLocationEvent').ChangedRegistrationLocationEventBuilder;
 

lib/builder/event/coOwnerEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var ChangeOwnerEventBuilder = require('../../model/response/event/changeOwnerEvent').ChangeOwnerEventBuilder;
 

lib/builder/event/deregistrationEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var DeregistrationEventBuilder = require('../../model/response/event/deregistrationEvent').DeregistrationEventBuilder;
 

lib/builder/event/holderEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var ChangeOwnerEventBuilder = require('../../model/response/event/changeOwnerEvent').ChangeOwnerEventBuilder;
 

lib/builder/event/inspectionEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var InspectionEventBuilder = require('../../model/response/event/inspectionEvent').InspectionEventBuilder;
 

lib/builder/event/productionEventBuilder.js

@@ -1,4 +1,3 @@
-var assert = require('assert-plus');
 var date = require('../../date');
 var logger = require('../../logger/logger').logger;
 var ProductionEventBuilder = require('../../model/response/event/productionEvent').ProductionEventBuilder;

lib/builder/event/registrationEventBuilder.js

@@ -1,5 +1,5 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var RegistrationEventBuilder = require('../../model/response/event/registrationEvent').RegistrationEventBuilder;
 var EventEnum = require('../../enum/eventEnum').EventEnum;

lib/builder/event/stolenEventBuilder.js

@@ -1,8 +1,7 @@
 var assert = require('assert-plus');
-var date = require('../../date');
+require('../../date');
 var logger = require('../../logger/logger').logger;
 var StolenEventBuilder = require('../../model/response/event/stolenEvent').StolenEventBuilder;
-var EventEnum = require('../../enum/eventEnum').EventEnum;
 
 var exports = {};
 

lib/builder/vehicle/inspectionBuilder.js

@@ -1,7 +1,6 @@
 var assert = require('assert-plus');
 var logger = require('../../logger/logger').logger;
 var Inspection = require('../../model/response/vehicle/inspection').Inspection;
-var InspectionEnum = require('../../enum/inspectionEnum').InspectionEnum;
 var mapHelper = require('./../../mapHelper');
 var carInspectionResolver = require('./../../resolver/vehicle/carInspectionResolver');
 

lib/builder/vehicle/nameBuilder.js

@@ -13,7 +13,7 @@ exports.build = function (map) {
   var name = mapHelper.getMapValue(map, carNameResolver.NAME_MAP_FIELD);
   var model = mapHelper.getMapValue(map, carNameResolver.MODEL_MAP_FIELD);
 
-  if ((!make || make === 'UNKNOWN')) {
+  if (!make || make === 'UNKNOWN') {
     make = null;
   }
 

lib/enum/variantEnum.js

@@ -39,7 +39,11 @@ module.exports.VariantEnum.Type = {
 
     if (value === null) {
       value = 'UNKNOWN';
-      logger.warn('VariantEnum.Type: Unable to get type from "%s" - set "%s" as default', type, value);
+      logger.warn(
+        'VariantEnum.Type: Unable to get type from "%s" - set "%s" as default',
+        type,
+        value
+      );
     }
 
     return module.exports.VariantEnum.Type[value];
@@ -95,7 +99,11 @@ module.exports.VariantEnum.Kind = {
 
     if (value === null) {
       value = 'UNKNOWN';
-      logger.warn('VariantEnum.Kind: Unable to get kind from "%s" - set "%s" as default', kind, value);
+      logger.warn(
+        'VariantEnum.Kind: Unable to get kind from "%s" - set "%s" as default',
+        kind,
+        value
+      );
     }
 
     return module.exports.VariantEnum.Kind[value];

lib/logger/logger.js

@@ -11,7 +11,7 @@ if (config.loggly && !logger.transports.Loggly) {
 logger.level = logLevel;
 
 if (process.env.LOG_STREAM) {
-  logger.add(winston.transports.File, {
+  logger.add(logger.transports.File, {
       filename: process.env.LOG_STREAM,
       level: logLevel
     }
@@ -22,4 +22,20 @@ module.exports.changeLogLevel = function (logLevel) {
   logger.level = logLevel;
 };
 
+logger.args = function args(msg, args) {
+  var argsObj = {};
+  var argList = /\(([^)]*)/.exec(args.callee)[1].split(',');
+  for (var i in argList) {
+    if (typeof args[i] === 'function') {
+      argsObj[argList[i]] = 'function';
+    }
+    else {
+      argsObj[argList[i]] = args[i];
+    }
+  }
+
+  logger.info(msg, argsObj);
+};
+
+
 module.exports.logger = logger;

lib/meta.js

@@ -3,11 +3,11 @@
  Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
 var path = require('path'),
-    fs = require('fs'),
-    pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '', '..', 'package.json'), 'utf8'));
+  fs = require('fs'),
+  pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, '', '..', 'package.json'), 'utf8'));
 
 module.exports = {
-    NAME: pkg.name,
-    VERSION: pkg.version
+  NAME: pkg.name,
+  VERSION: pkg.version
 };
 

lib/model/response/car.js

@@ -1,4 +1,14 @@
-var Car = function Car(name, type, engine, production, policy, registration, inspection, mileage, stolen, plate, vin) {
+var Car = function Car(name,
+                       type,
+                       engine,
+                       production,
+                       policy,
+                       registration,
+                       inspection,
+                       mileage,
+                       stolen,
+                       plate,
+                       vin) {
   this.name = name;
   this.type = type;
   this.engine = engine;

lib/model/response/event/changeOwnerEvent.js

@@ -1,7 +1,12 @@
 var AbstractEvent = require('./abstractEvent').AbstractEvent;
 var AbstractEventBuilder = require('./abstractEvent').AbstractEventBuilder;
 
-var ChangeOwnerEvent = function ChangeOwnerEvent(type, createdAt, description, firstOwner, ownerType, location) {
+var ChangeOwnerEvent = function ChangeOwnerEvent(type,
+                                                 createdAt,
+                                                 description,
+                                                 firstOwner,
+                                                 ownerType,
+                                                 location) {
   AbstractEvent.call(this, type, createdAt, description);
 
   this.firstOwner = firstOwner;

lib/model/response/event/changedRegistrationLocationEvent.js

@@ -1,7 +1,10 @@
 var AbstractEvent = require('./abstractEvent').AbstractEvent;
 var AbstractEventBuilder = require('./abstractEvent').AbstractEventBuilder;
 
-var ChangedRegistrationLocationEvent = function ChangedRegistrationLocationEvent(type, createdAt, description, location) {
+var ChangedRegistrationLocationEvent = function ChangedRegistrationLocationEvent(type,
+                                                                                 createdAt,
+                                                                                 description,
+                                                                                 location) {
   AbstractEvent.call(this, type, createdAt, description);
 
   this.location = location;

lib/model/response/event/registrationEvent.js

@@ -1,10 +1,10 @@
 var AbstractEvent = require('./abstractEvent').AbstractEvent;
 var AbstractEventBuilder = require('./abstractEvent').AbstractEventBuilder;
 
-var RegistrationEvent = function RegistrationEvent(type, createdAt, description, abroadRegistration) {
+var RegistrationEvent = function RegistrationEvent(type, createdAt, description, abroad) {
   AbstractEvent.call(this, type, createdAt, description);
 
-  this.abroadRegistration = abroadRegistration;
+  this.abroadRegistration = abroad;
 };
 
 var RegistrationEventBuilder = function RegistrationEventBuilder() {

lib/resolver/event/eventAbroadRegistrationResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var eventTypeResolver = require('./eventTypeResolver');
 
 var exports = {};

lib/resolver/event/eventCreatedAtResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var date = require('../../date');
 
 var exports = {};

lib/resolver/event/eventDescriptionResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 
 var exports = {};
 

lib/resolver/event/eventExpireAtResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var date = require('../../date');
 
 var exports = {};

lib/resolver/event/eventFirstOwnerResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 
 var exports = {};
 

lib/resolver/event/eventLocationResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var Location = require('../../model/response/vehicle/location').Location;
 var CountryEnum = require('../../enum/countryEnum').CountryEnum;
 
@@ -16,7 +15,7 @@ exports.resolve = function (event, options) {
 
   var countries = options.get('resolver.variant.countries');
   var country = CountryEnum.getCountry(event.country, countries);
-  return new Location(event.location, country)
+  return new Location(event.location, country);
 };
 
 

lib/resolver/event/eventMileageResolver.js

@@ -1,6 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
-var MileageEnum = require('../../enum/mileageEnum').MileageEnum;
 var carMileageBuilder = require('../../builder/vehicle/mileageBuilder');
 var carMileageResolver = require('../../resolver/vehicle/carMileageResolver');
 

lib/resolver/event/eventNoteResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 
 var exports = {};
 

lib/resolver/event/eventOwnerTypeResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var OwnerEnum = require('../../enum/ownerEnum').OwnerEnum;
 var exports = {};
 

lib/resolver/event/eventTypeResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var EventEnum = require('../../enum/eventEnum').EventEnum;
 
 var exports = {};

lib/resolver/eventsResolver.js

@@ -32,7 +32,7 @@ exports.resolver = function (map, options, callback) {
       if (map.events.hasOwnProperty(i)) {
         var event = map.events[i];
 
-        event['country'] = country;
+        event.country = country;
 
         var newEvent = {};
 

lib/resolver/resolver.js

@@ -5,14 +5,6 @@ var eventsResolver = require('./eventsResolver');
 
 var exports = {};
 
-var getPropertyIfExists = function (results, property) {
-  if (results.hasOwnProperty(property)) {
-    return results[property];
-  }
-
-  return null;
-};
-
 exports.resolver = function (map, searchCarRequest, options, callback) {
   logger.debug('resolver');
 

lib/resolver/vehicle/carEngineResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var EngineEnum = require('../../enum/engineEnum').EngineEnum;
 var mapHelper = require('./../../mapHelper');
 

lib/resolver/vehicle/carInspectionResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var InspectionEnum = require('../../enum/inspectionEnum').InspectionEnum;
 var mapHelper = require('./../../mapHelper');
 

lib/resolver/vehicle/carMileageResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var MileageEnum = require('../../enum/mileageEnum').MileageEnum;
 var mapHelper = require('./../../mapHelper');
 

lib/resolver/vehicle/carNameResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var MakeEnum = require('../../enum/makeEnum').MakeEnum;
 var mapHelper = require('./../../mapHelper');
 

lib/resolver/vehicle/carPlateResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var mapHelper = require('./../../mapHelper');
 var CountryEnum = require('../../enum/countryEnum').CountryEnum;
 

lib/resolver/vehicle/carPolicyResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var PolicyEnum = require('../../enum/policyEnum').PolicyEnum;
 var mapHelper = require('./../../mapHelper');
 
@@ -13,8 +12,8 @@ exports.resolve = function (map, options) {
 
   var policy = mapHelper.getMapValue(map, POLICY_STATUS_MAP_FIELD);
 
-  var policyStatus = options.get('resolver.variant.policyStatus');
-  var policyStatus = PolicyEnum.Status.getStatus(policy, policyStatus);
+  var policyStatuses = options.get('resolver.variant.policyStatus');
+  var policyStatus = PolicyEnum.Status.getStatus(policy, policyStatuses);
 
   mapHelper.updateMapValue(map, POLICY_STATUS_MAP_FIELD, policyStatus);
 };

lib/resolver/vehicle/carProductionResolver.js

@@ -1,6 +1,5 @@
 var assert = require('assert-plus');
 require('../../date');
-var logger = require('../../logger/logger').logger;
 var mapHelper = require('./../../mapHelper');
 
 var PRODUCTION_YEAR_MAP_FIELD = 'production.year';

lib/resolver/vehicle/carRegistrationResolver.js

@@ -1,6 +1,5 @@
 var assert = require('assert-plus');
 var date = require('../../date');
-var logger = require('../../logger/logger').logger;
 var RegistrationEnum = require('../../enum/registrationEnum').RegistrationEnum;
 var mapHelper = require('./../../mapHelper');
 
@@ -20,8 +19,8 @@ exports.resolve = function (map, options) {
     firstAt = null;
   }
 
-  var registrationStatus = options.get('resolver.variant.registrationStatus');
-  var registrationStatus = RegistrationEnum.Status.getStatus(status, registrationStatus);
+  var registrationStatuses = options.get('resolver.variant.registrationStatus');
+  var registrationStatus = RegistrationEnum.Status.getStatus(status, registrationStatuses);
 
   mapHelper.updateMapValue(map, REGISTRATION_STATUS_MAP_FIELD, registrationStatus);
   mapHelper.updateMapValue(map, REGISTRATION_FIRST_DATE_MAP_FIELD, date.parseIsoString(firstAt));

lib/resolver/vehicle/carVariantResolver.js

@@ -1,5 +1,4 @@
 var assert = require('assert-plus');
-var logger = require('../../logger/logger').logger;
 var VariantEnum = require('../../enum/variantEnum').VariantEnum;
 var mapHelper = require('./../../mapHelper');