ffaker 1.31.0 → 1.32.0

data/lib/ffaker/string.rb

@@ -7,12 +7,12 @@ module Faker
 
     BACKSLASH = '\\'
 
-    LOWERS     = k(('a'..'z').to_a)
-    UPPERS     = k(('A'..'Z').to_a)
-    LETTERS    = k(LOWERS + UPPERS)
-    NUMBERS    = k(('0'..'9').to_a)
-    WORD_CHARS = k(LETTERS + NUMBERS + ['_'])
-    SPACES     = k([" ", "\t"])
+    LOWERS     = [*'a'..'z']
+    UPPERS     = [*'A'..'Z']
+    LETTERS    = LOWERS + UPPERS
+    NUMBERS    = [*'0'..'9']
+    WORD_CHARS = LETTERS + NUMBERS + ['_']
+    SPACES     = [" ", "\t"]
     ESCAPEABLE_CHARS = '\\', '/', '.', '(', ')', '[', ']', '{', '}'
 
     def from_regexp(exp)

data/lib/ffaker/time.rb

@@ -5,6 +5,8 @@ module Faker
     extend ModuleUtils
     extend self
 
+    MONTHS = %w(January February March April May June July August September October November December)
+
     def month
       MONTHS.sample
     end
@@ -24,7 +26,5 @@ module Faker
       end
       date.strftime "%Y-%m-%d %T %z"
     end
-
-    MONTHS = k %w(January February March April May June July August September October November December)
   end
 end

data/lib/ffaker/unit.rb

@@ -7,6 +7,19 @@ module Faker
     extend ModuleUtils
     extend self
 
+    TIME_UNITS = [
+      {name: 'Years', abbreviation: 'yr'},
+      {name: 'Days', abbreviation: 'd'},
+      {name: 'Hours', abbreviation: 'Minutes'},
+      {name: 'Seconds', abbreviation: 's'},
+      {name: 'Milliseconds', abbreviation: 'msec'}
+    ]
+    TEMPERATURE_UNITS = [
+      {name: 'Kelvin', abbreviation: 'K'},
+      {name: 'Celsius', abbreviation: 'C'},
+      {name: 'Fahrenheit', abbreviation: 'F'}
+    ]
+
     def time_name
       time.name
     end
@@ -32,19 +45,5 @@ module Faker
     def temperature
       OpenStruct.new TEMPERATURE_UNITS.sample
     end
-
-    TIME_UNITS = k [
-      {:name => 'Years', :abbreviation => 'yr'},
-      {:name => 'Days', :abbreviation => 'd'},
-      {:name => 'Hours', :abbreviation => 'Minutes'},
-      {:name => 'Seconds', :abbreviation => 's'},
-      {:name => 'Milliseconds', :abbreviation => 'msec'}
-    ]
-
-    TEMPERATURE_UNITS = k [
-      {:name => 'Kelvin', :abbreviation => 'K'},
-      {:name => 'Celsius', :abbreviation => 'C'},
-      {:name => 'Fahrenheit', :abbreviation => 'F'}
-    ]
   end
 end

data/lib/ffaker/unit_english.rb

@@ -10,6 +10,41 @@ module Faker
     extend ModuleUtils
     extend self
 
+    LENGTH_UNITS = [
+      { name: "inch", abbreviation: "in"},
+      { name: "foot", abbreviation: "ft"},
+      {  name: "yard", abbreviation: "yd"},
+      { name: "furlong", abbreviation: "fur"},
+      { name: "mile", abbreviation: "m"}
+    ]
+    MASS_UNITS = [
+      { name: "grains", abbreviation: "gr"},
+      { name: "ounces", abbreviation: "oz"},
+      { name: "pounds", abbreviation: "lb" },
+      { name: "hundredweight", abbreviation: "cwt"},
+      { name: "ton", abbreviation: "t" }
+    ]
+    LIQUID_UNITS = [
+      { name: "fluid ounce", abbreviation: "fl oz"},
+      { name: "gill", abbreviation: "gi"},
+      { name: "pint", abbreviation: "pt"},
+      { name: "quart", abbreviation: "qt"}
+    ]
+    VOLUME_UNITS = [
+      { name: "cubic inch", abbreviation: "CI"},
+      { name: "cubic foot", abbreviation: "CFT"},
+      { name: "cubic yard", abbreviation: "CY"}
+    ]
+    AREA_UNITS = [
+      { name: "square inch", abbreviation: "sq. in"},
+      { name: "square foot", abbreviation: "sq ft"},
+      { name: "square yard", abbreviation: "sq yd"},
+      { name: "acre", abbreviation: "ac"},
+      { name: "section", abbreviation: "s"},
+      { name: "square mile", abbreviation: "sq mi"},
+      { name: "township", abbreviation: "Twp"}
+    ]
+
     def mass_name
       mass.name
     end
