[api] [refactor] Replaced switch / cases and string concats with Faker.fake method. #199

2 files changed, 19 insertions, 24 deletions

diff --git a/lib/address.js b/lib/address.js
index 6a9e3beb..c860f0a7 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -1,28 +1,27 @@
 var Helpers = require('./helpers');
-var faker = require('../index');
+var faker = require('../index'),
+f = faker.fake;
 
 var address = {
     zipCode: function () {
         return Helpers.replaceSymbolWithNumber(faker.random.array_element(["#####", '#####-####']));
     },
 
-    city: function () {
-        var result;
-        switch (faker.random.number(3)) {
-        case 0:
-            result = faker.address.cityPrefix() + " " + faker.name.firstName() + faker.address.citySuffix();
-            break;
-        case 1:
-            result = faker.address.cityPrefix() + " " + faker.name.firstName();
-            break;
-        case 2:
-            result = faker.name.firstName() + faker.address.citySuffix();
-            break;
-        case 3:
-            result = faker.name.lastName() + faker.address.citySuffix();
-            break;
-        }
-        return result;
+    city: function (format) {
+
+      var formats = [
+        '{{address.cityPrefix}} {{name.firstName}} {{address.citySuffix}}',
+        '{{address.cityPrefix}} {{name.firstName}}',
+        '{{name.firstName}} {{address.citySuffix}}',
+        '{{name.lastName}} {{address.citySuffix}}'
+      ];
+
+      if (typeof format !== "number") {
+        format = faker.random.number(formats.length);
+      }
+
+      return f(formats[format]);
+
     },
 
     cityPrefix: function () {
diff --git a/lib/company.js b/lib/company.js
index 603b8071..14333621 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -28,15 +28,11 @@ var company = {
     },
 
     catchPhrase: function () {
-        return faker.company.catchPhraseAdjective() + " " +
-            faker.company.catchPhraseDescriptor() + " " +
-            faker.company.catchPhraseNoun();
+      return f('{{company.catchPhraseAdjective}} {{company.catchPhraseDescriptor}} {{company.catchPhraseNoun}}')
     },
 
     bs: function () {
-        return faker.company.bsAdjective() + " " +
-            faker.company.bsBuzz() + " " +
-            faker.company.bsNoun();
+      return f('{{company.bsAdjective}} {{company.bsBuzz}} {{company.bsNoun}}');
     },
 
     catchPhraseAdjective: function () {