ffaker 2.20.0 → 2.25.0

data/lib/ffaker.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative 'ffaker/version'
+require 'pathname'
+
 module FFaker
   require_relative 'ffaker/utils/array_utils'
   require_relative 'ffaker/utils/module_utils'
@@ -13,208 +16,79 @@ module FFaker
   HEX = %w[0 1 2 3 4 5 6 7 8 9 A B C D E F].freeze
 
   def self.hexify(*masks)
-    fetch_sample(masks.flatten).gsub(/#/) { fetch_sample(HEX) }
+    fetch_sample(masks.flatten).gsub('#') { fetch_sample(HEX) }
   end
 
   def self.numerify(*masks)
-    fetch_sample(masks.flatten).gsub(/#/) { rand(0..9).to_s }
+    fetch_sample(masks.flatten).gsub('#') { rand(0..9).to_s }
   end
 
   def self.letterify(*masks)
-    fetch_sample(masks.flatten).gsub(/\?/) { fetch_sample(LETTERS) }
+    fetch_sample(masks.flatten).gsub('?') { fetch_sample(LETTERS) }
   end
 
   def self.bothify(masks)
     letterify(numerify(masks))
   end
 
-  autoload :Address, 'ffaker/address'
-  autoload :AddressAU, 'ffaker/address_au'
-  autoload :AddressBR, 'ffaker/address_br'
-  autoload :AddressCA, 'ffaker/address_ca'
-  autoload :AddressCH, 'ffaker/address_ch'
-  autoload :AddressCHDE, 'ffaker/address_ch_de'
-  autoload :AddressCHFR, 'ffaker/address_ch_fr'
-  autoload :AddressCHIT, 'ffaker/address_ch_it'
-  autoload :AddressDA, 'ffaker/address_da'
-  autoload :AddressDE, 'ffaker/address_de'
-  autoload :AddressFI, 'ffaker/address_fi'
-  autoload :AddressFR, 'ffaker/address_fr'
-  autoload :AddressGR, 'ffaker/address_gr'
-  autoload :AddressID, 'ffaker/address_id'
-  autoload :AddressIN, 'ffaker/address_in'
-  autoload :AddressIT, 'ffaker/address_it'
-  autoload :AddressJA, 'ffaker/address_ja'
-  autoload :AddressKR, 'ffaker/address_kr'
-  autoload :AddressMX, 'ffaker/address_mx'
-  autoload :AddressNL, 'ffaker/address_nl'
-  autoload :AddressPL, 'ffaker/address_pl'
-  autoload :AddressRU, 'ffaker/address_ru'
-  autoload :AddressSE, 'ffaker/address_se'
-  autoload :AddressSN, 'ffaker/address_sn'
-  autoload :AddressUA, 'ffaker/address_ua'
-  autoload :AddressUK, 'ffaker/address_uk'
-  autoload :AddressUS, 'ffaker/address_us'
-  autoload :Airline, 'ffaker/airline'
-  autoload :Animal, 'ffaker/animal'
-  autoload :AnimalCN, 'ffaker/animal_cn'
-  autoload :AnimalES, 'ffaker/animal_es'
-  autoload :AnimalPL, 'ffaker/animal_pl'
-  autoload :AnimalUS, 'ffaker/animal_us'
-  autoload :Avatar, 'ffaker/avatar'
-  autoload :AWS, 'ffaker/aws'
-  autoload :BaconIpsum, 'ffaker/bacon_ipsum'
-  autoload :Bank, 'ffaker/bank'
-  autoload :Book, 'ffaker/book'
-  autoload :Boolean, 'ffaker/boolean'
-  autoload :CheesyLingo, 'ffaker/cheesy_lingo'
-  autoload :Code, 'ffaker/code'
-  autoload :Color, 'ffaker/color'
-  autoload :ColorPL, 'ffaker/color_pl'
-  autoload :ColorUA, 'ffaker/color_ua'
-  autoload :Company, 'ffaker/company'
-  autoload :CompanyCN, 'ffaker/company_cn'
-  autoload :CompanyFR, 'ffaker/company_fr'
-  autoload :CompanyIT, 'ffaker/company_it'
-  autoload :CompanyJA, 'ffaker/company_ja'
-  autoload :CompanySE, 'ffaker/company_se'
-  autoload :Conference, 'ffaker/conference'
-  autoload :CoursesFR, 'ffaker/courses_fr'
-  autoload :Currency, 'ffaker/currency'
-  autoload :DizzleIpsum, 'ffaker/dizzle_ipsum'
-  autoload :Education, 'ffaker/education'
-  autoload :EducationCN, 'ffaker/education_cn'
-  autoload :Filesystem, 'ffaker/filesystem'
-  autoload :Food, 'ffaker/food'
-  autoload :FoodPL, 'ffaker/food_pl'
-  autoload :FreedomIpsum, 'ffaker/freedom_ipsum'
-  autoload :Game, 'ffaker/game'
-  autoload :Gender, 'ffaker/gender'
-  autoload :GenderBR, 'ffaker/gender_br'
-  autoload :GenderCN, 'ffaker/gender_cn'
-  autoload :GenderID, 'ffaker/gender_id'
-  autoload :GenderIT, 'ffaker/gender_it'
-  autoload :GenderJA, 'ffaker/gender_ja'
-  autoload :GenderJP, 'ffaker/gender_jp'
-  autoload :GenderKR, 'ffaker/gender_kr'
-  autoload :GenderPL, 'ffaker/gender_pl'
-  autoload :GenderRU, 'ffaker/gender_ru'
-  autoload :Geolocation, 'ffaker/geolocation'
-  autoload :Guid, 'ffaker/guid'
-  autoload :HealthcareIpsum, 'ffaker/healthcare_ipsum'
-  autoload :HealthcareRU, 'ffaker/healthcare_ru'
-  autoload :HipsterIpsum, 'ffaker/hipster_ipsum'
-  autoload :HTMLIpsum, 'ffaker/html_ipsum'
-  autoload :Identification, 'ffaker/identification'
-  autoload :IdentificationBR, 'ffaker/identification_br'
-  autoload :IdentificationES, 'ffaker/identification_es'
-  autoload :IdentificationESCL, 'ffaker/identification_es_cl'
-  autoload :IdentificationESCO, 'ffaker/identification_es_co'
-  autoload :IdentificationIN, 'ffaker/identification_in'
-  autoload :IdentificationIT, 'ffaker/identification_it'
-  autoload :IdentificationKr, 'ffaker/identification_kr'
-  autoload :IdentificationMX, 'ffaker/identification_mx'
-  autoload :IdentificationPL, 'ffaker/identification_pl'
-  autoload :IdentificationTW, 'ffaker/identification_tw'
-  autoload :Image, 'ffaker/image'
-  autoload :Internet, 'ffaker/internet'
-  autoload :InternetSE, 'ffaker/internet_se'
-  autoload :Job, 'ffaker/job'
-  autoload :JobBR, 'ffaker/job_br'
-  autoload :JobCN, 'ffaker/job_cn'
-  autoload :JobFR, 'ffaker/job_fr'
-  autoload :JobIT, 'ffaker/job_it'
-  autoload :JobJA, 'ffaker/job_ja'
-  autoload :JobKR, 'ffaker/job_kr'
-  autoload :JobVN, 'ffaker/job_vn'
-  autoload :Locale, 'ffaker/locale'
-  autoload :Lorem, 'ffaker/lorem'
-  autoload :LoremAR, 'ffaker/lorem_ar'
-  autoload :LoremBR, 'ffaker/lorem_br'
-  autoload :LoremCN, 'ffaker/lorem_cn'
-  autoload :LoremFR, 'ffaker/lorem_fr'
-  autoload :LoremIE, 'ffaker/lorem_ie'
-  autoload :LoremIT, 'ffaker/lorem_it'
-  autoload :LoremJA, 'ffaker/lorem_ja'
-  autoload :LoremKR, 'ffaker/lorem_kr'
-  autoload :LoremPL, 'ffaker/lorem_pl'
-  autoload :LoremRU, 'ffaker/lorem_ru'
-  autoload :LoremUA, 'ffaker/lorem_ua'
-  autoload :Movie, 'ffaker/movie'
-  autoload :Music, 'ffaker/music'
-  autoload :Name, 'ffaker/name'
-  autoload :NameAR, 'ffaker/name_ar'
-  autoload :NameBR, 'ffaker/name_br'
-  autoload :NameCN, 'ffaker/name_cn'
-  autoload :NameCS, 'ffaker/name_cs'
-  autoload :NameDA, 'ffaker/name_da'
-  autoload :NameDE, 'ffaker/name_de'
-  autoload :NameES, 'ffaker/name_es'
-  autoload :NameFR, 'ffaker/name_fr'
-  autoload :NameGA, 'ffaker/name_ga'
-  autoload :NameGR, 'ffaker/name_gr'
-  autoload :NameID, 'ffaker/name_id'
-  autoload :NameIN, 'ffaker/name_in'
-  autoload :NameIT, 'ffaker/name_it'
-  autoload :NameJA, 'ffaker/name_ja'
-  autoload :NameKH, 'ffaker/name_kh'
-  autoload :NameKR, 'ffaker/name_kr'
-  autoload :NameMX, 'ffaker/name_mx'
-  autoload :NameNB, 'ffaker/name_nb'
-  autoload :NameNL, 'ffaker/name_nl'
-  autoload :NamePH, 'ffaker/name_ph'
-  autoload :NamePL, 'ffaker/name_pl'
-  autoload :NameRU, 'ffaker/name_ru'
-  autoload :NameSE, 'ffaker/name_se'
-  autoload :NameSN, 'ffaker/name_sn'
-  autoload :NameTH, 'ffaker/name_th'
-  autoload :NameTW, 'ffaker/name_tw'
-  autoload :NameTHEN, 'ffaker/name_th_en'
-  autoload :NameUA, 'ffaker/name_ua'
-  autoload :NameVN, 'ffaker/name_vn'
-  autoload :NatoAlphabet, 'ffaker/nato_alphabet'
-  autoload :Number, 'ffaker/number'
-  autoload :PhoneNumber, 'ffaker/phone_number'
-  autoload :PhoneNumberAU, 'ffaker/phone_number_au'
-  autoload :PhoneNumberBR, 'ffaker/phone_number_br'
-  autoload :PhoneNumberCH, 'ffaker/phone_number_ch'
-  autoload :PhoneNumberCU, 'ffaker/phone_number_cu'
-  autoload :PhoneNumberDA, 'ffaker/phone_number_da'
-  autoload :PhoneNumberDE, 'ffaker/phone_number_de'
-  autoload :PhoneNumberFR, 'ffaker/phone_number_fr'
-  autoload :PhoneNumberID, 'ffaker/phone_number_id'
-  autoload :PhoneNumberIT, 'ffaker/phone_number_it'
-  autoload :PhoneNumberJA, 'ffaker/phone_number_ja'
-  autoload :PhoneNumberKR, 'ffaker/phone_number_kr'
-  autoload :PhoneNumberMX, 'ffaker/phone_number_mx'
-  autoload :PhoneNumberNL, 'ffaker/phone_number_nl'
-  autoload :PhoneNumberPL, 'ffaker/phone_number_pl'
-  autoload :PhoneNumberSE, 'ffaker/phone_number_se'
-  autoload :PhoneNumberSG, 'ffaker/phone_number_sg'
-  autoload :PhoneNumberSN, 'ffaker/phone_number_sn'
-  autoload :PhoneNumberTW, 'ffaker/phone_number_tw'
-  autoload :PhoneNumberUA, 'ffaker/phone_number_ua'
-  autoload :PhoneNumberRU, 'ffaker/phone_number_ru'
-  autoload :Product, 'ffaker/product'
-  autoload :SemVer, 'ffaker/sem_ver'
-  autoload :Skill, 'ffaker/skill'
-  autoload :Sport, 'ffaker/sport'
-  autoload :SportPL, 'ffaker/sport_pl'
-  autoload :SportUS, 'ffaker/sport_us'
-  autoload :SportRU, 'ffaker/sport_ru'
-  autoload :SSN, 'ffaker/ssn'
-  autoload :SSNMX, 'ffaker/ssn_mx'
-  autoload :SSNSE, 'ffaker/ssn_se'
-  autoload :String, 'ffaker/string'
-  autoload :Time, 'ffaker/time'
-  autoload :Tweet, 'ffaker/tweet'
-  autoload :Unit, 'ffaker/unit'
-  autoload :UnitEnglish, 'ffaker/unit_english'
-  autoload :UnitMetric, 'ffaker/unit_metric'
-  autoload :VERSION, 'version'
-  autoload :Vehicle, 'ffaker/vehicle'
-  autoload :Venue, 'ffaker/venue'
-  autoload :Youtube, 'ffaker/youtube'
+  autoload_acronyms = {
+    'ar' => 'AR',
+    'au' => 'AU',
+    'aws' => 'AWS',
+    'br' => 'BR',
+    'ca' => 'CA',
+    'ch' => 'CH',
+    'cl' => 'CL',
+    'cn' => 'CN',
+    'co' => 'CO',
+    'cs' => 'CS',
+    'cu' => 'CU',
+    'da' => 'DA',
+    'de' => 'DE',
+    'ec' => 'EC',
+    'en' => 'EN',
+    'es' => 'ES',
+    'fi' => 'FI',
+    'fr' => 'FR',
+    'ga' => 'GA',
+    'gr' => 'GR',
+    'html' => 'HTML',
+    'id' => 'ID',
+    'ie' => 'IE',
+    'in' => 'IN',
+    'it' => 'IT',
+    'ja' => 'JA',
+    'jp' => 'JP',
+    'kh' => 'KH',
+    'kr' => 'KR',
+    'mx' => 'MX',
+    'nb' => 'NB',
+    'nl' => 'NL',
+    'ph' => 'PH',
+    'pl' => 'PL',
+    'ru' => 'RU',
+    'se' => 'SE',
+    'sg' => 'SG',
+    'sn' => 'SN',
+    'ssn' => 'SSN',
+    'th' => 'TH',
+    'tw' => 'TW',
+    'ua' => 'UA',
+    'uk' => 'UK',
+    'us' => 'US',
+    'uuid' => 'UUID',
+    'vn' => 'VN'
+  }
+
+  directory = "#{__dir__}/ffaker"
+  Dir["#{directory}/*.rb"].each do |file_name|
+    relative_file_path = Pathname.new(file_name).relative_path_from(directory).to_s.chomp('.rb')
+    ## Don't consider files in sub-directories
+    constant_name = relative_file_path.split('_').map do |part|
+      autoload_acronyms.fetch(part) { part.capitalize }
+    end.join
+    autoload constant_name, file_name
+  end
 
   # Random Number Generator (RNG) used with ModuleUtils#fetch, #shuffle, #rand
   # in order to provide deterministic repeatability.

data/scripts/reference.rb

@@ -1,30 +1,32 @@
 # frozen_string_literal: true
 
 require_relative '../lib/ffaker'
+require 'set'
+
+# always use the same seed for consistency
+FFaker::Random.seed = 1337
 
 ICONS = {
   error: '‼️',
   warning: '❗'
 }.freeze
 
+UTILS_MODULES = %i[ArrayUtils ModuleUtils RandomUtils Random Version].freeze
+UTILS_METHODS = %i[k underscore fetch_sample rand shuffle unique luhn_check].freeze
+
 # Get a list of sections
 def faker_modules
-  FFaker.constants.sort.map do |const|
-    mod = FFaker.const_get(const)
-    next unless mod.is_a?(Module)
-    next if mod == FFaker::ArrayUtils
-    next if mod == FFaker::ModuleUtils
-    next if mod == FFaker::RandomUtils
-    next if mod == FFaker::Random
-
-    mod
-  end.compact
+  FFaker
+    .constants
+    .reject { |const| UTILS_MODULES.include?(const) }
+    .select { |const| FFaker.const_get(const).instance_of?(Module) }
+    .sort
+    .map { |const| FFaker.const_get(const) }
 end
 
 # Returns faker methods for a given module
 def faker_methods(mod)
-  methods = mod.methods - Module.methods -
-            %i[k underscore fetch_sample rand shuffle unique luhn_check]
+  methods = mod.methods - Module.methods - UTILS_METHODS
 
   # For Company.name (et al), don't discard :name if it was reimplemented
   methods << :name if mod.send(:name) != mod.to_s
@@ -34,12 +36,14 @@ end
 # Catch deprecation warnings.
 # This `#warn` overrides Kernel#warn
 def warn(msg)
-  $warnings << msg if $warnings
+  return unless Kernel.instance_variable_get(:@ffaker_warnings)
+
+  Kernel.instance_variable_set(:@ffaker_warnings, Kernel.instance_variable_get(:@ffaker_warnings) << msg)
 end
 
 def catch_warnings
-  $warnings = []
-  [yield, $warnings]
+  Kernel.instance_variable_set(:@ffaker_warnings, [])
+  [yield, Kernel.instance_variable_get(:@ffaker_warnings)]
 end
 
 def escape(str)
@@ -66,13 +70,9 @@ sections = faker_modules.map do |mod|
     else
       begin
         examples, warnings = catch_warnings do
-          Array.new(3) { mod.send meth }
+          Array.new(3) { mod.unique.send meth }
         end
-        right = if warnings.any?
-                  "#{ICONS[:warning]} *#{warnings.first}*"
-                else
-                  (escape examples.join(', ')).to_s
-                end
+        right = warnings.any? ? "#{ICONS[:warning]} *#{warnings.first}*" : (escape examples.join(', ')).to_s
       rescue StandardError => e
         right = "#{ICONS[:error]} #{e.class}: #{e.message}"
       end

data/test/helper.rb

@@ -13,16 +13,14 @@ module DeterministicHelper
   # Accepts a block. Executes the block multiple times after resetting
   # the internal Random Number Generator state and compared the results of
   # each execution to make sure they are the same.
-  def assert_deterministic(options = {})
-    raise ArgumentError, 'Must pass a block' unless block_given?
+  def assert_deterministic(options = {}, &block)
+    raise ArgumentError, 'Must pass a block' unless block
 
     options = { message: 'Results are not repeatable' }.merge(options)
 
     returns = Array.new(2) do
       FFaker::Random.reset!
-      Array.new(5) do
-        yield
-      end
+      Array.new(5, &block)
     end
 
     assert(returns.uniq.length == 1, options[:message])
@@ -37,7 +35,7 @@ module DeterministicHelper
       end
     operator_name += '_or_equal_to' if operator[1] == '='
 
-    define_method "assert_#{operator_name}" do |got, expected|
+    define_method :"assert_#{operator_name}" do |got, expected|
       assert(
         got.public_send(operator, expected),
         "Expected #{operator} \"#{expected}\", but got #{got}"
@@ -58,8 +56,8 @@ module DeterministicHelper
   end
 
   %w[less_than_or_equal_to between].each do |method_name|
-    define_method "assert_random_#{method_name}" do |*args, &block|
-      assert_random(block) { send "assert_#{method_name}", block.call, *args }
+    define_method :"assert_random_#{method_name}" do |*args, &block|
+      assert_random(block) { send :"assert_#{method_name}", block.call, *args }
     end
   end
 
@@ -78,7 +76,7 @@ module DeterministicHelper
     #  }
     def assert_methods_are_deterministic(klass, *methods)
       Array(methods).each do |meth|
-        define_method "test_#{meth}_is_deterministic" do
+        define_method :"test_#{meth}_is_deterministic" do
           assert_deterministic(message: "Results from `#{klass}.#{meth}` are not repeatable") do
             klass.send(meth)
           end

data/test/test_address_br.rb

@@ -7,7 +7,7 @@ class TestAddressBR < Test::Unit::TestCase
 
   assert_methods_are_deterministic(
     FFaker::AddressBR,
-    :zip_code, :state, :state_abbr, :city, :street_prefix, :street, :full_address
+    :zip_code, :state, :state_abbr, :city, :street_prefix, :street, :complement, :neighborhood, :full_address
   )
 
   def test_zip_code
@@ -32,6 +32,19 @@ class TestAddressBR < Test::Unit::TestCase
 
   def test_street
     prefixes = FFaker::AddressBR::STREET_PREFIX
-    assert_match(/(#{prefixes.join('|')})( \p{Alpha}+){1,2}/, FFaker::AddressBR.street)
+    assert_match(/\A(#{prefixes.join('|')})(?: [\p{Alpha}-]+)+\z/, FFaker::AddressBR.street)
+  end
+
+  def test_complement
+    assert_match(/\A(?:Apartamento \d{3}|Casa Térrea|Fundos)\z/, FFaker::AddressBR.complement)
+  end
+
+  def test_neighborhood
+    neighborhood_prefix = FFaker::AddressBR.neighborhood.split(' ').first
+    assert FFaker::AddressBR::NEIGHBORHOOD_PREFIXES.include?(neighborhood_prefix)
+  end
+
+  def test_full_address
+    assert_match(/\A[\p{Alpha}\d, -]+\z/, FFaker::AddressBR.full_address)
   end
 end

data/test/test_address_da.rb

@@ -20,11 +20,11 @@ class TestAddressDA < Test::Unit::TestCase
   end
 
   def test_state
-    assert_match(/\A[-ÆØÅæøåa-z-]+\z/i, FFaker::AddressDA.state)
+    assert_match(/\A[-ÆØÅæøåa-z]+\z/i, FFaker::AddressDA.state)
   end
 
   def test_kommune
-    assert_match(/\A[-ÆØÅæøåa-z-]+\z/i, FFaker::AddressDA.kommune)
+    assert_match(/\A[-ÆØÅæøåa-z]+\z/i, FFaker::AddressDA.kommune)
   end
 
   def test_region
@@ -32,7 +32,7 @@ class TestAddressDA < Test::Unit::TestCase
   end
 
   def test_city
-    assert_match(/\A[- ÆØÅæøåla-z-]+\z/i, FFaker::AddressDA.city)
+    assert_match(/\A[- ÆØÅæøåla-z]+\z/i, FFaker::AddressDA.city)
   end
 
   def test_street_name

data/test/test_address_fi.rb

@@ -5,8 +5,8 @@ require_relative 'helper'
 class TestAddressFI < Test::Unit::TestCase
   include DeterministicHelper
 
-  ALPHA = /\A\p{Alpha}+/.freeze
-  DIGIT = /\d{1}/.freeze
+  ALPHA = /\A\p{Alpha}+/
+  DIGIT = /\d{1}/
 
   assert_methods_are_deterministic(
     FFaker::AddressFI,

data/test/test_address_se.rb

@@ -5,8 +5,8 @@ require_relative 'helper'
 class TestAddressSE < Test::Unit::TestCase
   include DeterministicHelper
 
-  ALPHA = /\A\p{Alpha}+/.freeze
-  DIGIT = /\d{1}/.freeze
+  ALPHA = /\A\p{Alpha}+/
+  DIGIT = /\d{1}/
 
   assert_methods_are_deterministic(
     FFaker::AddressSE,

data/test/test_address_ua.rb

@@ -41,7 +41,7 @@ class TestAddressUA < Test::Unit::TestCase
   end
 
   def test_street_address_with_secondary
-    assert_match( \
+    assert_match(
       /\Aвул\.\s[а-яА-ЯіїєґІЇЄҐ’\-\s]+,\s\d{1,3},\sкв\.\s\d{1,3}\z/,
       @tester.street_address(true)
     )

data/test/test_animal_br.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class TestAnimalsBR < Test::Unit::TestCase
+  include DeterministicHelper
+
+  assert_methods_are_deterministic(FFaker::AnimalBR, :common_name)
+
+  def setup
+    @tester = FFaker::AnimalBR
+  end
+
+  def test_name
+    assert_include @tester::COMMON_NAMES, @tester.common_name
+  end
+end

data/test/test_array_utils.rb

@@ -89,7 +89,7 @@ class TestArrayUtils < Test::Unit::TestCase
 
   private
 
-  # Supress the deprecation warning that some methods output, so we get less
+  # Suppress the deprecation warning that some methods output, so we get less
   # noise in our test run.
   def supress_warn_output
     original_verbosity = $VERBOSE

data/test/test_avatar.rb

@@ -18,40 +18,63 @@ class TestAvatar < Test::Unit::TestCase
                  @tester.image)
   end
 
+  def test_image_output_with_keyword_arguments
+    output = capture_output do
+      @tester.image(format: 'jpg')
+    end
+
+    assert_equal ['', ''], output
+  end
+
+  def test_image_with_slug_as_positional_argument
+    assert_equal("#{ROBOHASH}/foobar.png?size=300x300", @tester.image('foobar'))
+  end
+
+  def test_image_output_with_positional_arguments
+    output = capture_output do
+      @tester.image('foobar')
+    end
+
+    assert_equal(
+      ['', "Positional arguments for Avatar#image are deprecated. Please use keyword arguments.\n"],
+      output
+    )
+  end
+
   def test_avatar_with_param
-    assert_equal("#{ROBOHASH}/faker.png?size=300x300", @tester.image('faker'))
+    assert_equal("#{ROBOHASH}/faker.png?size=300x300", @tester.image(slug: 'faker'))
   end
 
   def test_avatar_with_correct_size
     assert_equal("#{ROBOHASH}/faker.png?size=150x320",
-                 @tester.image('faker', '150x320'))
+                 @tester.image(slug: 'faker', size: '150x320'))
   end
 
   def test_avatar_with_incorrect_size
     assert_raise ArgumentError do
-      @tester.image(nil, '150x320z')
+      @tester.image(size: '150x320z')
     end
   end
 
   def test_avatar_with_supported_format
     assert_equal("#{ROBOHASH}/faker.jpg?size=300x300",
-                 @tester.image('faker', '300x300', 'jpg'))
+                 @tester.image(slug: 'faker', size: '300x300', format: 'jpg'))
   end
 
   def test_avatar_with_incorrect_format
     assert_raise ArgumentError do
-      @tester.image(nil, '300x300', 'wrong_format')
+      @tester.image(size: '300x300', format: 'wrong_format')
     end
   end
 
   def test_avatar_with_correct_background
     assert_equal("#{ROBOHASH}/faker.png?size=300x300&bgset=bg1",
-                 @tester.image('faker', '300x300', 'png', '1'))
+                 @tester.image(slug: 'faker', size: '300x300', format: 'png', bgset: '1'))
   end
 
   def test_avatar_with_incorrect_background
     assert_raise ArgumentError do
-      @tester.image('faker', '300x300', 'png', 'not_a_number')
+      @tester.image(slug: 'faker', size: '300x300', format: 'png', bgset: 'not_a_number')
     end
   end
 end

data/test/test_bank.rb

@@ -7,7 +7,7 @@ class TestBank < Test::Unit::TestCase
 
   assert_methods_are_deterministic(
     FFaker::Bank,
-    :iban, :card_number, :card_expiry_date, :card_type
+    :iban, :card_number, :card_expiry_date, :card_type, :loan_interest_rate, :loan_term, :loan_amount
   )
 
   def setup
@@ -50,4 +50,18 @@ class TestBank < Test::Unit::TestCase
   def test_card_type
     assert_include @tester::CARD_TYPES, @tester.card_type
   end
+
+  def test_loan_interest_rate
+    rate = FFaker::Bank.loan_interest_rate
+    assert(rate.to_f.between?(1.5, 15.0), "Rate #{rate} is out of bounds")
+  end
+
+  def test_loan_term
+    assert_includes([12, 24, 36, 48, 60, 72, 84], FFaker::Bank.loan_term)
+  end
+
+  def test_loan_amount
+    amount = FFaker::Bank.loan_amount
+    assert(amount.between?(1_000, 100_000), "Amount #{amount} is out of bounds")
+  end
 end

data/test/test_bank_us.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class TestBankUS < Test::Unit::TestCase
+  include DeterministicHelper
+
+  assert_methods_are_deterministic(
+    FFaker::BankUS,
+    :account_number, :routing_number
+  )
+
+  def setup
+    @tester = FFaker::BankUS
+  end
+
+  def test_account_number
+    assert_instance_of String, @tester.account_number
+    assert_match(/\A\d{8}\z/, @tester.account_number(min_digits: 8, max_digits: 8))
+    assert_match(/\A\d{12}\z/, @tester.account_number(min_digits: 12, max_digits: 12))
+  end
+
+  def test_routing_number
+    routing_number = @tester.routing_number
+    assert_match(/\A\d{9}\z/, routing_number)
+
+    assert_true(@tester::ROUTING_NUMBER_PREFIXES.include?(routing_number[0..1]))
+
+    checksum = (
+      (7 * (routing_number[0].to_i + routing_number[3].to_i + routing_number[6].to_i)) +
+        (3 * (routing_number[1].to_i + routing_number[4].to_i + routing_number[7].to_i)) +
+        (9 * (routing_number[2].to_i + routing_number[5].to_i + routing_number[8].to_i))
+    )
+
+    assert_equal(0, checksum % 10, 'The routing number\'s checksum is not a multiple of ten')
+  end
+end