From f8665e71a3c6f6d77dee0a8d45c8fb6a67301d98 Mon Sep 17 00:00:00 2001 From: FotoVerite Date: Wed, 13 Aug 2014 16:53:15 -0400 Subject: Bump version to 1.1.0. --- Readme.md | 6 ++---- examples/js/faker.js | 42 ++++++++++++++++++++++++------------------ faker.js | 42 ++++++++++++++++++++++++------------------ minfaker.js | 10 +++++----- package.json | 2 +- 5 files changed, 56 insertions(+), 46 deletions(-) diff --git a/Readme.md b/Readme.md index 85b63942..2b2e528a 100644 --- a/Readme.md +++ b/Readme.md @@ -9,8 +9,6 @@ var randomCard = faker.Helpers.createCard(); // random contact card containing many properties ### node.js - -### installation - npm install faker ### usage var faker = require('./faker'); var randomName = faker.Name.findName(); // Rowan Nikolaus @@ -24,7 +22,7 @@ You can view a code coverage report generated in coverage/lcov-report/index.html. ## Authors ####Matthew Bergman & Marak Squires -Heavily inspired by Benjamin Curtis's Ruby Gem [faker](https://rubygems.org/gems/faker) and Perl's [Data::faker](http://search.cpan.org/~jasonk/Data-faker-0.07/lib/Data/faker.pm) +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)
Copyright (c) 2014 Matthew Bergman & Marak Squires http://github.com/marak/faker.js/
@@ -45,4 +43,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 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. +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/examples/js/faker.js b/examples/js/faker.js index 0aec2e79..1d78ac44 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 @ 1406060480799 *************** +/*************** AUTOGENERATED @ 1407963152187 *************** 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!!!! @@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; // exported module var faker = {}; -faker.version = "1.0.1"; +faker.version = "1.1.0"; faker.Name = {}; faker.Name.firstName = function () { return faker.random.first_name(); @@ -62,12 +62,12 @@ faker.Name.findName = function () { var r = faker.random.number(8); switch (r) { case 0: - return faker.random.name_prefix() + " " + this.firstName() + " " + this.lastName(); + return faker.random.name_prefix() + " " + _name.firstName() + " " + _name.lastName(); case 1: - return this.firstName() + " " + this.lastName() + " " + faker.random.name_suffix(); + return _name.firstName() + " " + _name.lastName() + " " + faker.random.name_suffix(); } - return this.firstName() + " " + this.lastName(); + return _name.firstName() + " " + _name.lastName(); }; faker.Address = {}; @@ -569,13 +569,12 @@ faker.Date.recent = function (days) { }; faker.random = {}; -faker.random.number = function (range) { - if(Array.isArray(range)) { - var min = range[0]; - var max = range[1]; - return Math.floor((Math.random() * max) + min); +faker.random.number = function (min, max) { + if (max === undefined) { + max = min; + min = 0; } - return Math.floor(Math.random() * range); + return Math.floor((Math.random() * max) + min); }; faker.random.array_element = function (array) { @@ -720,16 +719,23 @@ faker.definitions.avatar_uri = ["https://s3.amazonaws.com/uifaces/faces/twitter/ var definitions = faker.definitions; var Helpers = faker.Helpers; -if (typeof define == 'function'){ - define(function(){ - return faker; - }); + +if (typeof exports === 'object') { + // CommonJS + module.exports = faker; } -else if(typeof module !== 'undefined' && module.exports) { - module.exports = faker; +else if (typeof define === 'function' && define.amd) { + // AMD + define(function () { + return faker; + }); } else { - window.faker = faker; + // Global Variables +if (!window && this){ + window = this; + } + window.faker = faker; } }()); // end faker closure \ No newline at end of file diff --git a/faker.js b/faker.js index 0aec2e79..1d78ac44 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 @ 1406060480799 *************** +/*************** AUTOGENERATED @ 1407963152187 *************** 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!!!! @@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; // exported module var faker = {}; -faker.version = "1.0.1"; +faker.version = "1.1.0"; faker.Name = {}; faker.Name.firstName = function () { return faker.random.first_name(); @@ -62,12 +62,12 @@ faker.Name.findName = function () { var r = faker.random.number(8); switch (r) { case 0: - return faker.random.name_prefix() + " " + this.firstName() + " " + this.lastName(); + return faker.random.name_prefix() + " " + _name.firstName() + " " + _name.lastName(); case 1: - return this.firstName() + " " + this.lastName() + " " + faker.random.name_suffix(); + return _name.firstName() + " " + _name.lastName() + " " + faker.random.name_suffix(); } - return this.firstName() + " " + this.lastName(); + return _name.firstName() + " " + _name.lastName(); }; faker.Address = {}; @@ -569,13 +569,12 @@ faker.Date.recent = function (days) { }; faker.random = {}; -faker.random.number = function (range) { - if(Array.isArray(range)) { - var min = range[0]; - var max = range[1]; - return Math.floor((Math.random() * max) + min); +faker.random.number = function (min, max) { + if (max === undefined) { + max = min; + min = 0; } - return Math.floor(Math.random() * range); + return Math.floor((Math.random() * max) + min); }; faker.random.array_element = function (array) { @@ -720,16 +719,23 @@ faker.definitions.avatar_uri = ["https://s3.amazonaws.com/uifaces/faces/twitter/ var definitions = faker.definitions; var Helpers = faker.Helpers; -if (typeof define == 'function'){ - define(function(){ - return faker; - }); + +if (typeof exports === 'object') { + // CommonJS + module.exports = faker; } -else if(typeof module !== 'undefined' && module.exports) { - module.exports = faker; +else if (typeof define === 'function' && define.amd) { + // AMD + define(function () { + return faker; + }); } else { - window.faker = faker; + // Global Variables +if (!window && this){ + window = this; + } + window.faker = faker; } }()); // end faker closure \ No newline at end of file diff --git a/minfaker.js b/minfaker.js index a75ddd0b..c1e36d2e 100644 --- a/minfaker.js +++ b/minfaker.js @@ -1,5 +1,5 @@ -!function(){var a={version:"1.0.1",Name:{}};a.Name.firstName=function(){return a.random.first_name()};a.Name.firstNameFemale=function(){return a.random.first_name()};a.Name.firstNameMale=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 g.replaceSymbolWithNumber(a.random.array_element(["#####","#####-####"]))};a.Address.zipCodeFormat=function(a){return g.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(); +!function(){var a={version:"1.1.0",Name:{}};a.Name.firstName=function(){return a.random.first_name()};a.Name.firstNameFemale=function(){return a.random.first_name()};a.Name.firstNameMale=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()+" "+_name.firstName()+" "+_name.lastName();case 1:return _name.firstName()+" "+_name.lastName()+" "+a.random.name_suffix()}return _name.firstName()+ +" "+_name.lastName()};a.Address={};a.Address.zipCode=function(){return g.replaceSymbolWithNumber(a.random.array_element(["#####","#####-####"]))};a.Address.zipCodeFormat=function(a){return g.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=g.replaceSymbolWithNumber("#####")+" "+this.streetName();break;case 1:b=g.replaceSymbolWithNumber("####")+" "+this.streetName();break; case 2:b=g.replaceSymbolWithNumber("###")+" "+this.streetName()}return c?b+" "+this.secondaryAddress():b};a.Address.secondaryAddress=function(){return g.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 g.replaceSymbolWithNumber(a.random.phone_formats())};a.PhoneNumber.phoneNumberFormat=function(a){return g.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= @@ -14,8 +14,8 @@ email:a.Internet.email(),address:{streetA:a.Address.streetName(),streetB:a.Addre posts:[{words:a.Lorem.words(),sentence:a.Lorem.sentence(),sentences:a.Lorem.sentences(),paragraph:a.Lorem.paragraph()},{words:a.Lorem.words(),sentence:a.Lorem.sentence(),sentences:a.Lorem.sentences(),paragraph:a.Lorem.paragraph()},{words:a.Lorem.words(),sentence:a.Lorem.sentence(),sentences:a.Lorem.sentences(),paragraph:a.Lorem.paragraph()}]}};a.Helpers.userCard=function(){return{name:a.Name.findName(),username:a.Internet.userName(),email:a.Internet.email(),address:{street:a.Address.streetName(!0), suite:a.Address.secondaryAddress(),city:a.Address.city(),zipcode:a.Address.zipCode(),geo:{lat:a.Address.latitude(),lng:a.Address.longitude()}},phone:a.PhoneNumber.phoneNumber(),website:a.Internet.domainName(),company:{name:a.Company.companyName(),catchPhrase:a.Company.catchPhrase(),bs:a.Company.bs()}}};a.Tree={};a.Tree.clone=function(a){if(null==a||"object"!=typeof a)return a;var b=a.constructor(),e;for(e in a)b[e]=this.clone(a[e]);return b};a.Tree.createTree=function(a,b,e){if(!e)throw{name:"ObjectError", message:"there needs to be an object passed in"};if(0>=b)throw{name:"TreeParamError",message:"width must be greater than zero"};var f=this.clone(e),d;for(d in f)if(f.hasOwnProperty(d)){var g=null;if("__RECURSE__"!==f[d])g=eval(f[d]);else if(0!==a)for(var g=[],h=1,h="function"==typeof b?b():b,k=0;k", "Matthew Bergman " -- cgit v1.2.3