From 634be943b8ab0da2b8c91e5197caaaa846bd0ec0 Mon Sep 17 00:00:00 2001 From: Patryk Date: Fri, 23 Oct 2020 09:48:53 +0200 Subject: [PATCH] Revert "Allow disabling the usage of open compounds in sentences (#2109)" This reverts commit 5cbb62eb9a8f769fa5b3ed9caaa28857beb0a660. --- doc/books/lovecraft.md | 3 +-- doc/default/hipster.md | 4 +--- lib/faker/books/lovecraft.rb | 8 ++------ lib/faker/default/hipster.rb | 9 +++------ test/faker/books/test_lovecraft.rb | 15 --------------- test/faker/default/test_faker_hipster.rb | 15 --------------- 6 files changed, 7 insertions(+), 47 deletions(-) diff --git a/doc/books/lovecraft.md b/doc/books/lovecraft.md index 9a880d7bbb..a6451f7997 100644 --- a/doc/books/lovecraft.md +++ b/doc/books/lovecraft.md @@ -12,11 +12,10 @@ Faker::Books::Lovecraft.location #=> "Kingsport" Faker::Books::Lovecraft.word #=> "furtive" -# Keyword arguments: word_count, random_words_to_add, open_compounds_allowed +# Keyword arguments: word_count, random_words_to_add Faker::Books::Lovecraft.sentence #=> "Furtive antiquarian squamous dank cat loathsome amorphous lurk." Faker::Books::Lovecraft.sentence(word_count: 3) #=> "Daemoniac antediluvian fainted squamous comprehension gambrel nameless singular." Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 1) #=> "Amorphous indescribable tenebrous." -Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 0, open_compounds_allowed: true) #=> "Effulgence unmentionable gambrel." # Keyword arguments: number, spaces_allowed Faker::Books::Lovecraft.words #=> ["manuscript", "abnormal", "singular"] diff --git a/doc/default/hipster.md b/doc/default/hipster.md index e35adcbc4c..4681927c04 100644 --- a/doc/default/hipster.md +++ b/doc/default/hipster.md @@ -11,14 +11,12 @@ Faker::Hipster.words(number: 4) #=> ["ugh", "cardigan", "poutine", "stumptown"] Faker::Hipster.words(number: 4, supplemental: true) #=> ["iste", "seitan", "normcore", "provident"] Faker::Hipster.words(number: 4, supplemental: true, spaces_allowed: true) #=> ["qui", "magni", "craft beer", "est"] -# Keyword arguments: word_count, supplemental, random_words_to_add, open_compounds_allowed +# Keyword arguments: word_count, supplemental, random_words_to_add Faker::Hipster.sentence #=> "Park iphone leggings put a bird on it." Faker::Hipster.sentence(word_count: 3) #=> "Pour-over swag godard." Faker::Hipster.sentence(word_count: 3, supplemental: true) #=> "Beard laboriosam sequi celiac." Faker::Hipster.sentence(word_count: 3, supplemental: false, random_words_to_add: 4) #=> "Bitters retro mustache aesthetic biodiesel 8-bit." Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 4) #=> "Occaecati deleniti messenger bag meh crucifix autem." -Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 0, open_compounds_allowed: true) #=> "Kale chips nihil eos." -Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 0, open_compounds_allowed: false) #=> "Dreamcatcher umami fixie." # Keyword arguments: number, supplemental Faker::Hipster.sentences #=> ["Godard pitchfork vinegar chillwave everyday 90's whatever.", "Pour-over artisan distillery street waistcoat.", "Salvia yr leggings franzen blue bottle."] diff --git a/lib/faker/books/lovecraft.rb b/lib/faker/books/lovecraft.rb index 35d9e24e81..f506e1529e 100644 --- a/lib/faker/books/lovecraft.rb +++ b/lib/faker/books/lovecraft.rb @@ -68,7 +68,6 @@ def tome # # @param word_count [Integer] The number of words to have in the sentence # @param random_words_to_add [Integer] - # @param open_compounds_allowed [Boolean] If true, generated sentence can contain words having additional spaces # # @return [String] # @@ -81,18 +80,15 @@ def tome # @example # Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 1) # #=> "Amorphous indescribable tenebrous." - # @example - # Faker::Books::Lovecraft.sentence(word_count: 3, random_words_to_add: 0, open_compounds_allowed: true) - # #=> "Effulgence unmentionable gambrel." # # @faker.version 1.9.3 - def sentence(legacy_word_count = NOT_GIVEN, legacy_random_words_to_add = NOT_GIVEN, word_count: 4, random_words_to_add: 6, open_compounds_allowed: true) + def sentence(legacy_word_count = NOT_GIVEN, legacy_random_words_to_add = NOT_GIVEN, word_count: 4, random_words_to_add: 6) warn_for_deprecated_arguments do |keywords| keywords << :word_count if legacy_word_count != NOT_GIVEN keywords << :random_words_to_add if legacy_random_words_to_add != NOT_GIVEN end - words(number: word_count + rand(random_words_to_add.to_i).to_i, spaces_allowed: open_compounds_allowed).join(' ').capitalize + '.' + words(number: word_count + rand(random_words_to_add.to_i).to_i, spaces_allowed: true).join(' ').capitalize + '.' end ## diff --git a/lib/faker/default/hipster.rb b/lib/faker/default/hipster.rb index 0376d01ebc..37e3c4e4c6 100644 --- a/lib/faker/default/hipster.rb +++ b/lib/faker/default/hipster.rb @@ -59,8 +59,7 @@ def words(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, legacy_spa # # @param word_count [Integer] Specifies the number of words in the sentence # @param supplemental [Boolean] Specifies if the words are supplemental - # @param random_words_to_add [Integer] Specifies the number of random words to add - # @param open_compounds_allowed [Boolean] Specifies if the generated sentence can contain words having additional spaces + # @param random_words_to_add [Boolean] Specifies the number of random words to add # @return [String] # # @example @@ -69,12 +68,10 @@ def words(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, legacy_spa # Faker::Hipster.sentence(word_count: 3, supplemental: true) #=> "Beard laboriosam sequi celiac." # Faker::Hipster.sentence(word_count: 3, supplemental: false, random_words_to_add: 4) #=> "Bitters retro mustache aesthetic biodiesel 8-bit." # Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 4) #=> "Occaecati deleniti messenger bag meh crucifix autem." - # Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 0, open_compounds_allowed: true) #=> "Kale chips nihil eos." - # Faker::Hipster.sentence(word_count: 3, supplemental: true, random_words_to_add: 0, open_compounds_allowed: false) #=> "Dreamcatcher umami fixie." # # @faker.version 1.6.0 # rubocop:disable Metrics/ParameterLists - def sentence(legacy_word_count = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, legacy_random_words_to_add = NOT_GIVEN, word_count: 4, supplemental: false, random_words_to_add: 6, open_compounds_allowed: true) + def sentence(legacy_word_count = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, legacy_random_words_to_add = NOT_GIVEN, word_count: 4, supplemental: false, random_words_to_add: 6) # rubocop:enable Metrics/ParameterLists warn_for_deprecated_arguments do |keywords| keywords << :word_count if legacy_word_count != NOT_GIVEN @@ -82,7 +79,7 @@ def sentence(legacy_word_count = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, leg keywords << :random_words_to_add if legacy_random_words_to_add != NOT_GIVEN end - words(number: word_count + rand(random_words_to_add.to_i).to_i, supplemental: supplemental, spaces_allowed: open_compounds_allowed).join(' ').capitalize + '.' + words(number: word_count + rand(random_words_to_add.to_i).to_i, supplemental: supplemental, spaces_allowed: true).join(' ').capitalize + '.' end ## diff --git a/test/faker/books/test_lovecraft.rb b/test/faker/books/test_lovecraft.rb index e9ab8ff6b0..eab9650120 100644 --- a/test/faker/books/test_lovecraft.rb +++ b/test/faker/books/test_lovecraft.rb @@ -66,21 +66,6 @@ def test_words_with_large_count_params assert(array.length == 250 || array.length == 500) end - def test_sentence_with_open_compounds_allowed - 1000.times do - sentence = @tester.sentence(word_count: 5, random_words_to_add: 0, open_compounds_allowed: true) - assert(sentence.split.length >= 5) - end - end - - # Sentence should not contain any open compounds - def test_sentence_without_open_compounds_allowed - 1000.times do - sentence = @tester.sentence(word_count: 5, random_words_to_add: 0, open_compounds_allowed: false) - assert(sentence.split.length == 5) - end - end - def test_paragraph_char_count paragraph = @tester.paragraph_by_chars assert(paragraph.length == 256) diff --git a/test/faker/default/test_faker_hipster.rb b/test/faker/default/test_faker_hipster.rb index f66d3327f7..c73faa73a7 100644 --- a/test/faker/default/test_faker_hipster.rb +++ b/test/faker/default/test_faker_hipster.rb @@ -77,21 +77,6 @@ def test_words_with_large_count_params assert(array.length == 250 || array.length == 500) end - def test_sentence_with_open_compounds_allowed - 1000.times do - sentence = @tester.sentence(word_count: 5, random_words_to_add: 0, open_compounds_allowed: true) - assert(sentence.split.length >= 5) - end - end - - # Sentence should not contain any open compounds - def test_sentence_without_open_compounds_allowed - 1000.times do - sentence = @tester.sentence(word_count: 5, random_words_to_add: 0, open_compounds_allowed: false) - assert(sentence.split.length == 5) - end - end - def test_paragraph_char_count paragraph = @tester.paragraph_by_chars(characters: 256) assert(paragraph.length == 256)