From 84ed0c68a0672b5e07b0bcdf2c2b84b2ea07d1b3 Mon Sep 17 00:00:00 2001 From: FotoVerite Date: Mon, 17 Feb 2014 22:01:51 -0500 Subject: More updating to get things inline. --- BUILD/BUILD.js | 2 +- Faker.js | 20 +++++++++----------- MinFaker.js | 32 ++++++++++++++++++++++++++++++++ Readme.md | 2 +- examples/js/Faker.js | 20 +++++++++----------- package.json | 12 ++++++------ 6 files changed, 58 insertions(+), 30 deletions(-) diff --git a/BUILD/BUILD.js b/BUILD/BUILD.js index 33b2cfdb..04ea8364 100755 --- a/BUILD/BUILD.js +++ b/BUILD/BUILD.js @@ -35,7 +35,7 @@ for (var module in Faker) { if (Array.isArray(methodValue)) { code += JSON.stringify(methodValue) + ';\n'; } else { - code += (methodValue.toString() + ';\n'); + code += (methodValue.toString() + ';\n'); } } } diff --git a/Faker.js b/Faker.js index eaa9db74..ddc99937 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 @ 1392691071208 *************** +/*************** AUTOGENERATED @ 1392692150569 *************** 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!!!! @@ -238,17 +238,15 @@ Faker.Image.avatar = function () { return Faker.random.avatar_uri(); }; -Faker.Image.atry = [object Object]; - Faker.Image.imageUrl = function (width, height, category) { - var width = width || 640; - var height = height || 480; - - var url ='http://lorempixel.com/' + width + '/' + height; - if (typeof category !== 'undefined') { - url += '/' + category; - } - return url; + var width = width || 640; + var height = height || 480; + + var url ='http://lorempixel.com/' + width + '/' + height; + if (typeof category !== 'undefined') { + url += '/' + category; + } + return url; }; Faker.Image.abstractImage = function (width, height) { diff --git a/MinFaker.js b/MinFaker.js index e69de29b..6c704ec8 100644 --- a/MinFaker.js +++ b/MinFaker.js @@ -0,0 +1,32 @@ +!function(){var a={version:"0.5.5",Name:{}};a.Name.firstName=function(){return a.random.first_name()};a.Name.lastName=function(){return a.random.last_name()};a.Name.findName=function(){switch(a.random.number(8)){case 0:return a.random.name_prefix()+" "+this.firstName()+" "+this.lastName();case 1:return this.firstName()+" "+this.lastName()+" "+a.random.name_suffix()}return this.firstName()+" "+this.lastName()};a.Address={};a.Address.zipCode=function(){return e.replaceSymbolWithNumber(a.random.array_element(["#####", +"#####-####"]))};a.Address.zipCodeFormat=function(a){return e.replaceSymbolWithNumber(["#####","#####-####"][a])};a.Address.city=function(){var c;switch(a.random.number(4)){case 0:c=a.random.city_prefix()+" "+a.random.first_name()+a.random.city_suffix();break;case 1:c=a.random.city_prefix()+" "+a.random.first_name();break;case 2:c=a.random.first_name()+a.random.city_suffix();break;case 3:c=a.random.last_name()+a.random.city_suffix()}return c};a.Address.streetName=function(){var c;switch(a.random.number(2)){case 0:c= +a.random.last_name()+" "+a.random.street_suffix();break;case 1:c=a.random.first_name()+" "+a.random.street_suffix()}return c};a.Address.streetAddress=function(c){void 0===c&&(c=!1);var b="";switch(a.random.number(3)){case 0:b=e.replaceSymbolWithNumber("#####")+" "+this.streetName();break;case 1:b=e.replaceSymbolWithNumber("####")+" "+this.streetName();break;case 2:b=e.replaceSymbolWithNumber("###")+" "+this.streetName()}return c?b+" "+this.secondaryAddress():b};a.Address.secondaryAddress=function(){return e.replaceSymbolWithNumber(a.random.array_element(["Apt. ###", +"Suite ###"]))};a.Address.brState=function(c){return c?a.random.br_state_abbr():a.random.br_state()};a.Address.ukCounty=function(){return a.random.uk_county()};a.Address.ukCountry=function(){return a.random.uk_country()};a.Address.usState=function(c){return c?a.random.us_state_abbr():a.random.us_state()};a.Address.latitude=function(){return(a.random.number(18E5)/1E4-90).toFixed(4)};a.Address.longitude=function(){return(a.random.number(36E5)/1E4-180).toFixed(4)};a.PhoneNumber={};a.PhoneNumber.phoneNumber= +function(){return e.replaceSymbolWithNumber(a.random.phone_formats())};a.PhoneNumber.phoneNumberFormat=function(a){return e.replaceSymbolWithNumber(d.phone_formats[a])};a.Internet={};a.Internet.email=function(){return a.Helpers.slugify(this.userName())+"@"+a.Helpers.slugify(this.domainName())};a.Internet.userName=function(){var c;switch(a.random.number(2)){case 0:c=a.random.first_name();break;case 1:c=a.random.first_name()+a.random.array_element([".","_"])+a.random.last_name()}return c};a.Internet.domainName= +function(){return this.domainWord()+"."+a.random.domain_suffix()};a.Internet.domainWord=function(){return a.random.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.suffixes=function(){return["Inc","and Sons","LLC","Group","and Daughters"]};a.Company.companyName=function(c){switch(c?c:a.random.number(3)){case 0:return a.Name.lastName()+" "+this.companySuffix();case 1:return a.Name.lastName()+ +"-"+a.Name.lastName();case 2:return a.Name.lastName()+", "+a.Name.lastName()+" and "+a.Name.lastName()}};a.Company.companySuffix=function(){return a.random.array_element(this.suffixes())};a.Company.catchPhrase=function(){return a.random.catch_phrase_adjective()+" "+a.random.catch_phrase_descriptor()+" "+a.random.catch_phrase_noun()};a.Company.bs=function(){return a.random.bs_adjective()+" "+a.random.bs_buzz()+" "+a.random.bs_noun()};a.Image={};a.Image.avatar=function(){return a.random.avatar_uri()}; +a.Image.imageUrl=function(a,b,d){a="http://lorempixel.com/"+(a||640)+"/"+(b||480);"undefined"!==typeof d&&(a+="/"+d);return a};a.Image.abstractImage=function(a,b){return image.imageUrl(a,b,"abstract")};a.Image.animals=function(a,b){return image.imageUrl(a,b,"animals")};a.Image.business=function(a,b){return image.imageUrl(a,b,"business")};a.Image.cats=function(a,b){return image.imageUrl(a,b,"cats")};a.Image.city=function(a,b){return image.imageUrl(a,b,"city")};a.Image.food=function(a,b){return image.imageUrl(a, +b,"food")};a.Image.nightlife=function(a,b){return image.imageUrl(a,b,"nightlife")};a.Image.fashion=function(a,b){return image.imageUrl(a,b,"fashion")};a.Image.people=function(a,b){return image.imageUrl(a,b,"people")};a.Image.nature=function(a,b){return image.imageUrl(a,b,"nature")};a.Image.sports=function(a,b){return image.imageUrl(a,b,"sports")};a.Image.technics=function(a,b){return image.imageUrl(a,b,"technics")};a.Image.transport=function(a,b){return image.imageUrl(a,b,"transport")};a.Lorem={}; +a.Lorem.words=function(a){"undefined"==typeof a&&(a=3);return e.shuffle(d.lorem).slice(0,a)};a.Lorem.sentence=function(c,b){"undefined"==typeof c&&(c=3);return this.words(c+a.random.number(7)).join(" ")};a.Lorem.sentences=function(a){"undefined"==typeof a&&(a=3);var b=[];for(a;0
  • Name
    • firstName
    • lastName
    • findName
  • Address
    • zipCode
    • zipCodeFormat
    • city
    • streetName
    • streetAddress
    • secondaryAddress
    • brState
    • ukCounty
    • ukCountry
    • usState
    • latitude
    • longitude
  • PhoneNumber
    • phoneNumber
    • phoneNumberFormat
  • Internet
    • email
    • userName
    • domainName
    • domainWord
    • ip
  • Company
    • suffixes
    • companyName
    • companySuffix
    • catchPhrase
    • bs
  • Image
    • avatar
    • atry
    • imageUrl
    • abstractImage
    • animals
    • business
    • cats
    • city
    • food
    • nightlife
    • fashion
    • people
    • nature
    • sports
    • technics
    • transport
  • Lorem
    • words
    • sentence
    • sentences
    • paragraph
    • paragraphs
  • Helpers
    • randomNumber
    • randomize
    • slugify
    • replaceSymbolWithNumber
    • shuffle
    • createCard
    • userCard
  • random
    • number
    • array_element
    • city_prefix
    • city_suffix
    • street_suffix
    • br_state
    • br_state_abbr
    • us_state
    • us_state_abbr
    • uk_county
    • uk_country
    • first_name
    • last_name
    • name_prefix
    • name_suffix
    • catch_phrase_adjective
    • catch_phrase_descriptor
    • catch_phrase_noun
    • bs_adjective
    • bs_buzz
    • bs_noun
    • phone_formats
    • domain_suffix
    • avatar_uri
  • 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
    • avatar_uri
    • + ## Tests npm install . make test diff --git a/examples/js/Faker.js b/examples/js/Faker.js index eaa9db74..ddc99937 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 @ 1392691071208 *************** +/*************** AUTOGENERATED @ 1392692150569 *************** 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!!!! @@ -238,17 +238,15 @@ Faker.Image.avatar = function () { return Faker.random.avatar_uri(); }; -Faker.Image.atry = [object Object]; - Faker.Image.imageUrl = function (width, height, category) { - var width = width || 640; - var height = height || 480; - - var url ='http://lorempixel.com/' + width + '/' + height; - if (typeof category !== 'undefined') { - url += '/' + category; - } - return url; + var width = width || 640; + var height = height || 480; + + var url ='http://lorempixel.com/' + width + '/' + height; + if (typeof category !== 'undefined') { + url += '/' + category; + } + return url; }; Faker.Image.abstractImage = function (width, height) { diff --git a/package.json b/package.json index 8498827b..cd7c8b00 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,11 @@ { "name": "Faker", "description": "Generate massive amounts of fake contextual data", - "version": "0.6", - "author": "Marak Squires ", + "version": "0.6.0", + "contributors": [ + "Marak Squires ", + "Matthew Bergman " + ], "repository": { "type": "git", "url": "http://github.com/FotoVerite/Faker.js.git" @@ -18,8 +21,5 @@ "optimist" : "0.3.5", "sinon": "1.4.2" }, - "engine": [ - "node >=0.1.90" - ], - "main": "index" + "main": "index.js" } -- cgit v1.2.3