From acf68caa2798d2cde4fec503ebfb7e8995b5e8ce Mon Sep 17 00:00:00 2001 From: Marak Date: Sat, 4 Jul 2015 22:47:39 -0700 Subject: [api] [refactor] [fix] Begin switch to using Faker.fake generator for all string concats. Replaced switch / case statements with formatting arrays. Closes #226 --- lib/company.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/company.js b/lib/company.js index ee248d48..603b8071 100644 --- a/lib/company.js +++ b/lib/company.js @@ -1,4 +1,5 @@ -var faker = require('../index'); +var faker = require('../index'), +f = faker.fake; var company = { @@ -8,14 +9,18 @@ var company = { }, companyName: function (format) { - switch ((format ? format : faker.random.number(2))) { - case 0: - return faker.name.lastName() + " " + faker.company.companySuffix(); - case 1: - return faker.name.lastName() + "-" + faker.name.lastName(); - case 2: - return faker.name.lastName() + ", " + faker.name.lastName() + " and " + faker.name.lastName(); - } + + var formats = [ + '{{name.lastName}} {{company.companySuffix}}', + '{{name.lastName}} - {{name.lastName}}', + '{{name.lastName}}, {{name.lastName}} and {{name.lastName}}' + ]; + + if (typeof format !== "number") { + format = faker.random.number(formats.length); + } + + return f(formats[format]); }, companySuffix: function () { -- cgit v1.2.3