style change

1 files changed, 68 insertions, 64 deletions

diff --git a/lib/address.js b/lib/address.js
index abe041ba..f02d621c 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -2,77 +2,81 @@ var Helpers = require('./Helpers');
 var Faker = require('../index');
 var definitions = require('../lib/definitions');
 
-exports.zipCode = function () {
-    return Helpers.replaceSymbolWithNumber(Helpers.randomize(["#####", '#####-####']));
-};
+var address = {
+    zipCode: function () {
+        return Helpers.replaceSymbolWithNumber(Helpers.randomize(["#####", '#####-####']));
+    },
 
-exports.zipCodeFormat = function (format) {
-    return Helpers.replaceSymbolWithNumber(["#####", '#####-####'][format]);
-};
+    zipCodeFormat: function (format) {
+        return Helpers.replaceSymbolWithNumber(["#####", '#####-####'][format]);
+    },
 
-exports.city = function () {
-    switch (Faker.random.number(3)) {
-    case 0:
-        return Faker.random.city_prefix() + " " + Faker.random.first_name() + Faker.random.city_suffix();
-    case 1:
-        return Faker.random.city_prefix() + " " + Faker.random.first_name();
-    case 2:
-        return Faker.random.first_name() + Faker.random.city_suffix();
-    case 3:
-        return Faker.random.last_name() + Faker.random.city_suffix();
-    }
-};
+    city: function () {
+        switch (Faker.random.number(3)) {
+        case 0:
+            return Faker.random.city_prefix() + " " + Faker.random.first_name() + Faker.random.city_suffix();
+        case 1:
+            return Faker.random.city_prefix() + " " + Faker.random.first_name();
+        case 2:
+            return Faker.random.first_name() + Faker.random.city_suffix();
+        case 3:
+            return Faker.random.last_name() + Faker.random.city_suffix();
+        }
+    },
 
-exports.streetName = function () {
-    switch (Faker.random.number(1)) {
-    case 0:
-        return Faker.random.last_name() + " " + Faker.random.street_suffix();
-    case 1:
-        return Faker.random.first_name() + " " + Faker.random.street_suffix();
-    }
-};
+    streetName: function () {
+        switch (Faker.random.number(1)) {
+        case 0:
+            return Faker.random.last_name() + " " + Faker.random.street_suffix();
+        case 1:
+            return Faker.random.first_name() + " " + Faker.random.street_suffix();
+        }
+    },
 
-//
-// TODO: change all these methods that accept a boolean to instead accept an options hash.
-//
-exports.streetAddress = function (useFullAddress) {
-    if (useFullAddress === undefined) { useFullAddress = false; }
-    var address = "";
-    switch (Faker.random.number(2)) {
-    case 0:
-        address = Helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
-        break;
-    case 1:
-        address = Helpers.replaceSymbolWithNumber("####") +  " " + this.streetName();
-        break;
-    case 2:
-        address = Helpers.replaceSymbolWithNumber("###") + " " + this.streetName();
-        break;
-    }
-    return useFullAddress ? (address + " " + this.secondaryAddress()) : address;
-};
+    //
+    // TODO: change all these methods that accept a boolean to instead accept an options hash.
+    //
+    streetAddress: function (useFullAddress) {
+        if (useFullAddress === undefined) { useFullAddress = false; }
+        var address = "";
+        switch (Faker.random.number(2)) {
+        case 0:
+            address = Helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
+            break;
+        case 1:
+            address = Helpers.replaceSymbolWithNumber("####") +  " " + this.streetName();
+            break;
+        case 2:
+            address = Helpers.replaceSymbolWithNumber("###") + " " + this.streetName();
+            break;
+        }
+        return useFullAddress ? (address + " " + this.secondaryAddress()) : address;
+    },
 
-exports.secondaryAddress = function () {
-    return Helpers.replaceSymbolWithNumber(Helpers.randomize(
-        [
-            'Apt. ###',
-            'Suite ###'
-        ]
-    ));
-};
+    secondaryAddress: function () {
+        return Helpers.replaceSymbolWithNumber(Helpers.randomize(
+            [
+                'Apt. ###',
+                'Suite ###'
+            ]
+        ));
+    },
 
-exports.brState = function (useAbbr) {
-    return useAbbr ? Faker.random.br_state_abbr() : Faker.random.br_state();
-};
+    brState: function (useAbbr) {
+        return useAbbr ? Faker.random.br_state_abbr() : Faker.random.br_state();
+    },
 
-exports.ukCounty = function () {
-    return Faker.random.uk_county();
-};
+    ukCounty: function () {
+        return Faker.random.uk_county();
+    },
 
-exports.ukCountry = function () {
-    return Faker.random.uk_country();
-};
+    ukCountry: function () {
+        return Faker.random.uk_country();
+    },
 
-exports.usState = function (useAbbr) {
-    return useAbbr ? Faker.random.us_state_abbr() : Faker.random.us_state();
+    usState: function (useAbbr) {
+        return useAbbr ? Faker.random.us_state_abbr() : Faker.random.us_state();
+    }
 };
+
+module.exports = address;