aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Bergman <[email protected]>2010-05-14 23:23:55 -0400
committerMatthew Bergman <[email protected]>2010-05-14 23:23:55 -0400
commit1ea7da2d3a6af1511c0dbee7c58e65a1984a9c55 (patch)
tree7de352dc52fd77e8bb11c5a736589b35bbc645c2
parentf1e8ba7729d4aa57f71ed9466b52d3f3cf29b25f (diff)
downloadfaker-1ea7da2d3a6af1511c0dbee7c58e65a1984a9c55.tar.xz
faker-1ea7da2d3a6af1511c0dbee7c58e65a1984a9c55.zip
finished up address
-rw-r--r--index.js6
-rw-r--r--lib/address.js47
2 files changed, 42 insertions, 11 deletions
diff --git a/index.js b/index.js
index 8870f8b6..7de6acaa 100644
--- a/index.js
+++ b/index.js
@@ -11,6 +11,10 @@ var Helper = require('helper');;
sys.puts(JSON.stringify(Faker.Name.first_name()));
sys.puts(JSON.stringify(Faker.Address.zip_code()));
-sys.puts(JSON.stringify(Faker.Address.secondary_address()));
+sys.puts(JSON.stringify(Faker.Address.secondaryAddress()));
+sys.puts(JSON.stringify(Faker.Address.city()));
sys.puts(JSON.stringify(Faker.Address.street_name()));
+sys.puts(JSON.stringify(Faker.Address.street_address()));
+sys.puts(JSON.stringify(Faker.Address.street_address(true)));
+
diff --git a/lib/address.js b/lib/address.js
index 99299ec0..d185ae3a 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -8,29 +8,56 @@ exports.zip_code = function() {
};
exports.city = function() {
- //
-};
-
-exports.street_name = function() {
switch(Helper.randomNumber(3))
{
case 0:
- return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
- break;
+ return Helper.randomize(definitions.city_prefix) + " " + Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
+ break;
case 1:
- return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
+ return Helper.randomize(definitions.city_prefix) + " " + Helper.randomize(definitions.first_name);
break;
case 2:
- return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
+ return Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
break;
case 3:
- return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.first_name) + Helper.randomize(definitions.city_suffix);
+ return Helper.randomize(definitions.last_name) + Helper.randomize(definitions.city_suffix);
break;
}
};
+exports.street_name = function() {
+ switch(Helper.randomNumber(1))
+ {
+ case 0:
+ return Helper.randomize(definitions.last_name) + " " + Helper.randomize(definitions.street_suffix);
+ break;
+ case 1:
+ return Helper.randomize(definitions.first_name) + " " + Helper.randomize(definitions.street_suffix);
+ break;
+ }
+};
+
+exports.street_address = function(i) {
+ if( typeof i == 'undefined'){ var i = false;}
+ var address = "";
+ switch(Helper.randomNumber(2))
+ {
+ case 0:
+ address = Helper.numerify("#####") + " " + this.street_name();
+ break;
+ case 1:
+ address = Helper.numerify("####") + " " + this.street_name();
+ break;
+ case 2:
+ address = Helper.numerify("###") + " " + this.street_name();
+ break;
+ }
+ var full_address = i ? address + " " + this.secondaryAddress() : address;
+ return full_address;
+};
+
-exports.secondary_address = function() {
+exports.secondaryAddress = function() {
return Helper.numerify(Helper.randomize(
[
'Apt. ###',