From 2907c27ca9cf3657188470094a689decda3df65a Mon Sep 17 00:00:00 2001 From: Marak Date: Sat, 4 Jul 2015 23:42:43 -0700 Subject: [api] [fix] Remove tabs from paragraph generation. Make paragraph separator configurable. Closes #223 --- lib/lorem.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'lib/lorem.js') diff --git a/lib/lorem.js b/lib/lorem.js index aaea46f9..eb4d72d5 100644 --- a/lib/lorem.js +++ b/lib/lorem.js @@ -21,7 +21,7 @@ var lorem = { if (typeof sentenceCount == 'undefined') { sentenceCount = 3; } var sentences = []; for (sentenceCount; sentenceCount > 0; sentenceCount--) { - sentences.push(faker.lorem.sentence()); + sentences.push(faker.lorem.sentence()); } return sentences.join("\n"); }, @@ -31,13 +31,16 @@ var lorem = { return faker.lorem.sentences(sentenceCount + faker.random.number(3)); }, - paragraphs: function (paragraphCount) { - if (typeof paragraphCount == 'undefined') { paragraphCount = 3; } - var paragraphs = []; - for (paragraphCount; paragraphCount > 0; paragraphCount--) { - paragraphs.push(faker.lorem.paragraph()); - } - return paragraphs.join("\n \r\t"); + paragraphs: function (paragraphCount, separator) { + if (typeof separator === "undefined") { + separator = "\n \r"; + } + if (typeof paragraphCount == 'undefined') { paragraphCount = 3; } + var paragraphs = []; + for (paragraphCount; paragraphCount > 0; paragraphCount--) { + paragraphs.push(faker.lorem.paragraph()); + } + return paragraphs.join(separator); } }; -- cgit v1.2.3 From eaf5c65cfae0a6636555884c18e6c955fae7887e Mon Sep 17 00:00:00 2001 From: Marak Date: Tue, 7 Jul 2015 16:22:50 -0700 Subject: [refactor] [dist] Allow for node to require individual locales ( to avoid the default behavior of requiring all locale data. #125 #167 --- lib/lorem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/lorem.js') diff --git a/lib/lorem.js b/lib/lorem.js index eb4d72d5..54a28998 100644 --- a/lib/lorem.js +++ b/lib/lorem.js @@ -1,4 +1,4 @@ -var faker = require('../index'); +var faker = require('./index'); var Helpers = require('./helpers'); var lorem = { -- cgit v1.2.3 From e25e1ebc349c426c6b2598dc907eae497ef67160 Mon Sep 17 00:00:00 2001 From: Marak Date: Wed, 8 Jul 2015 14:34:39 -0700 Subject: [refactor] [major] Adds incremental browser builds. Switch to using prototype for internal API. Previous usage of `module.parent` is not acceptable. Locale information is now passed into Faker constructor. Closes #125 --- lib/lorem.js | 90 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) (limited to 'lib/lorem.js') diff --git a/lib/lorem.js b/lib/lorem.js index 54a28998..f5d50d73 100644 --- a/lib/lorem.js +++ b/lib/lorem.js @@ -1,47 +1,51 @@ -var faker = require('./index'); -var Helpers = require('./helpers'); - -var lorem = { - words: function (num) { - if (typeof num == 'undefined') { num = 3; } - return Helpers.shuffle(faker.definitions.lorem.words).slice(0, num); - }, - - sentence: function (wordCount, range) { - if (typeof wordCount == 'undefined') { wordCount = 3; } - if (typeof range == 'undefined') { range = 7; } - - // strange issue with the node_min_test failing for captialize, please fix and add faker.lorem.back - //return faker.lorem.words(wordCount + Helpers.randomNumber(range)).join(' ').capitalize(); - - return faker.lorem.words(wordCount + faker.random.number(range)).join(' '); - }, - - sentences: function (sentenceCount) { - if (typeof sentenceCount == 'undefined') { sentenceCount = 3; } - var sentences = []; - for (sentenceCount; sentenceCount > 0; sentenceCount--) { - sentences.push(faker.lorem.sentence()); - } - return sentences.join("\n"); - }, - - paragraph: function (sentenceCount) { - if (typeof sentenceCount == 'undefined') { sentenceCount = 3; } - return faker.lorem.sentences(sentenceCount + faker.random.number(3)); - }, - - paragraphs: function (paragraphCount, separator) { - if (typeof separator === "undefined") { - separator = "\n \r"; - } - if (typeof paragraphCount == 'undefined') { paragraphCount = 3; } - var paragraphs = []; - for (paragraphCount; paragraphCount > 0; paragraphCount--) { - paragraphs.push(faker.lorem.paragraph()); + +var Lorem = function (faker) { + var self = this; + var Helpers = faker.helpers; + + self.words = function (num) { + if (typeof num == 'undefined') { num = 3; } + return Helpers.shuffle(faker.definitions.lorem.words).slice(0, num); + }; + + self.sentence = function (wordCount, range) { + if (typeof wordCount == 'undefined') { wordCount = 3; } + if (typeof range == 'undefined') { range = 7; } + + // strange issue with the node_min_test failing for captialize, please fix and add faker.lorem.back + //return faker.lorem.words(wordCount + Helpers.randomNumber(range)).join(' ').capitalize(); + + return faker.lorem.words(wordCount + faker.random.number(range)).join(' '); + }; + + self.sentences = function (sentenceCount) { + if (typeof sentenceCount == 'undefined') { sentenceCount = 3; } + var sentences = []; + for (sentenceCount; sentenceCount > 0; sentenceCount--) { + sentences.push(faker.lorem.sentence()); } - return paragraphs.join(separator); + return sentences.join("\n"); + }; + + self.paragraph = function (sentenceCount) { + if (typeof sentenceCount == 'undefined') { sentenceCount = 3; } + return faker.lorem.sentences(sentenceCount + faker.random.number(3)); + }; + + self.paragraphs = function (paragraphCount, separator) { + if (typeof separator === "undefined") { + separator = "\n \r"; } + if (typeof paragraphCount == 'undefined') { paragraphCount = 3; } + var paragraphs = []; + for (paragraphCount; paragraphCount > 0; paragraphCount--) { + paragraphs.push(faker.lorem.paragraph()); + } + return paragraphs.join(separator); + } + + return self; }; -module.exports = lorem; + +module["exports"] = Lorem; -- cgit v1.2.3 From 95a467a8bd23ceb623c59344ae89e070ab695e28 Mon Sep 17 00:00:00 2001 From: Brandon Dail Date: Wed, 15 Jul 2015 15:22:03 -0500 Subject: fixed sentence formatting sentences now start with a capital letter and and with a period. --- lib/lorem.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/lorem.js') diff --git a/lib/lorem.js b/lib/lorem.js index f5d50d73..cf7089ac 100644 --- a/lib/lorem.js +++ b/lib/lorem.js @@ -15,7 +15,8 @@ var Lorem = function (faker) { // strange issue with the node_min_test failing for captialize, please fix and add faker.lorem.back //return faker.lorem.words(wordCount + Helpers.randomNumber(range)).join(' ').capitalize(); - return faker.lorem.words(wordCount + faker.random.number(range)).join(' '); + var sentence = faker.lorem.words(wordCount + faker.random.number(range)).join(' '); + return sentence.charAt(0).toUpperCase() + sentence.slice(1) + '.'; }; self.sentences = function (sentenceCount) { -- cgit v1.2.3