add make with model and color generators. additional vin numbers

5 files changed, 48 insertions, 11 deletions

diff --git a/lib/index.js b/lib/index.js
index 1d557ef9..68357ccc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -115,7 +115,7 @@ function Faker (opts) {
     "database": ["collation", "column", "engine", "type"],
     "system": ["mimeTypes"],
     "date": ["month", "weekday"],
-    "vehicle": ["manufacturer", "model", "type", "fuel", "vin"],
+    "vehicle": ["manufacturer", "model", "type", "fuel", "vin", "color"],
     "title": "",
     "separator": ""
   };
diff --git a/lib/locales/en/index.js b/lib/locales/en/index.js
index 04ce4e49..3b799478 100644
--- a/lib/locales/en/index.js
+++ b/lib/locales/en/index.js
@@ -18,3 +18,4 @@ en.app = require("./app");
 en.finance = require("./finance");
 en.date = require("./date");
 en.system = require("./system");
+en.vehicle = require("./vehicle")
diff --git a/lib/locales/en/vehicle/index.js b/lib/locales/en/vehicle/index.js
index 23286869..770d450e 100644
--- a/lib/locales/en/vehicle/index.js
+++ b/lib/locales/en/vehicle/index.js
@@ -1,7 +1,7 @@
 var vehicle = {};
 module["exports"] = vehicle;
-vehicle.manufacturer = require("./manufacturer")
-vehicle.model = require("./model")
-vehicle.type = require("./vehicle_type")
-vehicle.fuelType = require("./fuel")
+vehicle.manufacturer = require("./manufacturer");
+vehicle.model = require("./model");
+vehicle.type = require("./vehicle_type");
+vehicle.fuel = require("./fuel");
 vehicle.vin = require("./vin");
diff --git a/lib/locales/en/vehicle/vin.js b/lib/locales/en/vehicle/vin.js
index df9acf9f..cc6b3edc 100644
--- a/lib/locales/en/vehicle/vin.js
+++ b/lib/locales/en/vehicle/vin.js
@@ -23,5 +23,10 @@ module["exports"] = [
   "4T1BG28K0YU968668",
   "1GCDT349788280094",
   "2FDHF38M0RCA15805",
-  "2GTEK19J971693201"
+  "2GTEK19J971693201",
+  "JYARJ04YX2A059179",
+  "5TFDY5F12AX160929",
+  "1FAFP36ZX3W796566",
+  "1FD0X4GY6BEC26012",
+  "1HD1FLW196Y726811"
 ]
diff --git a/lib/vehicle.js b/lib/vehicle.js
index bd15b0aa..686f121f 100644
--- a/lib/vehicle.js
+++ b/lib/vehicle.js
@@ -4,13 +4,29 @@
  */
 var Vehicle = function (faker) {
   var self = this;
+  var fake = faker.fake;
+
+  /**
+   * vehicle
+   *
+   * @method faker.vehicle.vehicle
+   */
+  self.vehicle = function () {
+    return fake('{{vehicle.manufacturer}} {{vehicle.model}}');
+  };
+
+  self.vehicle.schema = {
+    "description": "Generates a random vehicle.",
+    "sampleResults": ["BMW Explorer", "Ford Camry", "Lamborghini Ranchero"]
+  };
+
   /**
    * manufacturer
    *
    * @method faker.database.manufacturer
    */
   self.manufacturer = function () {
-      return faker.random.arrayElement(faker.definitions.vehicle.manufacturer);
+    return faker.random.arrayElement(faker.definitions.vehicle.manufacturer);
   };
 
   self.manufacturer.schema = {
@@ -18,13 +34,14 @@ var Vehicle = function (faker) {
     "sampleResults": ["Ford", "Jeep", "Tesla"]
   };
 
+
   /**
    * model
    *
    * @method faker.vehicle.model
    */
   self.model = function () {
-      return faker.random.arrayElement(faker.definitions.vehicle.model);
+    return faker.random.arrayElement(faker.definitions.vehicle.model);
   };
 
   self.model.schema = {
@@ -38,7 +55,7 @@ var Vehicle = function (faker) {
    * @method faker.vehicle.type
    */
   self.type = function () {
-      return faker.random.arrayElement(faker.definitions.vehicle.type);
+    return faker.random.arrayElement(faker.definitions.vehicle.type);
   };
 
   self.type.schema = {
@@ -52,7 +69,7 @@ var Vehicle = function (faker) {
    * @method faker.vehicle.fuel
    */
   self.fuel = function () {
-      return faker.random.arrayElement(faker.definitions.vehicle.fuel);
+    return faker.random.arrayElement(faker.definitions.vehicle.fuel);
   };
 
   self.fuel.schema = {
@@ -66,13 +83,27 @@ var Vehicle = function (faker) {
    * @method faker.vehicle.vin
    */
   self.vin = function () {
-      return faker.random.arrayElement(faker.definitions.vehicle.vin);
+    return faker.random.arrayElement(faker.definitions.vehicle.vin);
   };
 
   self.vin.schema = {
     "description": "Generates a VIN number.",
     "sampleResults": ["YV1MH682762184654", "3C7WRMBJ2EG208836"]
   };
+
+  /**
+   * color
+   *
+   * @method faker.vehicle.color
+   */
+  self.color = function () {
+    return fake('{{commerce.color}}');
+  };
+
+  self.color.schema = {
+    "description": "Generates a color",
+    "sampleResults": ["red", "white", "black"]
+  };
 };
 
 module["exports"] = Vehicle;