@@ -72,43 +107,5 @@ module Faker
       OpenStruct.new AREA_UNITS.sample
     end
 
-    LENGTH_UNITS = k [
-      { :name =>"inch", :abbreviation => "in"},
-      { :name =>"foot", :abbreviation => "ft"},
-      {  :name =>"yard", :abbreviation => "yd"},
-      { :name =>"furlong", :abbreviation => "fur"},
-      { :name =>"mile", :abbreviation => "m"}
-    ]
-
-    MASS_UNITS = k [
-      { :name => "grains", :abbreviation => "gr"},
-      { :name => "ounces", :abbreviation => "oz"},
-      { :name => "pounds", :abbreviation => "lb" },
-      { :name => "hundredweight", :abbreviation => "cwt"},
-      { :name => "ton", :abbreviation => "t" }
-    ]
-
-    LIQUID_UNITS = k [
-      { :name => "fluid ounce", :abbreviation => "fl oz"},
-      { :name => "gill", :abbreviation => "gi"},
-      { :name => "pint", :abbreviation => "pt"},
-      { :name => "quart", :abbreviation => "qt"}
-    ]
-
-    VOLUME_UNITS = k [
-      { :name =>"cubic inch", :abbreviation => "CI"},
-      { :name =>"cubic foot", :abbreviation => "CFT"},
-      { :name =>"cubic yard", :abbreviation => "CY"}
-    ]
-
-    AREA_UNITS = k [
-      { :name =>"square inch", :abbreviation => "sq. in"},
-      { :name =>"square foot", :abbreviation => "sq ft"},
-      { :name =>"square yard", :abbreviation => "sq yd"},
-      { :name =>"acre", :abbreviation => "ac"},
-      { :name =>"section", :abbreviation => "s"},
-      { :name =>"square mile", :abbreviation => "sq mi"},
-      { :name =>"township", :abbreviation => "Twp"}
-    ]
   end
 end

data/lib/ffaker/unit_metric.rb

@@ -10,6 +10,32 @@ module Faker
     extend ModuleUtils
     extend self
 
+    LENGTH_UNITS = [
+      { name: "millimeters", abbreviation: "mm"},
+      { name: "centimeters", abbreviation: "cm"},
+      {  name: "meters", abbreviation: "m"},
+      { name: "kilometers", abbreviation: "km"}
+    ]
+    MASS_UNITS = [
+      { name: "gram", abbreviation: "g"},
+      { name: "kilogram", abbreviation: "kg" },
+      { name: "metric ton", abbreviation: "mt"}
+    ]
+    LIQUID_UNITS = [
+      { name: "milliliters", abbreviation: "ml"},
+      { name: "liters", abbreviation: "L"}
+    ]
+    VOLUME_UNITS = [
+      { name: " cubic centimeters", abbreviation: "cm^3"},
+      { name: "cubic meters", abbreviation: "m^3"}
+    ]
+    AREA_UNITS = [
+      { name: "centimeters squared", abbreviation: "cm^2"},
+      { name: "meters squared", abbreviation: "m^2"},
+      { name: "hectares", abbreviation: "ha"},
+      { name: "kilometers", abbreviation: "km" }
+    ]
+
     def mass_name
       mass.name
     end
@@ -71,35 +97,5 @@ module Faker
     def area
       OpenStruct.new AREA_UNITS.sample
     end
