Merge pull request #234 from portse/master

[fix] Canadian zip format broken after locale spliting

7 files changed, 41 insertions, 17 deletions

diff --git a/lib/address.js b/lib/address.js
index d53e0ef8..a921903f 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -2,17 +2,17 @@ function Address (faker) {
   var f = faker.fake,
       Helpers = faker.helpers;
 
-  this.zipCode = function (format) {
-	// if zip format is not specified, use the zip format defined for the locale
-	if (typeof format === 'undefined') {
-	    var localeFormat = faker.definitions.address.zipFormat;
-		if (typeof localeFormat === 'string') {
-			format = localeFormat;
-		} else {
-			format = faker.random.array_element(localeFormat);
-		}
-	}
-	return Helpers.replaceSymbols(format);
+  this.zipCode = function(format) {
+    // if zip format is not specified, use the zip format defined for the locale
+    if (typeof format === 'undefined') {
+      var localeFormat = faker.definitions.address.postcode;
+      if (typeof localeFormat === 'string') {
+        format = localeFormat;
+      } else {
+        format = faker.random.array_element(localeFormat);
+      }
+    }
+    return Helpers.replaceSymbols(format);
   }
 
   this.city = function (format) {
diff --git a/lib/index.js b/lib/index.js
index 23ec1dee..07a0f825 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -83,7 +83,7 @@ function Faker (opts) {
   
   var _definitions = {
     "name": ["first_name", "last_name", "prefix", "suffix", "title", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"],
-    "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "state", "state_abbr", "street_prefix", "zipFormat"],
+    "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "state", "state_abbr", "street_prefix", "postcode"],
     "company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"],
     "lorem": ["words"],
     "hacker": ["abbreviation", "adjective", "noun", "verb", "ingverb"],
diff --git a/lib/locales/en/address/index.js b/lib/locales/en/address/index.js
index a71a498e..575f1d46 100644
--- a/lib/locales/en/address/index.js
+++ b/lib/locales/en/address/index.js
@@ -1,6 +1,5 @@
 var address = {};
 module['exports'] = address;
-address.zipFormat = require("./zipFormat");
 address.city_prefix = require("./city_prefix");
 address.city_suffix = require("./city_suffix");
 address.county = require("./county");
diff --git a/lib/locales/en/address/zipFormat.js b/lib/locales/en/address/zipFormat.js
deleted file mode 100644
index f233d46c..00000000
--- a/lib/locales/en/address/zipFormat.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module["exports"] = [
-  "#####",
-  "#####-####"
-];
diff --git a/lib/locales/en_CA/address/index.js b/lib/locales/en_CA/address/index.js
index 8eaaa997..5b43a214 100644
--- a/lib/locales/en_CA/address/index.js
+++ b/lib/locales/en_CA/address/index.js
@@ -3,3 +3,4 @@ module['exports'] = address;
 address.state = require("./state");
 address.state_abbr = require("./state_abbr");
 address.default_country = require("./default_country");
+address.postcode = require('./postcode.js');
diff --git a/lib/locales/en_CA/address/postcode.js b/lib/locales/en_CA/address/postcode.js
new file mode 100644
index 00000000..cd73ce97
--- /dev/null
+++ b/lib/locales/en_CA/address/postcode.js
@@ -0,0 +1,3 @@
+module["exports"] = [
+  "?#? #?#"
+];
diff --git a/test/address.unit.js b/test/address.unit.js
index f6b299a1..bfe9e0ce 100644
--- a/test/address.unit.js
+++ b/test/address.unit.js
@@ -216,6 +216,31 @@ describe("address.js", function () {
         });
     });
 
+    describe("zipCode()", function () {
+        it("returns random zipCode", function () {
+            sinon.spy(faker.address, 'zipCode');
+            var zipCode = faker.address.zipCode();
+            assert.ok(zipCode);
+            assert.ok(faker.address.zipCode.called);
+            faker.address.zipCode.restore();
+        });
+
+        it("returns random zipCode - user specified format", function () {
+            var zipCode = faker.address.zipCode("?#? #?#");
+            assert.ok(zipCode.match(/^[A-Za-z]\d[A-Za-z]\s\d[A-Za-z]\d$/));
+            // try another format
+            zipCode = faker.address.zipCode("###-###");
+            assert.ok(zipCode.match(/^\d{3}-\d{3}$/));
+        });
+
+        it("returns zipCode with proper locale format", function () {
+            // we'll use the en_CA locale..
+            faker.locale = "en_CA";
+            var zipCode = faker.address.zipCode();
+            assert.ok(zipCode.match(/^[A-Za-z]\d[A-Za-z]\s?\d[A-Za-z]\d$/));
+        });
+    });
+
     describe("latitude()", function () {
         it("returns random latitude", function () {
             for (var i = 0; i < 100; i++) {