ffaker 2.21.0 → 2.23.0

data/test/test_module_utils.rb

@@ -11,4 +11,37 @@ class TestModuleUtils < Test::Unit::TestCase
     assert result.frozen?
     result.each { |e| assert e.frozen? }
   end
+
+  def test_unique
+    generator = Object.new
+    generator.extend FFaker::ModuleUtils
+    # returns [1 1 2 2 1 1 2 2 ..][call_index]
+    def generator.test
+      index = Thread.current[:test_unique] ||= 0
+      Thread.current[:test_unique] = (index > 2 ? 0 : index + 1)
+      (index / 2) + 1
+    end
+
+    assert_equal(1, generator.unique.test)
+    assert_equal(2, generator.unique.test)
+
+    Thread.new do
+      assert_equal(1, generator.unique.test)
+      assert_equal(2, generator.unique.test)
+
+      assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+        generator.unique.test
+      end
+
+      generator.unique.clear
+      generator.unique.test
+    end.join
+
+    assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+      generator.unique.test
+    end
+
+    FFaker::UniqueUtils.clear
+    generator.unique.test
+  end
 end

data/test/test_name_da.rb

@@ -10,7 +10,7 @@ class TestFakerNameDA < Test::Unit::TestCase
     :any_name, :male_name, :female_name, :last_name, :prefix
   )
 
-  RU_REGEX = /[А-Я][а-я]+/.freeze
+  RU_REGEX = /[А-Я][а-я]+/
 
   def setup
     @tester = FFaker::NameDA

data/test/test_name_ph.rb

@@ -5,7 +5,7 @@ require_relative 'helper'
 class TestFakerNamePH < Test::Unit::TestCase
   include DeterministicHelper
 