-
-    LENGTH_UNITS = k [
-      { :name =>"millimeters", :abbreviation => "mm"},
-      { :name =>"centimeters", :abbreviation => "cm"},
-      {  :name =>"meters", :abbreviation => "m"},
-      { :name =>"kilometers", :abbreviation => "km"}
-    ]
-
-    MASS_UNITS = k [
-      { :name => "gram", :abbreviation => "g"},
-      { :name => "kilogram", :abbreviation => "kg" },
-      { :name => "metric ton", :abbreviation => "mt"}
-    ]
-
-    LIQUID_UNITS = k [
-      { :name => "milliliters", :abbreviation => "ml"},
-      { :name => "liters", :abbreviation => "L"}
-    ]
-
-    VOLUME_UNITS = k [
-      { :name => " cubic centimeters", :abbreviation => "cm^3"},
-      { :name => "cubic meters", :abbreviation => "m^3"}
-    ]
-
-    AREA_UNITS = k [
-      { :name => "centimeters squared", :abbreviation => "cm^2"},
-      { :name => "meters squared", :abbreviation => "m^2"},
-      { :name => "hectares", :abbreviation => "ha"},
-      { :name => "kilometers", :abbreviation => "km" }
-    ]
   end
 end

data/lib/ffaker/utils/array_utils.rb

@@ -17,7 +17,7 @@ module Faker
     end
 
     def self.freeze_all(array)
-      array.each { |e| e.freeze }
+      array.each(&:freeze)
       array.freeze
       array
     end

data/lib/ffaker/vehicle.rb

@@ -5,6 +5,13 @@ module Faker
     extend ModuleUtils
     extend self
 
+    DRIVETRAINS = %w(4WD 4X4 AWD FWD RWD)
+    YEARS = [*'1900'.."#{Date.today.year+1}"]
+    COLOR_PREFIXES = k(%w(
+      beautiful bright calm dangerous dark dull fast magnetic magnificent majestic melodic metallic
+      mundane mute mysterious new pleasant pretty resonant royal slate soft tranquil vibrant weak
+    ))
+
     def base_color
       Faker::Color.name
     end
@@ -38,13 +45,5 @@ module Faker
     def year
       YEARS.sample
     end
-
-    DRIVETRAINS = k(%w(4WD 4X4 AWD FWD RWD))
-    YEARS = k('1900'.."#{Date.today.year+1}")
-    COLOR_PREFIXES = k(%w(
-      beautiful bright calm dangerous dark dull fast magnetic magnificent majestic melodic metallic
-      mundane mute mysterious new pleasant pretty resonant royal slate soft tranquil vibrant weak
-    ))
-
   end
 end

data/test/test_address_ca.rb

@@ -11,6 +11,10 @@ class TestAddressCA < Test::Unit::TestCase
     assert_match /[A-Z][A-Z]/, Faker::AddressCA.province_abbr
   end
 
+  def test_city
+    assert Faker::AddressCA::CITY.include?(Faker::AddressCA.city)
+  end
+
   def test_postal_code
     assert_match /[A-Z]\d[A-Z]\W\d[A-Z]\d/, Faker::AddressCA.postal_code
   end

data/test/test_identification_co.rb

@@ -7,32 +7,26 @@ class TestFakerIdentificationESCO < Test::Unit::TestCase
   end
 
   def test_drivers_license
-    # pattern \d{6,14}
-    assert_match /\d{6,14}/, @tester.drivers_license
-    assert @tester.drivers_license.length.between?(6,14)
+    assert_match(/\A\d{6,14}\z/, @tester.drivers_license)
   end
 
   def test_id
-    assert @tester.method_defined? :id
+    assert @tester.method_defined?(:id)
   end
 
   def test_gender
-    assert_match /(Hombre|Mujer)/, @tester.gender
+    assert_match(/\A(Hombre|Mujer)\z/, @tester.gender)
   end
 
   def test_category
-    assert_match /^([a][1-2]|[bc][1-3])$/i, @tester.driver_license_category
+    assert_match(/\A([a][1-2]|[bc][1-3])\z/i, @tester.driver_license_category)
   end
 
   def test_blood_type
-    assert_match /^(a|b|o|ab)[\+|\-]$/i, @tester.blood_type
+    assert_match(/\A(a|b|o|ab)[+-]\z/i, @tester.blood_type)
   end
 
   def test_expedition_date
-    test_today = Date.today
-    # 1 today is bigger than result
-    # 0 today is the same day as result
-    # -1 today is smaller than expected
-    assert_equal(1, test_today <=> @tester.expedition_date)
+    assert(Date.today >= @tester.expedition_date)
   end
-end
+end

