faker 2.23.0 → 3.0.0

data/lib/faker/default/internet.rb

@@ -29,12 +29,7 @@ module Faker
       #   Faker::Internet.email(name: 'smith')                                            #=> "smith@faker.com"
       #   Faker::Internet.email(name: 'sam smith', separators: ['-'])                     #=> "sam-smith@faker.com"
       #   Faker::Internet.email(name: 'sam smith', separators: ['-'], domain: 'gmail')    #=> "sam-smith@gmail.com"
-      def email(legacy_name = NOT_GIVEN, legacy_separators = NOT_GIVEN, name: nil, separators: nil, domain: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :name if legacy_name != NOT_GIVEN
-          keywords << :separators if legacy_separators != NOT_GIVEN
-        end
-
+      def email(name: nil, separators: nil, domain: nil)
         local_part = if separators
                        username(specifier: name, separators: separators)
                      else
@@ -55,11 +50,7 @@ module Faker
       # @example
       #   Faker::Internet.free_email                                                           #=> "samsmith@gmail.com"
       #   Faker::Internet.free_email(name: 'smith')                                            #=> "smith@yahoo.com"
-      def free_email(legacy_name = NOT_GIVEN, name: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :name if legacy_name != NOT_GIVEN
-        end
-
+      def free_email(name: nil)
         construct_email(
           sanitize_email_local_part(username(specifier: name)),
           fetch('internet.free_email')
@@ -76,11 +67,7 @@ module Faker
       # @example
       #   Faker::Internet.safe_email                                                           #=> "samsmith@example.com"
       #   Faker::Internet.safe_email(name: 'smith')                                            #=> "smith@example.net"
-      def safe_email(legacy_name = NOT_GIVEN, name: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :name if legacy_name != NOT_GIVEN
-        end
-
+      def safe_email(name: nil)
         construct_email(
           sanitize_email_local_part(username(specifier: name)),
           "example.#{sample(%w[org com net])}"
@@ -100,12 +87,7 @@ module Faker
       #   Faker::Internet.username(specifier: 5..10)                  #=> "morris"
       #   Faker::Internet.username(specifier: 5..10)                  #=> "berryberry"
       #   Faker::Internet.username(specifier: 20, separators: ['-'])  #=> "nikki_sawaynnikki_saway"
-      def username(legacy_specifier = NOT_GIVEN, legacy_separators = NOT_GIVEN, specifier: nil, separators: %w[. _])
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :specifier if legacy_specifier != NOT_GIVEN
-          keywords << :separators if legacy_separators != NOT_GIVEN
-        end
-
+      def username(specifier: nil, separators: %w[. _])
         with_locale(:en) do
           return shuffle(specifier.scan(/[[:word:]]+/)).join(sample(separators)).downcase if specifier.respond_to?(:scan)
 
@@ -142,8 +124,6 @@ module Faker
         end
       end
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Produces a randomized string of characters suitable for passwords
       #
@@ -166,14 +146,7 @@ module Faker
       #   Faker::Internet.password(min_length: 10, max_length: 20, mix_case: true, special_characters: true) #=> "*%NkOnJsH4"
       #
       # @faker.version 2.1.3
-      def password(legacy_min_length = NOT_GIVEN, legacy_max_length = NOT_GIVEN, legacy_mix_case = NOT_GIVEN, legacy_special_characters = NOT_GIVEN, min_length: 8, max_length: 16, mix_case: true, special_characters: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :min_length if legacy_min_length != NOT_GIVEN
-          keywords << :max_length if legacy_max_length != NOT_GIVEN
-          keywords << :mix_case if legacy_mix_case != NOT_GIVEN
-          keywords << :special_characters if legacy_special_characters != NOT_GIVEN
-        end
-
+      def password(min_length: 8, max_length: 16, mix_case: true, special_characters: false)
         raise ArgumentError, 'Password of length 1 can not have both mixed case and special characters' if min_length <= 1 && mix_case && special_characters
 
         min_alpha = mix_case && min_length > 1 ? 2 : 0
@@ -206,7 +179,6 @@ module Faker
 
         temp
       end
-      # rubocop:enable Metrics/ParameterLists
 
       ##
       # Returns the domain name
@@ -221,11 +193,7 @@ module Faker
       #   Faker::Internet.domain_name(subdomain: true)                      #=> "test.faker.io"
       #   Faker::Internet.domain_name(subdomain: true, domain: 'example')   #=> "faker.example.com"
       #   Faker::Internet.domain_name(domain: 'faker')                      #=> "faker.org"
-      def domain_name(legacy_subdomain = NOT_GIVEN, subdomain: false, domain: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :subdomain if legacy_subdomain != NOT_GIVEN
-        end
-
+      def domain_name(subdomain: false, domain: nil)
         with_locale(:en) do
           if domain
             domain
@@ -254,11 +222,7 @@ module Faker
       #   Faker::Internet.fix_umlauts                     #=> ""
       #   Faker::Internet.fix_umlauts(string: 'faker')    #=> "faker"
       #   Faker::Internet.fix_umlauts(string: 'faküer')   #=> "fakueer"
-      def fix_umlauts(legacy_string = NOT_GIVEN, string: '')
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :string if legacy_string != NOT_GIVEN
-        end
-
+      def fix_umlauts(string: '')
         Char.fix_umlauts(string)
       end
 
@@ -294,11 +258,7 @@ module Faker
       #   Faker::Internet.mac_address(prefix: 'a')      #=> "0a:91:ce:24:89:3b"
       #   Faker::Internet.mac_address(prefix: 'aa')     #=> "aa:38:a0:3e:e8:41"
       #   Faker::Internet.mac_address(prefix: 'aa:44')  #=> "aa:44:30:88:6e:95"
-      def mac_address(legacy_prefix = NOT_GIVEN, prefix: '')
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :prefix if legacy_prefix != NOT_GIVEN
-        end
-
+      def mac_address(prefix: '')
         prefix_digits = prefix.split(':').map { |d| d.to_i(16) }
         address_digits = Array.new((6 - prefix_digits.size)) { rand(256) }
         (prefix_digits + address_digits).map { |d| format('%02x', d) }.join(':')
@@ -440,8 +400,6 @@ module Faker
         "#{ip_v6_address}/#{rand(1..127)}"
       end
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Returns URL
       #
@@ -456,16 +414,9 @@ module Faker
       #   Faker::Internet.url(host: 'faker')                                            #=> "http://faker/shad"
       #   Faker::Internet.url(host: 'faker', path: '/fake_test_path')                   #=> "http://faker/fake_test_path"
       #   Faker::Internet.url(host: 'faker', path: '/fake_test_path', scheme: 'https')  #=> "https://faker/fake_test_path"
-      def url(legacy_host = NOT_GIVEN, legacy_path = NOT_GIVEN, legacy_scheme = NOT_GIVEN, host: domain_name, path: "/#{username}", scheme: 'http')
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :host if legacy_host != NOT_GIVEN
-          keywords << :path if legacy_path != NOT_GIVEN
-          keywords << :scheme if legacy_scheme != NOT_GIVEN
-        end
-
+      def url(host: domain_name, path: "/#{username}", scheme: 'http')
         "#{scheme}://#{host}#{path}"
       end
-      # rubocop:enable Metrics/ParameterLists
 
       ##
       # Returns unique string in URL
@@ -480,12 +431,7 @@ module Faker
       #   Faker::Internet.slug(words: 'test, faker')              #=> "test-faker"
       #   Faker::Internet.slug(words: 'test. faker')              #=> "test-faker"
       #   Faker::Internet.slug(words: 'test. faker', glue: '$')   #=> "test$faker"
-      def slug(legacy_words = NOT_GIVEN, legacy_glue = NOT_GIVEN, words: nil, glue: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :words if legacy_words != NOT_GIVEN
-          keywords << :glue if legacy_glue != NOT_GIVEN
-        end
-
+      def slug(words: nil, glue: nil)
         glue ||= sample(%w[- _])
         return words.delete(',.').gsub(' ', glue).downcase unless words.nil?
 
@@ -515,11 +461,7 @@ module Faker
       #   Faker::Internet.user_agent(vendor: 'chrome')  #=> "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"
       #   Faker::Internet.user_agent(vendor: 'safari')  #=> "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A"
       #   Faker::Internet.user_agent(vendor: 'faker')   #=> "Mozilla/5.0 (Windows; U; Win 9x 4.90; SG; rv:1.9.2.4) Gecko/20101104 Netscape/9.1.0285"
-      def user_agent(legacy_vendor = NOT_GIVEN, vendor: nil)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :vendor if legacy_vendor != NOT_GIVEN
-        end
-
+      def user_agent(vendor: nil)
         agent_hash = translate('faker.internet.user_agent')
         agents = vendor.respond_to?(:to_sym) && agent_hash[vendor.to_sym] || agent_hash[sample(agent_hash.keys)]
         sample(agents)

data/lib/faker/default/invoice.rb

@@ -17,12 +17,7 @@ module Faker
       #   Faker::Finance.amount_between(0, 10) #=> 4.33
       #
       # @faker.version 1.9.0
-      def amount_between(legacy_from = NOT_GIVEN, legacy_to = NOT_GIVEN, from: 0, to: 0)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :from if legacy_from != NOT_GIVEN
-          keywords << :to if legacy_to != NOT_GIVEN
-        end
-
+      def amount_between(from: 0, to: 0)
         Faker::Base.rand_in_range(from, to).round(2)
       end
 
@@ -36,11 +31,7 @@ module Faker
       #   Faker::Invoice.creditor_reference #=> "RF34118592570724925498"
       #
       # @faker.version 1.9.0
-      def creditor_reference(legacy_ref = NOT_GIVEN, ref: '')
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :ref if legacy_ref != NOT_GIVEN
-        end
-
+      def creditor_reference(ref: '')
         ref = reference if ref.empty?
 
         "RF#{iban_checksum('RF', ref)}#{ref}"
@@ -56,11 +47,7 @@ module Faker
       #   Faker::Invoice.reference #=> "45656646957845"
       #
       # @faker.version 1.9.0
-      def reference(legacy_ref = NOT_GIVEN, ref: '')
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :ref if legacy_ref != NOT_GIVEN
-        end
-
+      def reference(ref: '')
         pattern = fetch('invoice.reference.pattern')
 
         ref = Base.regexify(/#{pattern}/) if ref.empty?

data/lib/faker/default/json.rb

@@ -20,12 +20,7 @@ module Faker
       #     something to eat - it's all been wrong."}
       #
       # @faker.version 1.9.2
-      def shallow_json(legacy_width = NOT_GIVEN, legacy_options = NOT_GIVEN, width: 3, options: { key: 'Name.first_name', value: 'Name.first_name' })
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :width if legacy_width != NOT_GIVEN
-          keywords << :options if legacy_options != NOT_GIVEN
-        end
-
+      def shallow_json(width: 3, options: { key: 'Name.first_name', value: 'Name.first_name' })
         options[:key] = "Faker::#{options[:key]}"
         options[:value] = "Faker::#{options[:value]}"
 
@@ -33,8 +28,6 @@ module Faker
         JSON.generate(hash)
       end
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Produces a random nested JSON formatted string that can take JSON as an additional argument.
       #
@@ -73,17 +66,7 @@ module Faker
       #             {"Rick":"Wiza","Bonita":"Bayer","Gardner":"Auer","Felicity":"Abbott"}}}
       #
       # @faker.version 1.9.2
-      def add_depth_to_json(legacy_json = NOT_GIVEN, legacy_width = NOT_GIVEN, legacy_options = NOT_GIVEN, json: shallow_json, width: 3, options: { key: 'Name.first_name', value: 'Name.first_name' })
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :json if legacy_json != NOT_GIVEN
-        end
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :width if legacy_width != NOT_GIVEN
-        end
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :options if legacy_options != NOT_GIVEN
-        end
-
+      def add_depth_to_json(json: shallow_json, width: 3, options: { key: 'Name.first_name', value: 'Name.first_name' })
         options[:key] = "Faker::#{options[:key]}"
         options[:value] = "Faker::#{options[:value]}"
 
@@ -93,7 +76,6 @@ module Faker
         end
         JSON.generate(hash)
       end
-      # rubocop:enable Metrics/ParameterLists
 
       private
 

data/lib/faker/default/lorem.rb

@@ -30,12 +30,7 @@ module Faker
       #   Faker::Lorem.words(number: 4, supplemental: true)    #=> ["nisi", "sit", "allatus", "consequatur"]
       #
       # @faker.version 2.1.3
-      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
-
+      def words(number: 3, supplemental: false)
         resolved_num = resolve(number)
         word_list = (
           translate('faker.lorem.words') +
@@ -74,11 +69,7 @@ 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
-
+      def characters(number: 255, min_alpha: 0, min_numeric: 0)
         Alphanumeric.alphanumeric(number: number, min_alpha: min_alpha, min_numeric: min_numeric)
       end
 
@@ -95,7 +86,6 @@ module Faker
       def multibyte
         sample(translate('faker.lorem.multibyte')).pack('C*').force_encoding('utf-8')
       end
-      # rubocop:disable Metrics/ParameterLists
 
       ##
       # Generates sentence
@@ -113,16 +103,9 @@ module Faker
       #   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(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)
-        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
-
+      def sentence(word_count: 4, supplemental: false, random_words_to_add: 0)
         words(number: word_count + rand(random_words_to_add.to_i), supplemental: supplemental).join(locale_space).capitalize + locale_period
       end
-      # rubocop:enable Metrics/ParameterLists
 
       ##
       # Generates three sentences
@@ -138,17 +121,10 @@ module Faker
       #   Faker::Lorem.sentences(number: 2, supplemental: true)   #=> ["Cito cena ad.", "Solvo animus allatus."]
       #
       # @faker.version 2.1.3
-      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
-
+      def sentences(number: 3, supplemental: false)
         1.upto(resolve(number)).collect { sentence(word_count: 3, supplemental: supplemental) }
       end
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Generates three sentence paragraph
       #
@@ -169,16 +145,9 @@ module Faker
       #     #=> "Texo tantillus tamisium. Tribuo amissio tamisium. Facere aut canis."
       #
       # @faker.version 2.1.3
-      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)
-        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
-
+      def paragraph(sentence_count: 3, supplemental: false, random_sentences_to_add: 0)
         sentences(number: resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental: supplemental).join(locale_space)
       end
-      # rubocop:enable Metrics/ParameterLists
 
       ##
       # Generates three paragraphs
@@ -194,14 +163,7 @@ module Faker
       #   Faker::Lorem.paragraphs(number:2, supplemental: true)
       #
       # @faker.version 2.1.3
-      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
-
+      def paragraphs(number: 3, supplemental: false)
         1.upto(resolve(number)).collect { paragraph(sentence_count: 3, supplemental: supplemental) }
       end
 
@@ -219,12 +181,7 @@ module Faker
       #   Faker::Lorem.paragraph_by_chars(number: 20, supplemental: true)   #=> "Certus aveho admove."
       #
       # @faker.version 2.1.3
-      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
-
+      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
@@ -232,8 +189,6 @@ module Faker
         "#{paragraph[0...number - 1]}."
       end
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Returns the question with 4 words
       #
@@ -250,16 +205,9 @@ module Faker
       #   Faker::Lorem.question(word_count: 2, supplemental: true, random_words_to_add: 2)    #=> "Depulso uter ut?"
       #
       # @faker.version 2.1.3
-      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)
-        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
-
+      def question(word_count: 4, supplemental: false, random_words_to_add: 0)
         words(number: word_count + rand(random_words_to_add), supplemental: supplemental).join(' ').capitalize + locale_question_mark
       end
-      # rubocop:enable Metrics/ParameterLists
 
       ##
       # Generates array of three questions
@@ -275,12 +223,7 @@ module Faker
       #   Faker::Lorem.questions(number: 2, supplemental: true)   #=> ["Acceptus subito cetera?", "Aro sulum cubicularis?"]
       #
       # @faker.version 2.1.3
-      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
-
+      def questions(number: 3, supplemental: false)
         1.upto(resolve(number)).collect { question(word_count: 3, supplemental: supplemental) }
       end
 

data/lib/faker/default/lorem_flickr.rb

@@ -5,8 +5,6 @@ module Faker
     class << self
       SUPPORTED_COLORIZATIONS = %w[red green blue].freeze
 
-      # rubocop:disable Metrics/ParameterLists
-
       ##
       # Produces a random image URL from loremflickr.com.
       #
@@ -23,13 +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
-      def image(legacy_size = NOT_GIVEN, legacy_search_terms = NOT_GIVEN, legacy_match_all = NOT_GIVEN, size: '300x300', search_terms: [], match_all: false)
-        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,13 +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
-      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)
-        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)
@@ -77,13 +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
-      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)
-        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)
@@ -106,20 +86,12 @@ 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
-      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)
-        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)
 
         build_url(size, color, search_terms, match_all)
       end
-      # rubocop:enable Metrics/ParameterLists
 
       private
 

data/lib/faker/default/lorem_pixel.rb

@@ -3,6 +3,8 @@
 module Faker
   class LoremPixel < Base
     class << self
+      extend Gem::Deprecate
+
       SUPPORTED_CATEGORIES = %w[abstract
                                 animals
                                 business
@@ -41,16 +43,7 @@ module Faker
       #   Faker::LoremPixel.image(secure: false) #=> "http://lorempixel.com/300/300"
       #
       # @faker.version 1.7.0
-      def image(legacy_size = NOT_GIVEN, legacy_is_gray = NOT_GIVEN, legacy_category = NOT_GIVEN, legacy_number = NOT_GIVEN, legacy_text = NOT_GIVEN, legacy_secure = NOT_GIVEN, size: '300x300', is_gray: false, category: nil, number: nil, text: nil, secure: true)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :size if legacy_size != NOT_GIVEN
-          keywords << :is_gray if legacy_is_gray != NOT_GIVEN
-          keywords << :category if legacy_category != NOT_GIVEN
-          keywords << :number if legacy_number != NOT_GIVEN
-          keywords << :text if legacy_text != NOT_GIVEN
-          keywords << :secure if legacy_secure != NOT_GIVEN
-        end
-
+      def image(size: '300x300', is_gray: false, category: nil, number: nil, text: nil, secure: true)
         raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /^[0-9]+x[0-9]+$/
         raise ArgumentError, "Supported categories are #{SUPPORTED_CATEGORIES.join(', ')}" unless category.nil? || SUPPORTED_CATEGORIES.include?(category)
         raise ArgumentError, 'Category required when number is passed' if !number.nil? && category.nil?
@@ -64,6 +57,7 @@ module Faker
         url_parts += [category, number, text].compact
         url_parts.join('/')
       end
+      deprecate :image, 'Faker::LoremFlickr.image', 2022, 12
       # rubocop:enable Metrics/ParameterLists
     end
   end

data/lib/faker/default/markdown.rb

@@ -150,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

data/lib/faker/default/measurement.rb

@@ -19,11 +19,7 @@ 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
 
@@ -38,11 +34,7 @@ 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
 
@@ -57,11 +49,7 @@ 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
 
@@ -76,11 +64,7 @@ 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
 
@@ -95,11 +79,7 @@ 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
 
@@ -114,11 +94,7 @@ 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
 
@@ -133,11 +109,7 @@ 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
 
@@ -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
 

data/lib/faker/default/name.rb

@@ -144,11 +144,7 @@ module Faker
       #   Faker::Name.initials(number: 2) #=> "NM"
       #
       # @faker.version 1.8.5
-      def initials(legacy_number = NOT_GIVEN, number: 3)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :number if legacy_number != NOT_GIVEN
-        end
-
+      def initials(number: 3)
         (0...number).map { rand(65..90).chr }.join
       end
     end