refactoring company.js

1 files changed, 28 insertions, 23 deletions

diff --git a/lib/company.js b/lib/company.js
index d325cfa4..8c9f3a0e 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -1,31 +1,36 @@
 var Helpers = require('./helpers');
+var Name = require('./name');
 var definitions = require('../lib/definitions');
 
-exports.companyName = function (format) {
-    switch ((format ? format : Helpers.randomNumber(3))) {
-    case 0:
-        return Helpers.randomize(definitions.last_name()) + " " + this.companySuffix();
-    case 1:
-        return Helpers.randomize(definitions.last_name()) + "-" + Helpers.randomize(definitions.last_name());
-    case 2:
-        return Helpers.randomize(definitions.last_name()) + "," + Helpers.randomize(definitions.last_name()) + " and " + Helpers.randomize(definitions.last_name());
-    }
-};
+var company = {
+    suffixes: ["Inc", "and Sons", "LLC", "Group", "and Daughters"],
 
-exports.suffixes = ["Inc", "and Sons", "LLC", "Group", "and Daughters"];
+    companyName: function (format) {
+        switch ((format ? format : Helpers.randomNumber(3))) {
+        case 0:
+            return Name.lastName() + " " + this.companySuffix();
+        case 1:
+            return Name.lastName() + "-" + Name.lastName();
+        case 2:
+            return Name.lastName() + "," + Name.lastName() + " and " + Name.lastName();
+        }
+    },
 
-exports.companySuffix = function () {
-    return Helpers.randomize(this.suffixes);
-};
+    companySuffix: function () {
+        return Helpers.randomize(this.suffixes);
+    },
 
-exports.catchPhrase = function () {
-    return Helpers.randomize(definitions.catch_phrase_adjective()) + " " +
-        Helpers.randomize(definitions.catch_phrase_descriptor()) + " " +
-        Helpers.randomize(definitions.catch_phrase_noun());
-};
+    catchPhrase: function () {
+        return Helpers.randomize(definitions.catch_phrase_adjective()) + " " +
+            Helpers.randomize(definitions.catch_phrase_descriptor()) + " " +
+            Helpers.randomize(definitions.catch_phrase_noun());
+    },
 
-exports.bs = function () {
-    return Helpers.randomize(definitions.bs_adjective()) + " " +
-        Helpers.randomize(definitions.bs_buzz()) + " " +
-        Helpers.randomize(definitions.bs_noun());
+    bs: function () {
+        return Helpers.randomize(definitions.bs_adjective()) + " " +
+            Helpers.randomize(definitions.bs_buzz()) + " " +
+            Helpers.randomize(definitions.bs_noun());
+    }
 };
+
+module.exports = company;