From 868698a19311ce6e4cbadcd85cfce7eb2d48f06b Mon Sep 17 00:00:00 2001 From: FotoVerite Date: Tue, 8 Jan 2013 02:24:54 -0500 Subject: fixed broken faker clouser and street address function from busted pull request. --- BUILD/BUILD.js | 2 +- Faker.js | 44 ++++++++++++++++++++++++++++++-------------- MinFaker.js | 20 ++++++++++---------- Readme.md | 2 +- examples/js/Faker.js | 44 ++++++++++++++++++++++++++++++-------------- lib/address.js | 41 ++++++++++++++++++++++++++++------------- 6 files changed, 100 insertions(+), 53 deletions(-) diff --git a/BUILD/BUILD.js b/BUILD/BUILD.js index 1db2e614..756f0507 100755 --- a/BUILD/BUILD.js +++ b/BUILD/BUILD.js @@ -60,7 +60,7 @@ code +=["\nif (typeof define == 'function'){", " module.exports = Faker;", "}", "else {", -" this.Faker = Faker;", +" window.Faker = Faker;", "}", "", "}()); // end Faker closure"].join('\n'); diff --git a/Faker.js b/Faker.js index 83278ca6..2fc15d0b 100644 --- a/Faker.js +++ b/Faker.js @@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************** AUTOGENERATED @ 1357628101071 *************** +/*************** AUTOGENERATED @ 1357629837372 *************** WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!! @@ -94,19 +94,35 @@ Faker.Address.city = function () { }; Faker.Address.streetName = function () { - var address; - switch (Helpers.randomNumber(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 i ? address + " " + this.secondaryAddress() : address; + var ret; + switch(Helpers.randomNumber(1)) { + case 0: + ret = Helpers.randomize(definitions.last_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + case 1: + ret = Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + } + return ret; +}; + +Faker.Address.streetAddress = function (i) { + if( typeof i == 'undefined'){ var i = false;} + var address = ""; + switch(Helpers.randomNumber(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; + } + var full_address = i ? address + " " + this.secondaryAddress() : address; + return full_address; }; Faker.Address.secondaryAddress = function () { diff --git a/MinFaker.js b/MinFaker.js index f8488890..574f73fe 100644 --- a/MinFaker.js +++ b/MinFaker.js @@ -1,15 +1,15 @@ !function(){var a={version:"0.5.5",Name:{}};a.Name.findName=function(){switch(b.randomNumber(8)){case 0:return b.randomize(c.name_prefix())+" "+b.randomize(c.first_name())+" "+b.randomize(c.last_name());case 1:return b.randomize(c.first_name())+" "+b.randomize(c.last_name())+" "+b.randomize(c.name_suffix)}return b.randomize(c.first_name())+" "+b.randomize(c.last_name())};a.Name.firstName=function(){return b.randomize(c.first_name())};a.Name.lastName=function(){return b.randomize(c.last_name())};a.Address= {};a.Address.zipCode=function(){return b.replaceSymbolWithNumber(b.randomize(["#####","#####-####"]))};a.Address.zipCodeFormat=function(a){return b.replaceSymbolWithNumber(["#####","#####-####"][a])};a.Address.city=function(){var a;switch(b.randomNumber(3)){case 0:a=b.randomize(c.city_prefix())+" "+b.randomize(c.first_name())+b.randomize(c.city_suffix());break;case 1:a=b.randomize(c.city_prefix())+" "+b.randomize(c.first_name());break;case 2:a=b.randomize(c.first_name())+b.randomize(c.city_suffix()); -break;case 3:a=b.randomize(c.last_name())+b.randomize(c.city_suffix())}return a};a.Address.streetName=function(){var a;switch(b.randomNumber(2)){case 0:a=b.replaceSymbolWithNumber("#####")+" "+this.streetName();break;case 1:a=b.replaceSymbolWithNumber("####")+" "+this.streetName();break;case 2:a=b.replaceSymbolWithNumber("###")+" "+this.streetName()}return i?a+" "+this.secondaryAddress():a};a.Address.secondaryAddress=function(){return b.replaceSymbolWithNumber(b.randomize(["Apt. ###","Suite ###"]))}; -a.Address.brState=function(a){return b.randomize(c[a?"br_state_abbr":"br_state"]())};a.Address.ukCounty=function(){return b.randomize(c.uk_county())};a.Address.ukCountry=function(){return b.randomize(c.uk_country())};a.Address.usState=function(a){return b.randomize(c[a?"us_state_abbr":"us_state"]())};a.PhoneNumber={};a.PhoneNumber.phoneNumber=function(){return b.replaceSymbolWithNumber(b.randomize(c.phone_formats()))};a.PhoneNumber.phoneNumberFormat=function(a){return b.replaceSymbolWithNumber(c.phone_formats()[a])}; -a.Internet={};a.Internet.email=function(){return this.userName()+"@"+this.domainName()};a.Internet.userName=function(){var a;switch(b.randomNumber(2)){case 0:a=b.randomize(c.first_name());break;case 1:a=b.randomize(c.first_name())+b.randomize([".","_"])+b.randomize(c.last_name())}return a};a.Internet.domainName=function(){return this.domainWord()+"."+b.randomize(c.domain_suffix())};a.Internet.domainWord=function(){return b.randomize(c.first_name()).toLowerCase()};a.Internet.ip=function(){for(var a= -[],b=0;4>b;b++)a[b]=(254*Math.random()+1).toFixed(0);return a.join(".")};a.Company={};a.Company.companyName=function(a){switch(a?a:b.randomNumber(3)){case 0:return b.randomize(c.last_name())+" "+this.companySuffix();case 1:return b.randomize(c.last_name())+"-"+b.randomize(c.last_name());case 2:return b.randomize(c.last_name())+","+b.randomize(c.last_name())+" and "+b.randomize(c.last_name())}};a.Company.companySuffix=function(){return b.randomize(["Inc","and Sons","LLC","Group","and Daughters"])}; -a.Company.catchPhrase=function(){return b.randomize(c.catch_phrase_adjective())+" "+b.randomize(c.catch_phrase_descriptor())+" "+b.randomize(c.catch_phrase_noun())};a.Company.bs=function(){return b.randomize(c.bs_adjective())+" "+b.randomize(c.bs_buzz())+" "+b.randomize(c.bs_noun())};a.Lorem={};a.Lorem.words=function(a){"undefined"==typeof a&&(a=3);return b.shuffle(c.lorem()).slice(0,a)};a.Lorem.sentence=function(a){"undefined"==typeof a&&(a=3);return this.words(a+b.randomNumber(7)).join(" ")};a.Lorem.sentences= -function(a){"undefined"==typeof a&&(a=3);var b=[];for(a;0<=a;a--)b.push(this.sentence());return b.join("\n")};a.Lorem.paragraph=function(a){"undefined"==typeof a&&(a=3);return this.sentences(a+b.randomNumber(3))};a.Lorem.paragraphs=function(a){"undefined"==typeof a&&(a=3);var b=[];for(a;0<=a;a--)b.push(this.paragraph());return b.join("\n \r\t")};a.Helpers={};a.Helpers.randomNumber=function(a){return Math.floor(Math.random()*a)};a.Helpers.randomize=function(a){var b=Math.floor(Math.random()*a.length); -return a[b]};a.Helpers.replaceSymbolWithNumber=function(a,b){"undefined"==typeof b&&(b="#");for(var c="",d=0;db;b++)a[b]=(254*Math.random()+1).toFixed(0);return a.join(".")};a.Company={};a.Company.companyName=function(a){switch(a?a:b.randomNumber(3)){case 0:return b.randomize(c.last_name())+" "+this.companySuffix();case 1:return b.randomize(c.last_name())+ +"-"+b.randomize(c.last_name());case 2:return b.randomize(c.last_name())+","+b.randomize(c.last_name())+" and "+b.randomize(c.last_name())}};a.Company.companySuffix=function(){return b.randomize(["Inc","and Sons","LLC","Group","and Daughters"])};a.Company.catchPhrase=function(){return b.randomize(c.catch_phrase_adjective())+" "+b.randomize(c.catch_phrase_descriptor())+" "+b.randomize(c.catch_phrase_noun())};a.Company.bs=function(){return b.randomize(c.bs_adjective())+" "+b.randomize(c.bs_buzz())+" "+ +b.randomize(c.bs_noun())};a.Lorem={};a.Lorem.words=function(a){"undefined"==typeof a&&(a=3);return b.shuffle(c.lorem()).slice(0,a)};a.Lorem.sentence=function(a){"undefined"==typeof a&&(a=3);return this.words(a+b.randomNumber(7)).join(" ")};a.Lorem.sentences=function(a){"undefined"==typeof a&&(a=3);var b=[];for(a;0<=a;a--)b.push(this.sentence());return b.join("\n")};a.Lorem.paragraph=function(a){"undefined"==typeof a&&(a=3);return this.sentences(a+b.randomNumber(3))};a.Lorem.paragraphs=function(a){"undefined"== +typeof a&&(a=3);var b=[];for(a;0<=a;a--)b.push(this.paragraph());return b.join("\n \r\t")};a.Helpers={};a.Helpers.randomNumber=function(a){return Math.floor(Math.random()*a)};a.Helpers.randomize=function(a){var b=Math.floor(Math.random()*a.length);return a[b]};a.Helpers.replaceSymbolWithNumber=function(a,b){"undefined"==typeof b&&(b="#");for(var c="",d=0;d
  • Name
    • findName
    • firstName
    • lastName
  • Address
    • zipCode
    • zipCodeFormat
    • city
    • streetName
    • secondaryAddress
    • brState
    • ukCounty
    • ukCountry
    • usState
  • PhoneNumber
    • phoneNumber
    • phoneNumberFormat
  • Internet
    • email
    • userName
    • domainName
    • domainWord
    • ip
  • Company
    • companyName
    • companySuffix
    • catchPhrase
    • bs
  • Lorem
    • words
    • sentence
    • sentences
    • paragraph
    • paragraphs
  • Helpers
    • randomNumber
    • randomize
    • replaceSymbolWithNumber
    • shuffle
    • generateDataSet
    • createCard
    • userCard
  • definitions
    • first_name
    • last_name
    • name_prefix
    • name_suffix
    • br_state
    • br_state_abbr
    • us_state
    • us_state_abbr
    • city_prefix
    • city_suffix
    • street_suffix
    • uk_county
    • uk_country
    • catch_phrase_adjective
    • catch_phrase_descriptor
    • catch_phrase_noun
    • bs_adjective
    • bs_buzz
    • bs_noun
    • domain_suffix
    • lorem
    • phone_formats
    • +
    • Name
      • findName
      • firstName
      • lastName
    • Address
      • zipCode
      • zipCodeFormat
      • city
      • streetName
      • streetAddress
      • secondaryAddress
      • brState
      • ukCounty
      • ukCountry
      • usState
    • PhoneNumber
      • phoneNumber
      • phoneNumberFormat
    • Internet
      • email
      • userName
      • domainName
      • domainWord
      • ip
    • Company
      • companyName
      • companySuffix
      • catchPhrase
      • bs
    • Lorem
      • words
      • sentence
      • sentences
      • paragraph
      • paragraphs
    • Helpers
      • randomNumber
      • randomize
      • replaceSymbolWithNumber
      • shuffle
      • generateDataSet
      • createCard
      • userCard
    • definitions
      • first_name
      • last_name
      • name_prefix
      • name_suffix
      • br_state
      • br_state_abbr
      • us_state
      • us_state_abbr
      • city_prefix
      • city_suffix
      • street_suffix
      • uk_county
      • uk_country
      • catch_phrase_adjective
      • catch_phrase_descriptor
      • catch_phrase_noun
      • bs_adjective
      • bs_buzz
      • bs_noun
      • domain_suffix
      • lorem
      • phone_formats
    ## Authors ####Matthew Bergman & Marak Squires Heavily inspired by Benjamin Curtis's Ruby Gem [Faker](http://faker.rubyforge.org/) and Perl's [Data::Faker](http://search.cpan.org/~jasonk/Data-Faker-0.07/lib/Data/Faker.pm) diff --git a/examples/js/Faker.js b/examples/js/Faker.js index 83278ca6..2fc15d0b 100644 --- a/examples/js/Faker.js +++ b/examples/js/Faker.js @@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************** AUTOGENERATED @ 1357628101071 *************** +/*************** AUTOGENERATED @ 1357629837372 *************** WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!! @@ -94,19 +94,35 @@ Faker.Address.city = function () { }; Faker.Address.streetName = function () { - var address; - switch (Helpers.randomNumber(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 i ? address + " " + this.secondaryAddress() : address; + var ret; + switch(Helpers.randomNumber(1)) { + case 0: + ret = Helpers.randomize(definitions.last_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + case 1: + ret = Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + } + return ret; +}; + +Faker.Address.streetAddress = function (i) { + if( typeof i == 'undefined'){ var i = false;} + var address = ""; + switch(Helpers.randomNumber(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; + } + var full_address = i ? address + " " + this.secondaryAddress() : address; + return full_address; }; Faker.Address.secondaryAddress = function () { diff --git a/lib/address.js b/lib/address.js index f662e6bb..2b4732c6 100644 --- a/lib/address.js +++ b/lib/address.js @@ -29,21 +29,36 @@ exports.city = function() { }; exports.streetName = function() { - var address; - switch (Helpers.randomNumber(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 i ? address + " " + this.secondaryAddress() : address; + var ret; + switch(Helpers.randomNumber(1)) { + case 0: + ret = Helpers.randomize(definitions.last_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + case 1: + ret = Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.street_suffix()); + break; + } + return ret; }; +exports.streetAddress = function(i) { + if( typeof i == 'undefined'){ var i = false;} + var address = ""; + switch(Helpers.randomNumber(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; + } + var full_address = i ? address + " " + this.secondaryAddress() : address; + return full_address; +}; exports.secondaryAddress = function() { return Helpers.replaceSymbolWithNumber(Helpers.randomize( [ -- cgit v1.2.3