faker 2.13.0 → 3.8.0

data/lib/faker/default/lorem.rb

@@ -4,27 +4,61 @@ module Faker
   # Based on Perl's Text::Lorem
   class Lorem < Base
     class << self
-      def word
-        sample(translate('faker.lorem.words'))
+      ##
+      # Returs the random word
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.word   #=> "soluto"
+      #   Faker::Lorem.word(exclude_words: 'error') #=> "nisi"
+      #   Faker::Lorem.word(exclude_words: 'id, error') #=> "et"
+      #   Faker::Lorem.word(exclude_words: ['id', 'error']) #=> "consequatur"
+      #
+      # @faker.version 2.1.3
+      def word(exclude_words: nil)
+        words(number: 1, exclude_words: exclude_words).first
       end
 
-      def words(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, number: 3, supplemental: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-        end
-
+      ##
+      # Generates random 3 words
+      #
+      # @param number [Integer] Number of words to be generated
+      # @param supplemental [Boolean] Whether to attach supplemental words at the end, default is false
+      #
+      # @return [Array] Array for words
+      #
+      # @example
+      #   Faker::Lorem.words                                    #=> ["hic", "quia", "nihil"]
+      #   Faker::Lorem.words(number: 4)                         #=> ["est", "temporibus", "et", "quaerat"]
+      #   Faker::Lorem.words(number: 4, supplemental: true)    #=> ["nisi", "sit", "allatus", "consequatur"]
+      #   Faker::Lorem.words(number: 4, supplemental: true, exclude_words: 'sit') #=> ["nisi", "allatus", "consequatur", "aut"]
+      #
+      # @faker.version 2.1.3
+      def words(number: 3, supplemental: false, exclude_words: nil)
         resolved_num = resolve(number)
         word_list = (
           translate('faker.lorem.words') +
           (supplemental ? translate('faker.lorem.supplemental') : [])
         )
+        if exclude_words
+          exclude_words = exclude_words.split(', ') if exclude_words.instance_of?(::String)
+          word_list -= exclude_words
+        end
         word_list *= ((resolved_num / word_list.length) + 1)
-        shuffle(word_list)[0, resolved_num]
+        sample(word_list, resolved_num)
       end
 
+      ##
+      # Generates single character
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.character    #=> "e"
+      #
+      # @faker.version 2.1.3
       def character
-        sample(Types::CHARACTERS)
+        sample(Faker::Types::CHARACTERS)
       end
 
       ##
@@ -43,94 +77,162 @@ module Faker
       #   Faker::Lorem.characters(number: 10, min_alpha: 4, min_numeric: 1) #=> "ang9cbhoa8"
       #
       # @faker.version 2.1.3
-      def characters(legacy_number = NOT_GIVEN, number: 255, min_alpha: 0, min_numeric: 0)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-        end
-
-        Alphanumeric.alphanumeric(number: number, min_alpha: min_alpha, min_numeric: min_numeric)
+      def characters(number: 255, min_alpha: 0, min_numeric: 0)
+        Faker::Alphanumeric.alphanumeric(number: number, min_alpha: min_alpha, min_numeric: min_numeric)
       end
 
+      ##
+      # Generates the emoji
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.multibyte  #=> "😀"
+      #   Faker::Lorem.multibyte  #=> "❤"
+      #
+      # @faker.version 2.1.3
       def multibyte
         sample(translate('faker.lorem.multibyte')).pack('C*').force_encoding('utf-8')
       end
 
-      # 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: 0)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :word_count if legacy_word_count != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != 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), supplemental: supplemental).join(locale_space).capitalize + locale_period
+      ##
+      # Generates sentence
+      #
+      # @param word_count [Integer] How many words should be there in a sentence, default to 4
+      # @param supplemental [Boolean] Add supplemental words, default to false
+      # @param random_words_to_add [Integer] Add any random words, default to 0
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.sentence                                                             #=> "Magnam qui aut quidem."
+      #   Faker::Lorem.sentence(word_count: 5)                                              #=> "Voluptas rerum aut aliquam velit."
+      #   Faker::Lorem.sentence(word_count: 5, supplemental: true)                          #=> "Aut viscus curtus votum iusto."
+      #   Faker::Lorem.sentence(word_count: 5, supplemental: true, random_words_to_add:2)   #=> "Crinis quo cruentus velit animi vomer."
+      #
+      # @faker.version 2.1.3
+      def sentence(word_count: 4, supplemental: false, random_words_to_add: 0, exclude_words: nil)
+        words(number: word_count + rand(random_words_to_add.to_i), supplemental: supplemental, exclude_words: exclude_words).join(locale_space).capitalize + locale_period
       end
 
-      def sentences(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, number: 3, supplemental: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-        end
-
-        1.upto(resolve(number)).collect { sentence(word_count: 3, supplemental: supplemental) }
+      ##
+      # Generates three sentences
+      #
+      # @param number [Integer] How many sentences to be generated, default to 3
+      # @param supplemental [Boolean] Should add supplemental words, defaults to false
+      #
+      # @return [Array] Returns array for sentences.
+      #
+      # @example
+      #   Faker::Lorem.sentences                                  #=> ["Possimus non tenetur.", "Nulla non excepturi.", "Quisquam rerum facilis."]
+      #   Faker::Lorem.sentences(number: 2)                       #=> ["Nulla est natus.", "Perferendis autem cum."]
+      #   Faker::Lorem.sentences(number: 2, supplemental: true)   #=> ["Cito cena ad.", "Solvo animus allatus."]
+      #
+      # @faker.version 2.1.3
+      def sentences(number: 3, supplemental: false, exclude_words: nil)
+        1.upto(resolve(number)).collect { sentence(word_count: 3, supplemental: supplemental, exclude_words: exclude_words) }
       end
 
-      # rubocop:disable Metrics/ParameterLists
-      def paragraph(legacy_sentence_count = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, legacy_random_sentences_to_add = NOT_GIVEN, sentence_count: 3, supplemental: false, random_sentences_to_add: 0)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :sentence_count if legacy_sentence_count != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-          keywords << :random_sentences_to_add if legacy_random_sentences_to_add != NOT_GIVEN
-        end
-
-        sentences(number: resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental: supplemental).join(locale_space)
+      ##
+      # Generates three sentence paragraph
+      #
+      # @param sentence_count [Integer] Number of sentences in the paragraph
+      # @param supplemental [Boolean]
+      # @param random_sentences_to_add [Integer]
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.paragraph
+      #     #=> "Impedit et est. Aliquid deleniti necessitatibus. Et aspernatur minima."
+      #   Faker::Lorem.paragraph(sentence_count: 2)
+      #     #=> "Rerum fugit vitae. Et atque autem."
+      #   Faker::Lorem.paragraph(sentence_count: 2, supplemental: true)
+      #     #=> "Terreo coerceo utor. Vester sunt cogito."
+      #   Faker::Lorem.paragraph(sentence_count: 2, supplemental: true, random_sentences_to_add: 2)
+      #     #=> "Texo tantillus tamisium. Tribuo amissio tamisium. Facere aut canis."
+      #
+      # @faker.version 2.1.3
+      def paragraph(sentence_count: 3, supplemental: false, random_sentences_to_add: 0, exclude_words: nil)
+        sentences(number: resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental: supplemental, exclude_words: exclude_words).join(locale_space)
       end
 
-      def paragraphs(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, number: 3, supplemental: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-        end
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-        end
-
-        1.upto(resolve(number)).collect { paragraph(sentence_count: 3, supplemental: supplemental) }
+      ##
+      # Generates three paragraphs
+      #
+      # @param number [Integer]
+      # @param supplemental [Boolean]
+      #
+      # @return [Array]
+      #
+      # @example
+      #   Faker::Lorem.paragraphs
+      #   Faker::Lorem.paragraphs(number:2)
+      #   Faker::Lorem.paragraphs(number:2, supplemental: true)
+      #
+      # @faker.version 2.1.3
+      def paragraphs(number: 3, supplemental: false, exclude_words: nil)
+        1.upto(resolve(number)).collect { paragraph(sentence_count: 3, supplemental: supplemental, exclude_words: exclude_words) }
       end
 
-      def paragraph_by_chars(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, number: 256, supplemental: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-        end
-
+      ##
+      # Generates paragraph with 256 characters
+      #
+      # @param number [Integer]
+      # @param supplemental [Boolean]
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.paragraph_by_chars
+      #   Faker::Lorem.paragraph_by_chars(number: 20)                       #=> "Sit modi alias. Imp."
+      #   Faker::Lorem.paragraph_by_chars(number: 20, supplemental: true)   #=> "Certus aveho admove."
+      #
+      # @faker.version 2.1.3
+      def paragraph_by_chars(number: 256, supplemental: false)
         paragraph = paragraph(sentence_count: 3, supplemental: supplemental)
 
-        paragraph += ' ' + paragraph(sentence_count: 3, supplemental: supplemental) while paragraph.length < number
+        paragraph += " #{paragraph(sentence_count: 3, supplemental: supplemental)}" while paragraph.length < number
 
-        paragraph[0...number - 1] + '.'
+        "#{paragraph[0...(number - 1)]}."
       end
 
-      # rubocop:disable Metrics/ParameterLists
-      def question(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: 0)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :word_count if legacy_word_count != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != 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), supplemental: supplemental).join(' ').capitalize + locale_question_mark
+      ##
+      # Returns the question with 4 words
+      #
+      # @param word_count [Integer]
+      # @param supplemental [Boolean]
+      # @param random_words_to_add [Integer]
+      #
+      # @return [String]
+      #
+      # @example
+      #   Faker::Lorem.question                                                               #=> "Natus deleniti sequi laudantium?"
+      #   Faker::Lorem.question(word_count: 2)                                                #=> "Quo ut?"
+      #   Faker::Lorem.question(word_count: 2, supplemental: true)                            #=> "Terga consequatur?"
+      #   Faker::Lorem.question(word_count: 2, supplemental: true, random_words_to_add: 2)    #=> "Depulso uter ut?"
+      #
+      # @faker.version 2.1.3
+      def question(word_count: 4, supplemental: false, random_words_to_add: 0, exclude_words: nil)
+        words(number: word_count + rand(random_words_to_add), supplemental: supplemental, exclude_words: exclude_words).join(' ').capitalize + locale_question_mark
       end
 
-      def questions(legacy_number = NOT_GIVEN, legacy_supplemental = NOT_GIVEN, number: 3, supplemental: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-          keywords << :supplemental if legacy_supplemental != NOT_GIVEN
-        end
-
-        1.upto(resolve(number)).collect { question(word_count: 3, supplemental: supplemental) }
+      ##
+      # Generates array of three questions
+      #
+      # @param number [Integer]
+      # @param supplemental [Boolean]
+      #
+      # @return [Array]
+      #
+      # @example
+      #   Faker::Lorem.questions                                  #=> ["Amet culpa enim?", "Voluptatem deleniti numquam?", "Veniam non cum?"]
+      #   Faker::Lorem.questions(number: 2)                       #=> ["Minus occaecati nobis?", "Veniam et alias?"]
+      #   Faker::Lorem.questions(number: 2, supplemental: true)   #=> ["Acceptus subito cetera?", "Aro sulum cubicularis?"]
+      #
+      # @faker.version 2.1.3
+      def questions(number: 3, supplemental: false, exclude_words: nil)
+        1.upto(resolve(number)).collect { question(word_count: 3, supplemental: supplemental, exclude_words: exclude_words) }
       end
 
       private

data/lib/faker/default/lorem_flickr.rb

@@ -21,15 +21,7 @@ module Faker
       #   Faker::LoremFlickr.image(size: "50x60", search_terms: ['sports', 'fitness'], match_all: true) #=> "https://loremflickr.com/50/60/sports,fitness/all"
       #
       # @faker.version 1.9.0
-      # rubocop:disable Metrics/ParameterLists
-      def image(legacy_size = NOT_GIVEN, legacy_search_terms = NOT_GIVEN, legacy_match_all = NOT_GIVEN, size: '300x300', search_terms: [], match_all: false)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :size if legacy_size != NOT_GIVEN
-          keywords << :search_terms if legacy_search_terms != NOT_GIVEN
-          keywords << :match_all if legacy_match_all != NOT_GIVEN
-        end
-
+      def image(size: '300x300', search_terms: [], match_all: false)
         build_url(size, nil, search_terms, match_all)
       end
 
@@ -49,15 +41,7 @@ module Faker
       #   Faker::LoremFlickr.grayscale_image(size: "50x60", search_terms: ['sports', 'fitness'], match_all: true) #=> "https://loremflickr.com/g/50/60/sports,fitness/all"
       #
       # @faker.version 1.9.0
-      # rubocop:disable Metrics/ParameterLists
-      def grayscale_image(legacy_size = NOT_GIVEN, legacy_search_terms = NOT_GIVEN, legacy_match_all = NOT_GIVEN, size: '300x300', search_terms: ['all'], match_all: false)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :size if legacy_size != NOT_GIVEN
-          keywords << :search_terms if legacy_search_terms != NOT_GIVEN
-          keywords << :match_all if legacy_match_all != NOT_GIVEN
-        end
-
+      def grayscale_image(size: '300x300', search_terms: ['all'], match_all: false)
         raise ArgumentError, 'Search terms must be specified for grayscale images' unless search_terms.any?
 
         build_url(size, 'g', search_terms, match_all)
@@ -79,15 +63,7 @@ module Faker
       #   Faker::LoremFlickr.pixelated_image(size: "50x60", search_terms: ['sports', 'fitness'], match_all: true) #=> "https://loremflickr.com/p/50/60/sports,fitness/all"
       #
       # @faker.version 1.9.0
-      # rubocop:disable Metrics/ParameterLists
-      def pixelated_image(legacy_size = NOT_GIVEN, legacy_search_terms = NOT_GIVEN, legacy_match_all = NOT_GIVEN, size: '300x300', search_terms: ['all'], match_all: false)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :size if legacy_size != NOT_GIVEN
-          keywords << :search_terms if legacy_search_terms != NOT_GIVEN
-          keywords << :match_all if legacy_match_all != NOT_GIVEN
-        end
-
+      def pixelated_image(size: '300x300', search_terms: ['all'], match_all: false)
         raise ArgumentError, 'Search terms must be specified for pixelated images' unless search_terms.any?
 
         build_url(size, 'p', search_terms, match_all)
@@ -110,16 +86,7 @@ module Faker
       #   Faker::LoremFlickr.image(size: "50x60", color: 'blue', search_terms: ['sports', 'fitness'], match_all: true) #=> "https://loremflickr.com/blue/50/60/sports,fitness/all"
       #
       # @faker.version 1.9.0
-      # rubocop:disable Metrics/ParameterLists
-      def colorized_image(legacy_size = NOT_GIVEN, legacy_color = NOT_GIVEN, legacy_search_terms = NOT_GIVEN, legacy_match_all = NOT_GIVEN, size: '300x300', color: 'red', search_terms: ['all'], match_all: false)
-        # rubocop:enable Metrics/ParameterLists
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :size if legacy_size != NOT_GIVEN
-          keywords << :color if legacy_color != NOT_GIVEN
-          keywords << :search_terms if legacy_search_terms != NOT_GIVEN
-          keywords << :match_all if legacy_match_all != NOT_GIVEN
-        end
-
+      def colorized_image(size: '300x300', color: 'red', search_terms: ['all'], match_all: false)
         raise ArgumentError, 'Search terms must be specified for colorized images' unless search_terms.any?
         raise ArgumentError, "Supported colorizations are #{SUPPORTED_COLORIZATIONS.join(', ')}" unless SUPPORTED_COLORIZATIONS.include?(color)
 
@@ -129,7 +96,7 @@ module Faker
       private
 
       def build_url(size, format, search_terms, match_all)
-        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /^[0-9]+x[0-9]+$/
+        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /\A[0-9]+x[0-9]+\z/
 
         url_parts = ['https://loremflickr.com']
         url_parts << format

data/lib/faker/default/markdown.rb

@@ -13,7 +13,7 @@ module Faker
       #
       # @faker.version 1.8.0
       def headers
-        "#{fetch('markdown.headers')} #{Lorem.word.capitalize}"
+        "#{fetch('markdown.headers')} #{Faker::Lorem.word.capitalize}"
       end
 
       ##
@@ -27,8 +27,8 @@ module Faker
       # @faker.version 1.8.0
       def emphasis
         paragraph = Faker::Lorem.paragraph(sentence_count: 3)
-        words = paragraph.split(' ')
-        position = rand(0..words.length - 1)
+        words = paragraph.split
+        position = rand(0..(words.length - 1))
         formatting = fetch('markdown.emphasis')
         words[position] = "#{formatting}#{words[position]}#{formatting}"
         words.join(' ')
@@ -50,7 +50,7 @@ module Faker
         number.times do |i|
           result << "#{i}. #{Faker::Lorem.sentence(word_count: 1)} \n"
         end
-        result.join('')
+        result.join
       end
 
       ##
@@ -69,7 +69,7 @@ module Faker
         number.times do |_i|
           result << "* #{Faker::Lorem.sentence(word_count: 1)} \n"
         end
-        result.join('')
+        result.join
       end
 
       ##
@@ -95,7 +95,7 @@ module Faker
       #
       # @faker.version 1.8.0
       def block_code
-        "```ruby\n#{Lorem.sentence(word_count: 1)}\n```"
+        "```ruby\n#{Faker::Lorem.sentence(word_count: 1)}\n```"
       end
 
       ##
@@ -110,16 +110,18 @@ module Faker
       def table
         table = []
         3.times do
-          table << "#{Lorem.word} | #{Lorem.word} | #{Lorem.word}"
+          table << "#{Faker::Lorem.word} | #{Faker::Lorem.word} | #{Faker::Lorem.word}"
         end
         table.insert(1, '---- | ---- | ----')
         table.join("\n")
       end
 
       ##
-      # Produces a random method from the methods above or the methods listed in the arguments.
+      # Produces a random method from the methods above, excluding the methods listed in the arguments.
+      #
+      # @overload random(methods)
+      #   @param methods [Symbol] Specify which methods to exclude.
       #
-      # @param methods [Symbol] Specify which methods to use.
       # @return [String, Array<String>]
       #
       # @example
@@ -131,7 +133,7 @@ module Faker
       def random(*args)
         method_list = available_methods
         args&.each { |ex| method_list.delete_if { |meth| meth == ex.to_sym } }
-        send(method_list[rand(0..method_list.length - 1)])
+        send(method_list[Faker::Config.random.rand(0..(method_list.length - 1))])
       end
 
       ##
@@ -148,12 +150,7 @@ module Faker
       #   Faker::Markdown.sandwich(sentences: 6, repeat: 3) #=> returns newline separated content of 1 header, and then 3 sections consisting of, here, 1 6-sentence lorem paragraph and 1 random markdown element. The random markdown element is chosen at random in each iteration of the paragraph-markdown pairing.
       #
       # @faker.version 1.8.0
-      def sandwich(legacy_sentences = NOT_GIVEN, legacy_repeat = NOT_GIVEN, sentences: 3, repeat: 1)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :sentences if legacy_sentences != NOT_GIVEN
-          keywords << :repeat if legacy_repeat != NOT_GIVEN
-        end
-
+      def sandwich(sentences: 3, repeat: 1)
         text_block = []
         text_block << headers
         repeat.times do
@@ -166,7 +163,7 @@ module Faker
       private
 
       def available_methods
-        Markdown.public_methods(false) - Base.methods
+        (Markdown.public_methods(false) - Base.methods).sort
       end
     end
   end

data/lib/faker/default/marketing.rb

@@ -6,7 +6,7 @@ module Faker
 
     class << self
       ##
-      # Produces the name of a video game console or platform.
+      # Produces a few marketing buzzwords.
       #
       # @return [String]
       #

data/lib/faker/default/measurement.rb

@@ -9,7 +9,7 @@ module Faker
       ##
       # Produces a random height measurement.
       #
-      # @param amount [Integer] Speficies the random height value.
+      # @param amount [Integer] Specifies the random height value.
       # @return [String]
       #
       # @example
@@ -19,18 +19,14 @@ module Faker
       #   Faker::Measurement.height(amount: "all") #=> "inches"
       #
       # @faker.version 1.7.3
-      def height(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def height(amount: rand(10))
         define_measurement_locale(amount, 'height')
       end
 
       ##
       # Produces a random length measurement.
       #
-      # @param amount [Integer] Speficies the random length value.
+      # @param amount [Integer] Specifies the random length value.
       # @return [String]
       #
       # @example
@@ -38,18 +34,14 @@ module Faker
       #   Faker::Measurement.length(amount: 1.4) #=> "1.4 yards"
       #
       # @faker.version 1.7.3
-      def length(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def length(amount: rand(10))
         define_measurement_locale(amount, 'length')
       end
 
       ##
       # Produces a random volume measurement.
       #
-      # @param amount [Integer] Speficies the random volume value.
+      # @param amount [Integer] Specifies the random volume value.
       # @return [String]
       #
       # @example
@@ -57,18 +49,14 @@ module Faker
       #   Faker::Measurement.volume(amount: 1.4) #=> "1.4 cups"
       #
       # @faker.version 1.7.3
-      def volume(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def volume(amount: rand(10))
         define_measurement_locale(amount, 'volume')
       end
 
       ##
       # Produces a random weight measurement.
       #
-      # @param amount [Integer] Speficies the random weight value.
+      # @param amount [Integer] Specifies the random weight value.
       # @return [String]
       #
       # @example
@@ -76,18 +64,14 @@ module Faker
       #   Faker::Measurement.weight(amount: 1.4) #=> "1.4 pounds"
       #
       # @faker.version 1.7.3
-      def weight(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def weight(amount: rand(10))
         define_measurement_locale(amount, 'weight')
       end
 
       ##
       # Produces a random metric height measurement.
       #
-      # @param amount [Integer] Speficies the random height value.
+      # @param amount [Integer] Specifies the random height value.
       # @return [String]
       #
       # @example
@@ -95,18 +79,14 @@ module Faker
       #   Faker::Measurement.metric_height(amount: 1.4) #=> "1.4 meters"
       #
       # @faker.version 1.7.3
-      def metric_height(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def metric_height(amount: rand(10))
         define_measurement_locale(amount, 'metric_height')
       end
 
       ##
       # Produces a random metric length measurement.
       #
-      # @param amount [Integer] Speficies the random length value.
+      # @param amount [Integer] Specifies the random length value.
       # @return [String]
       #
       # @example
@@ -114,18 +94,14 @@ module Faker
       #   Faker::Measurement.metric_length(amount: 1.4) #=> "1.4 decimeters"
       #
       # @faker.version 1.7.3
-      def metric_length(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def metric_length(amount: rand(10))
         define_measurement_locale(amount, 'metric_length')
       end
 
       ##
       # Produces a random metric volume measurement.
       #
-      # @param amount [Integer] Speficies the random volume value.
+      # @param amount [Integer] Specifies the random volume value.
       # @return [String]
       #
       # @example
@@ -133,18 +109,14 @@ module Faker
       #   Faker::Measurement.metric_volume(amount: 1.4) #=> "1.4 liters"
       #
       # @faker.version 1.7.3
-      def metric_volume(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def metric_volume(amount: rand(10))
         define_measurement_locale(amount, 'metric_volume')
       end
 
       ##
       # Produces a random metric weight measurement.
       #
-      # @param amount [Integer] Speficies the random weight value.
+      # @param amount [Integer] Specifies the random weight value.
       # @return [String]
       #
       # @example
@@ -152,11 +124,7 @@ module Faker
       #   Faker::Measurement.metric_weight(amount: 1.4) #=> "1.4 grams"
       #
       # @faker.version 1.7.3
-      def metric_weight(legacy_amount = NOT_GIVEN, amount: rand(10))
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :amount if legacy_amount != NOT_GIVEN
-        end
-
+      def metric_weight(amount: rand(10))
         define_measurement_locale(amount, 'metric_weight')
       end
 
@@ -172,9 +140,10 @@ module Faker
 
       def define_measurement_locale(amount, locale)
         ensure_valid_amount(amount)
-        if amount == ALL
+        case amount
+        when ALL
           make_plural(fetch("measurement.#{locale}"))
-        elsif amount == NONE
+        when NONE
           fetch("measurement.#{locale}")
         else
           locale = check_for_plural(fetch("measurement.#{locale}"), amount)