data/test/test_lorem_kr.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestLoremKR < Test::Unit::TestCase
+  KOREAN_SENTENCE_MATCHER = /\A[ .가-힣]+\z/
+  KOREAN_WORDS_MATCHER = /\A[ 가-힣]+\z/
+  KOREAN_WORD_MATCHER = /\A[가-힣]+\z/
+  def setup
+    @tester = Faker::LoremKR
+  end
+
+  def test_paragraph
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.paragraph
+  end
+
+  def test_sentence
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.sentence
+    assert_nothing_thrown do
+      100.times { Faker::Lorem.sentence 0 }
+    end
+  end
+
+  def test_phrase
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.phrase
+  end
+
+  def test_paragraphs
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.paragraphs.join(" ")
+  end
+
+  def test_sentences
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.sentences.join(" ")
+  end
+
+  def test_phrases
+    assert_match KOREAN_SENTENCE_MATCHER, @tester.phrases.join(" ")
+  end
+
+  def test_words
+    assert_match KOREAN_WORDS_MATCHER, @tester.words.join(" ")
+  end
+
+  def test_word
+    assert_match KOREAN_WORD_MATCHER, @tester.word
+  end
+end

data/test/test_name_cn.rb

@@ -8,6 +8,14 @@ class TestFakerNameCN < Test::Unit::TestCase
   end
 
   def test_name
-    assert Faker::NameCN.name.length > 2
+    assert_match(/\A.{2,}\z/, @tester.name)
+  end
+
+  def test_first_name
+    assert_match(/\A.{1,2}\z/, @tester.first_name)
+  end
+
+  def test_last_name
+    assert_match(/\A.{1,5}\z/, @tester.last_name)
   end
 end

data/test/test_phone_number_cu.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+
+require 'helper'
+
+# Author: Luilver<luilver@gmail.com>
+class TestPhoneNumberCU < Test::Unit::TestCase
+  def setup
+    @tester = Faker::PhoneNumberCU
+  end
+
+  # Prefix format test
+  #
+  def test_mobile_phone_prefix
+    assert Faker::PhoneNumberCU::MobileOperatorsPrefix.include?(
+      @tester.mobile_phone_prefix)
+  end
+
+  def test_home_work_phone_prefix
+    assert Faker::PhoneNumberCU::HomeWorkOperatorsPrefix.include?(
+      @tester.home_work_phone_prefix)
+  end
+
+  def test_phone_prefix
+    10.times do
+      assert Faker::PhoneNumberCU::OperatorsPrefix.include?(
+        @tester.phone_prefix)
+    end
+  end
+
+  # General format test
+  #
+  def test_mobile_phone_number
+    assert_match /05 \d{3} \d{4}/,
+      Faker::PhoneNumberCU.mobile_phone_number
+  end
+
+  def test_home_work_phone_number
+    assert_match /\(0(7\) \d{3}|\d{2}\) \d{2}) \d{4}/,
+      Faker::PhoneNumberCU.home_work_phone_number
+  end
+
+  def test_general_phone_number
+    10.times do
+      assert_match /((05|\(07\)) \d{3}|\(0\d{2}\) \d{2}) \d{4}/,
+        Faker::PhoneNumberCU.general_phone_number
+    end
+  end
+
+  # International format tests
+  #
+  def test_international_mobile_phone_number
+    assert_match /(00|\+)535 \d{3} \d{4}/,
+      Faker::PhoneNumberCU.international_mobile_phone_number
+  end
+
+  def test_international_home_work_phone_number
+    assert_match /(00|\+)53(7 \d{3}|\d{2} \d{2}) \d{4}/,
+      Faker::PhoneNumberCU.international_home_work_phone_number
+  end
+
+  def test_international_phone_number
+    10.times do
+      assert_match /(00|\+)53((5|7) \d{3}|\d{2} \d{2}) \d{4}/,
+        Faker::PhoneNumberCU.international_phone_number
+    end
+  end
+
+  # E.164 format tests
+  #
+  def test_e164_mobile_phone_number
+    assert_match /535\d{7}/,
+      Faker::PhoneNumberCU.e164_mobile_phone_number
+  end
+
+  def test_e164_home_work_phone_number
+    assert_match /53(7\d{7}|\d{2}\d{6})/,
+      Faker::PhoneNumberCU.e164_home_work_phone_number
+  end
+
+  def test_e164_phone_number
+    10.times do
+      assert_match /53((5|7)\d{7}|\d{2}\d{6})/,
+        Faker::PhoneNumberCU.e164_phone_number
+    end
+  end
+end