-  PH_REGEXP = /\A([\wñÑú-]+\.? ?){2,5}\z/.freeze
+  PH_REGEXP = /\A([\wñÑú-]+\.? ?){2,5}\z/
 
   assert_methods_are_deterministic(
     FFaker::NamePH,

data/test/test_name_ru.rb

@@ -5,8 +5,8 @@ require_relative 'helper'
 class TestNameRU < Test::Unit::TestCase
   include DeterministicHelper
 
-  RU_REGEX = /\A[а-яА-Я]{2,}\z/.freeze
-  RU_REGEX_MULTIPLE_WORDS = /\A[а-яА-Я\s]+\z/.freeze
+  RU_REGEX = /\A[а-яА-Я]{2,}\z/
+  RU_REGEX_MULTIPLE_WORDS = /\A[а-яА-Я\s]+\z/
 
   assert_methods_are_deterministic(
     FFaker::NameRU,

data/test/test_name_ua.rb

@@ -15,8 +15,8 @@ class TestNameUA < Test::Unit::TestCase
   def setup
     @tester = FFaker::NameUA
 
-    @single_word_name_regexp    = /\A[а-яА-ЯіїєґІЇЄҐ’\-]+\z/.freeze
-    @multiple_words_name_regexp = /\A[а-яА-ЯіїєґІЇЄҐ’\-\s]+\z/.freeze
+    @single_word_name_regexp    = /\A[а-яА-ЯіїєґІЇЄҐ’-]+\z/
+    @multiple_words_name_regexp = /\A[а-яА-ЯіїєґІЇЄҐ’\-\s]+\z/
   end
 
   def test_first_name_male

data/test/test_number.rb

@@ -5,7 +5,7 @@ require_relative 'helper'
 class TestNumber < Test::Unit::TestCase
   include DeterministicHelper
 
-  assert_methods_are_deterministic(FFaker::Number, :number, :decimal)
+  assert_methods_are_deterministic(FFaker::Number, :number, :decimal, :between)
 
   def setup
     @tester = FFaker::Number
@@ -42,4 +42,16 @@ class TestNumber < Test::Unit::TestCase
       @tester.decimal(fractional_digits: 0)
     end
   end
+
+  def test_between
+    from = -50
+    to = 50
+    assert_random_between(from..to) { @tester.between(from: from, to: to) }
+    assert_instance_of Integer, @tester.between(from: from, to: to)
+
+    from = -50.0
+    to = 50.0
+    assert_random_between(from..to) { @tester.between(from: from, to: to) }
+    assert_instance_of Float, @tester.between(from: from, to: to)
+  end
 end

data/test/test_phone_number_nl.rb

@@ -24,7 +24,7 @@ class TestPhoneNumberNL < Test::Unit::TestCase
 
   def test_phone_number
     10.times do
-      assert_match(/^0([\s\-]*\d){9}$/, @tester.phone_number)
+      assert_match(/^0([\s-]*\d){9}$/, @tester.phone_number)
     end
   end
 

data/test/test_phone_number_se.rb

@@ -16,7 +16,7 @@ class TestPhoneNumberSE < Test::Unit::TestCase
     @tester = FFaker::PhoneNumberSE
   end
 
-  ALLOWED_CHARS = /[()\d +-]/.freeze
+  ALLOWED_CHARS = /[()\d +-]/
 
   def test_mobile_phone_prefix
     assert FFaker::PhoneNumberSE::MOBILE_PHONE_PREFIX.include?(@tester.mobile_prefix)

data/test/test_phone_number_sg.rb

@@ -17,36 +17,36 @@ class TestPhoneNumberSG < Test::Unit::TestCase
   end
 
   def test_voip_number
-    assert_match(/3\d{3}\s\d{4}/, @tester.voip_number)
+    assert_match(/\A3\d{3}\s\d{4}\z/, @tester.voip_number)
   end
 
   def test_fixed_line_number
-    assert_match(/6\d{3}\s\d{4}/, @tester.fixed_line_number)
+    assert_match(/\A6\d{3}\s\d{4}\z/, @tester.fixed_line_number)
   end
 
   def test_mobile_number
-    assert_match(/8\d{3}\s\d{4}/, @tester.mobile_number)
+    assert_match(/\A8\d{3}\s\d{4}\z/, @tester.mobile_number)
   end
 
   def test_mobile_or_pager_number
-    assert_match(/9\d{3}\s\d{4}/, @tester.mobile_or_pager_number)
+    assert_match(/\A9\d{3}\s\d{4}\z/, @tester.mobile_or_pager_number)
   end
 
   def test_international_toll_free_number
-    assert_match(/800\s\d{3}\s\d{4}/, @tester.international_toll_free_number)
+    assert_match(/\A800\s\d{3}\s\d{4}\z/, @tester.international_toll_free_number)
   end
 
   def test_toll_free_number
-    assert_match(/1800\s\d{3}\s\d{4}/, @tester.toll_free_number)
+    assert_match(/\A1800\s\d{3}\s\d{4}\z/, @tester.toll_free_number)
   end
 
   def test_premium_service_number
-    assert_match(/1900\s\d{3}\s\d{4}/, @tester.premium_service_number)
+    assert_match(/\A1900\s\d{3}\s\d{4}\z/, @tester.premium_service_number)
   end
 
   def test_phone_number
     10.times do
-      assert_match(/[6,8,9]\d{3}\s\d{4}/, @tester.phone_number)
+      assert_match(/\A[689]\d{3}\s\d{4}\z/, @tester.phone_number)
     end
   end
 end

data/test/test_unique_utils.rb

@@ -39,16 +39,40 @@ class TestUniqueUtils < Test::Unit::TestCase
       unique_object.test
     end
 
-    FFaker::UniqueUtils.clear
+    unique_object.clear
 
     assert_equal(1, unique_object.test)
+  end
 
-    assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
-      unique_object.test
+  def test_clears_all_unique_values
+    stubbed_generator = Object.new
+    def stubbed_generator.test
+      1
+    end
+    other_stubbed_generator = Object.new
+    def other_stubbed_generator.test
+      1
     end
 
-    unique_object.clear
+    unique_object = FFaker::UniqueUtils.add_instance(stubbed_generator, 3)
+    other_unique_object = FFaker::UniqueUtils.add_instance(other_stubbed_generator, 3)
 
-    assert_equal(1, unique_object.test)
+    [unique_object, other_unique_object].each do |tested_unique_object|
+      assert_equal(1, tested_unique_object.test)
+
+      assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+        tested_unique_object.test
+      end
+    end
+
+    FFaker::UniqueUtils.clear
+
+    [unique_object, other_unique_object].each do |tested_unique_object|
+      assert_equal(1, tested_unique_object.test)
+    end
+  end
+
+  def test_generates_unique_numbers
+    assert_nothing_raised { FFaker::Number.unique.number(digits: 1) }
   end
 end

data/test/test_units.rb

@@ -13,25 +13,25 @@ class TestUnits < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::Unit
-    @time_units = @tester::TIME_UNITS.map { |u| OpenStruct.new u }
-    @temperature_units = @tester::TEMPERATURE_UNITS.map { |u| OpenStruct.new u }
+    @time_units = @tester::TIME_UNITS
+    @temperature_units = @tester::TEMPERATURE_UNITS
   end
 
   def test_time_name
-    assert_include @time_units.map(&:name), @tester.time_name
+    assert_include @time_units.map { |unit| unit[:name] }, @tester.time_name
   end
 
   def test_time_abbr
-    assert_include @time_units.map(&:abbreviation), @tester.time_abbr
+    assert_include @time_units.map { |unit| unit[:abbreviation] }, @tester.time_abbr
   end
 
   def test_temperature_name
-    assert_include @temperature_units.map(&:name), @tester.temperature_name
+    assert_include @temperature_units.map { |unit| unit[:name] }, @tester.temperature_name
   end
 
   def test_temperature_abbr
     assert_include \
-      @temperature_units.map(&:abbreviation),
+      @temperature_units.map { |unit| unit[:abbreviation] },
       @tester.temperature_abbr
   end
 end

data/test/test_units_english.rb

@@ -14,50 +14,50 @@ class TestUnitsEnglish < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::UnitEnglish
-    @length_units = @tester::LENGTH_UNITS.map { |u| OpenStruct.new u }
-    @mass_units = @tester::MASS_UNITS.map { |u| OpenStruct.new u }
-    @liquid_units = @tester::LIQUID_UNITS.map { |u| OpenStruct.new u }
-    @volume_units = @tester::VOLUME_UNITS.map { |u| OpenStruct.new u }
-    @area_units = @tester::AREA_UNITS.map { |u| OpenStruct.new u }
+    @length_units = @tester::LENGTH_UNITS
+    @mass_units = @tester::MASS_UNITS
+    @liquid_units = @tester::LIQUID_UNITS
+    @volume_units = @tester::VOLUME_UNITS
+    @area_units = @tester::AREA_UNITS
   end
 
   def test_length_name
-    assert_include @length_units.map(&:name), @tester.length_name
+    assert_include @length_units.map { |unit| unit[:name] }, @tester.length_name
   end
 
   def test_length_abbrev
-    assert_include @length_units.map(&:abbreviation), @tester.length_abbr
+    assert_include @length_units.map { |unit| unit[:abbreviation] }, @tester.length_abbr
   end
 
   def test_mass_name
-    assert_include @mass_units.map(&:name), @tester.mass_name
+    assert_include @mass_units.map { |unit| unit[:name] }, @tester.mass_name
   end
 
   def test_mass_abbr
-    assert_include @mass_units.map(&:abbreviation), @tester.mass_abbr
+    assert_include @mass_units.map { |unit| unit[:abbreviation] }, @tester.mass_abbr
   end
 
   def test_liquid_name
-    assert_include @liquid_units.map(&:name), @tester.liquid_name
+    assert_include @liquid_units.map { |unit| unit[:name] }, @tester.liquid_name
   end
 
   def test_liquid_abbr
-    assert_include @liquid_units.map(&:abbreviation), @tester.liquid_abbr
+    assert_include @liquid_units.map { |unit| unit[:abbreviation] }, @tester.liquid_abbr
   end
 
   def test_volume_name
-    assert_include @volume_units.map(&:name), @tester.volume_name
+    assert_include @volume_units.map { |unit| unit[:name] }, @tester.volume_name
   end
 
   def test_volume_abbr
-    assert_include @volume_units.map(&:abbreviation), @tester.volume_abbr
+    assert_include @volume_units.map { |unit| unit[:abbreviation] }, @tester.volume_abbr
   end
 
   def test_area_name
-    assert_include @area_units.map(&:name), @tester.area_name
+    assert_include @area_units.map { |unit| unit[:name] }, @tester.area_name
   end
 
   def test_area_abbr
-    assert_include @area_units.map(&:abbreviation), @tester.area_abbr
+    assert_include @area_units.map { |unit| unit[:abbreviation] }, @tester.area_abbr
   end
 end

data/test/test_units_metric.rb

@@ -14,50 +14,50 @@ class TestUnitsMetric < Test::Unit::TestCase
 
   def setup
     @tester = FFaker::UnitMetric
-    @length_units = @tester::LENGTH_UNITS.map { |u| OpenStruct.new u }
-    @mass_units = @tester::MASS_UNITS.map { |u| OpenStruct.new u }
-    @liquid_units = @tester::LIQUID_UNITS.map { |u| OpenStruct.new u }
-    @volume_units = @tester::VOLUME_UNITS.map { |u| OpenStruct.new u }
-    @area_units = @tester::AREA_UNITS.map { |u| OpenStruct.new u }
+    @length_units = @tester::LENGTH_UNITS
+    @mass_units = @tester::MASS_UNITS
+    @liquid_units = @tester::LIQUID_UNITS
+    @volume_units = @tester::VOLUME_UNITS
+    @area_units = @tester::AREA_UNITS
   end
 
   def test_length_name
-    assert_include @length_units.map(&:name), @tester.length_name
+    assert_include @length_units.map { |unit| unit[:name] }, @tester.length_name
   end
 
   def test_length_abbrev
-    assert_include @length_units.map(&:abbreviation), @tester.length_abbr
+    assert_include @length_units.map { |unit| unit[:abbreviation] }, @tester.length_abbr
   end
 
   def test_mass_name
-    assert_include @mass_units.map(&:name), @tester.mass_name
+    assert_include @mass_units.map { |unit| unit[:name] }, @tester.mass_name
   end
 
   def test_mass_abbr
-    assert_include @mass_units.map(&:abbreviation), @tester.mass_abbr
+    assert_include @mass_units.map { |unit| unit[:abbreviation] }, @tester.mass_abbr
   end
 
   def test_liquid_name
-    assert_include @liquid_units.map(&:name), @tester.liquid_name
+    assert_include @liquid_units.map { |unit| unit[:name] }, @tester.liquid_name
   end
 
   def test_liquid_abbr
-    assert_include @liquid_units.map(&:abbreviation), @tester.liquid_abbr
+    assert_include @liquid_units.map { |unit| unit[:abbreviation] }, @tester.liquid_abbr
   end
 
   def test_volume_name
-    assert_include @volume_units.map(&:name), @tester.volume_name
+    assert_include @volume_units.map { |unit| unit[:name] }, @tester.volume_name
   end
 
   def test_volume_abbr
-    assert_include @volume_units.map(&:abbreviation), @tester.volume_abbr
+    assert_include @volume_units.map { |unit| unit[:abbreviation] }, @tester.volume_abbr
   end
 
   def test_area_name
-    assert_include @area_units.map(&:name), @tester.area_name
+    assert_include @area_units.map { |unit| unit[:name] }, @tester.area_name
   end
 
   def test_area_abbr
-    assert_include @area_units.map(&:abbreviation), @tester.area_abbr
+    assert_include @area_units.map { |unit| unit[:abbreviation] }, @tester.area_abbr
   end
 end

data/test/test_vehicle.rb

@@ -5,6 +5,14 @@ require_relative 'helper'
 class TestVehicle < Test::Unit::TestCase
   include DeterministicHelper
 
+  # https://en.wikibooks.org/wiki/Vehicle_Identification_Numbers_(VIN_codes)/Check_digit
+  VIN_TRANSLITERATION_VALUES = {
+    'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8,
+    'J' => 1, 'K' => 2, 'L' => 3, 'M' => 4, 'N' => 5, 'P' => 7, 'R' => 9,
+    'S' => 2, 'T' => 3, 'U' => 4, 'V' => 5, 'W' => 6, 'X' => 7, 'Y' => 8, 'Z' => 9
+  }.freeze
+  VIN_POSITION_WEIGHTS = [8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2].freeze
+
   assert_methods_are_deterministic(
     FFaker::Vehicle,
     :base_color, :drivetrain, :engine_cylinders, :engine_displacement,
@@ -47,6 +55,7 @@ class TestVehicle < Test::Unit::TestCase
     assert_not_match(/[IOQ]/, vin) # VINs can't have these letters
     assert_includes(FFaker::Vehicle::VIN::VALID_ALPHA, vin[6]) # passenger vehicle designator
     assert_includes(FFaker::Vehicle::VIN::VALID_YEAR_CHARS, vin[9]) # check year character
+    assert_equal(vin_checksum_digit(vin), vin[8])
   end
 
   def test_drivetrain
@@ -76,4 +85,17 @@ class TestVehicle < Test::Unit::TestCase
   def test_interior_upholstery
     assert_match(/\A[ a-z0-9]+\z/i, FFaker::Vehicle.interior_upholstery)
   end
+
+  private
+
+  def vin_checksum_digit(vin)
+    weighted_sum = vin.chars.each_with_index.sum do |char, idx|
+      (VIN_TRANSLITERATION_VALUES[char] || char).to_i * VIN_POSITION_WEIGHTS[idx]
+    end
+
+    check_digit = weighted_sum % 11
+    check_digit == '10' ? 'X' : check_digit
+    check_digit = 'X' if check_digit == 10
+    check_digit.to_s
+  end
 end