ffaker 2.6.0 → 2.7.0

data/lib/ffaker/identification_es_co.rb

@@ -10,11 +10,11 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    BLOOD_TYPE = %w(A B O AB).freeze
-    LICENSE_CATEGORY = %w(A B C).freeze
+    BLOOD_TYPE = %w[A B O AB].freeze
+    LICENSE_CATEGORY = %w[A B C].freeze
 
     def drivers_license
-      how_many_numbers = 6 + rand(8)
+      how_many_numbers = rand(6..13)
       FFaker.numerify('#' * how_many_numbers)
     end
 
@@ -23,12 +23,12 @@ module FFaker
     def driver_license_category
       category = fetch_sample(LICENSE_CATEGORY)
       # the categories are A1 A2 B1 B2 B3 C1 C2 C3
-      num = category == 'A' ? 1 + rand(2) : 1 + rand(3)
+      num = category == 'A' ? rand(1..2) : rand(1..3)
       "#{category}#{num}"
     end
 
     def blood_type # RH
-      sign = fetch_sample(%w(+ -))
+      sign = fetch_sample(%w[+ -])
       "#{fetch_sample(BLOOD_TYPE)}#{sign}"
     end
 

data/lib/ffaker/identification_mx.rb

@@ -8,8 +8,8 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    CONSONANTS = %w(B C D F G H J K L M N P Q R S T V W X Y Z).freeze
-    VOWELS = %w(A E I O U).freeze
+    CONSONANTS = %w[B C D F G H J K L M N P Q R S T V W X Y Z].freeze
+    VOWELS = %w[A E I O U].freeze
     HOMOCLAVE = CONSONANTS + VOWELS + [*'0'..'9']
 
     # http://es.wikipedia.org/wiki/Registro_Federal_de_Contribuyentes_(M%C3%A9xico)
@@ -46,7 +46,7 @@ module FFaker
     # Clave Única de Registro de Población
     def curp
       all_letters = CONSONANTS + VOWELS
-      hm = %w(H M)
+      hm = %w[H M]
       date = ::Time.at(rand * ::Time.now.to_f).strftime('%y%m%d')
       [
         fetch_sample(CONSONANTS),
@@ -57,7 +57,7 @@ module FFaker
         fetch_sample(ESTADOS_CURP),
         fetch_sample(CONSONANTS, count: 3).join,
         fetch_sample(HOMOCLAVE),
-        rand(10)
+        rand(0..9)
       ].join
     end
   end

data/lib/ffaker/internet.rb

@@ -6,11 +6,11 @@ module FFaker
     extend self
 
     BYTE = [*'0'..'255'].freeze
-    HOSTS = %w(gmail.com yahoo.com hotmail.com).freeze
-    DISPOSABLE_HOSTS = %w(mailinator.com suremail.info spamherelots.com binkmail.com safetymail.info).freeze
-    DOMAIN_SUFFIXES = %w(co.uk com us ca biz info name).freeze
-    SAFE_DOMAIN_SUFFIXES = %w(org com net).freeze
-    SLUG_DELIMITERS = %w(- _ .).freeze
+    HOSTS = %w[gmail.com yahoo.com hotmail.com].freeze
+    DISPOSABLE_HOSTS = %w[mailinator.com suremail.info spamherelots.com binkmail.com safetymail.info].freeze
+    DOMAIN_SUFFIXES = %w[co.uk com us ca biz info name].freeze
+    SAFE_DOMAIN_SUFFIXES = %w[org com net].freeze
+    SLUG_DELIMITERS = %w[- _ .].freeze
     MAC_LIMIT = 281_474_976_710_655
 
     def email(name = nil)
@@ -33,14 +33,14 @@ module FFaker
 
     def user_name(name = nil)
       if name
-        parts = shuffle(name.scan(/\w+/)).join(fetch_sample(%w(. _)))
+        parts = shuffle(name.scan(/\w+/)).join(fetch_sample(%w[. _]))
         parts.downcase
       else
-        case rand(2)
+        case rand(0..1)
         when 0
           sanitize(Name.first_name)
         when 1
-          [Name.first_name, Name.last_name].map { |n| sanitize(n) }.join(fetch_sample(%w(. _)))
+          [Name.first_name, Name.last_name].map { |n| sanitize(n) }.join(fetch_sample(%w[. _]))
         end
       end
     end
@@ -85,7 +85,7 @@ module FFaker
     end
 
     def mac(delimiter = ':')
-      rand(MAC_LIMIT).to_s(16).rjust(12, '0').scan(/.{2}/).join(delimiter)
+      rand(0...MAC_LIMIT).to_s(16).rjust(12, '0').scan(/.{2}/).join(delimiter)
     end
 
     private

data/lib/ffaker/internet_se.rb

@@ -10,10 +10,10 @@ module FFaker
     extend self
 
     BYTE = [*'0'..'255'].freeze
-    HOSTS = %w(gmail.com yahoo.com hotmail.com spray.se passagen.se).freeze
-    DOMAIN_SUFFIXES = %w(se nu com).freeze
-    DISPOSABLE_HOSTS = %w(mailinator.com suremail.info spamherelots.com binkmail.com safetymail.info).freeze
-    SLUG_DELIMITERS = %w(- _ .).freeze
+    HOSTS = %w[gmail.com yahoo.com hotmail.com spray.se passagen.se].freeze
+    DOMAIN_SUFFIXES = %w[se nu com].freeze
+    DISPOSABLE_HOSTS = %w[mailinator.com suremail.info spamherelots.com binkmail.com safetymail.info].freeze
+    SLUG_DELIMITERS = %w[- _ .].freeze
 
     def email(name = nil)
       "#{user_name(name)}@#{domain_name}"
@@ -42,11 +42,9 @@ module FFaker
     end
 
     def user_name_random
-      variant = rand(2)
-      case variant
+      case rand(0..1)
       when 0 then user_name_variant_short
       when 1 then user_name_variant_long
-      else        user_name_variant_short
       end
     end
 
@@ -68,7 +66,7 @@ module FFaker
     end
 
     def join_to_user_name(array_parts)
-      join_char = fetch_sample(%w(. _))
+      join_char = fetch_sample(%w[. _])
       array_parts.map(&:downcase).join(join_char)
     end
 

data/lib/ffaker/job_fr.rb

@@ -5,10 +5,10 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    JOB_ADJECTIVES = %w(general adjoint associé).freeze
+    JOB_ADJECTIVES = %w[general adjoint associé].freeze
 
     def title
-      if rand(2).zero?
+      if rand(0..1).zero?
         "#{fetch_sample(JOB_PREFIXES)} #{fetch_sample(JOB_ADJECTIVES)} #{fetch_sample(JOB_NOUNS)}"
       else
         "#{fetch_sample(JOB_PREFIXES)} #{fetch_sample(JOB_NOUNS)}"

data/lib/ffaker/lorem.rb

@@ -19,7 +19,7 @@ module FFaker
     end
 
     def sentence(word_count = 4)
-      first_word, *last_words = words(word_count + rand(5) + 1)
+      first_word, *last_words = words(word_count + rand(1..5))
       if last_words.nil?
         first_word.capitalize
       else
@@ -36,7 +36,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 3)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_ar.rb

@@ -15,7 +15,7 @@ module FFaker
     end
 
     def sentence(word_count = 4)
-      s = words(word_count + rand(6))
+      s = words(word_count + rand(0..5))
       s = s.join(' ')
       s.capitalize!
       "#{s}."
@@ -30,7 +30,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 3)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_cn.rb

@@ -15,7 +15,7 @@ module FFaker
     end
 
     def sentence(word_count = 4)
-      s = words(word_count + rand(6))
+      s = words(word_count + rand(0..5))
       s = s.join
       "#{s},"
     end
@@ -31,7 +31,7 @@ module FFaker
     end
 
     def paragraph(sentence_count = 3)
-      sentences(sentence_count + rand(3)).to_s
+      sentences(sentence_count + rand(0..2)).to_s
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_fr.rb

@@ -14,7 +14,7 @@ module FFaker
     end
 
     def sentence(word_count = 4)
-      s = words(word_count + rand(6))
+      s = words(word_count + rand(0..5))
       s = s.join(' ')
       s.capitalize!
       "#{s}."
@@ -29,7 +29,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 3)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_kr.rb

@@ -14,7 +14,7 @@ module FFaker
     end
 
     def sentence(word_count = 4)
-      "#{words(word_count + rand(5) + 1).join(' ')}."
+      "#{words(word_count + rand(1..5)).join(' ')}."
     end
 
     alias phrase sentence
@@ -26,7 +26,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 3)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_ru.rb

@@ -15,7 +15,7 @@ module FFaker
     end
 
     def sentence(word_count = 7)
-      elements = words(word_count + rand(10))
+      elements = words(word_count + rand(0..9))
       elements.insert(rand(3..(elements.count - 3)), ',') if elements.count > 10
       result = elements.join(' ').gsub(' , ', ', ')
       capitalize_russian("#{result}#{sentence_type_mark}")
@@ -30,7 +30,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 5)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)

data/lib/ffaker/lorem_ua.rb

@@ -14,7 +14,7 @@ module FFaker
     end
 
     def sentence(word_count = 7)
-      elements = words(word_count + rand(10))
+      elements = words(word_count + rand(0..9))
       elements.insert(rand(3..(elements.count - 3)), ',') if elements.count > 10
       result = elements.join(' ').gsub(' , ', ', ')
       capitalize_ukrainian("#{result}#{sentence_type_mark}")
@@ -29,7 +29,7 @@ module FFaker
     alias phrases sentences
 
     def paragraph(sentence_count = 5)
-      sentences(sentence_count + rand(3)).join(' ')
+      sentences(sentence_count + rand(0..2)).join(' ')
     end
 
     def paragraphs(paragraph_count = 3)
@@ -39,7 +39,7 @@ module FFaker
     private
 
     def sentence_type_mark
-      case rand(10)
+      case rand(0..9)
       when 0..7 then '.'
       when 8    then '!'
       when 9    then '?'

data/lib/ffaker/movie.rb

@@ -9,12 +9,12 @@ module FFaker
       'from Hell', 'from Outer Space', 'from Mars', 'from the Black Lagoon', 'with a Thousand Faces',
       'from Across the Ocean', 'Who Fell to Earth', 'That Came to Dinner'
     ].freeze
-    COLORS = %w(Red Yellow Black White).freeze
+    COLORS = %w[Red Yellow Black White].freeze
 
-    RATINGS = %w(G PG PG-13 R NC-17).freeze # According to MPAA
+    RATINGS = %w[G PG PG-13 R NC-17].freeze # According to MPAA
 
     def title
-      case rand(4)
+      case rand(0..3)
       when 0 then title_with_prefix
       when 1 then title_with_suffix
       when 2 then simple_title
@@ -37,7 +37,7 @@ module FFaker
     end
 
     def maybe_adj_or_adv
-      fetch_sample(ADJ_AND_ADV) + ' ' if rand(2) == 1
+      fetch_sample(ADJ_AND_ADV) + ' ' if rand(0..1) == 1
     end
 
     def simple_title
@@ -45,15 +45,15 @@ module FFaker
     end
 
     def title_from_formula
-      case rand(13)
+      case rand(0..12)
       when 0 then "#{fetch_sample(NOUNS)} 2: Electric Boogaloo"
       when 1 then "The #{fetch_sample(NOUNS)} Without a #{fetch_sample(NOUNS)}"
-      when 2 then "The #{fetch_sample(NOUNS)} from #{rand(20_000)} Leagues"
+      when 2 then "The #{fetch_sample(NOUNS)} from #{rand(0...20_000)} Leagues"
       when 3 then "#{simple_title}: The #{FFaker::Name.name} Story"
       when 4 then "When #{FFaker::Name.first_name} Met #{FFaker::Name.first_name}"
       when 5 then "Dr. #{fetch_sample(NOUNS)}"
       when 6 then "Je Vous Presente, #{FFaker::Name.first_name}"
-      when 7 then "#{rand(3000)} A.D."
+      when 7 then "#{rand(0...2999)} A.D."
       when 8 then "The #{fetch_sample(NOUNS)} from #{FFaker::Address.neighborhood}"
       when 9 then "Christmas on #{FFaker::Address.street_name}"
       when 10 then "The #{fetch_sample(COLORS)} Rose of #{FFaker::AddressUK.country}"

data/lib/ffaker/name.rb

@@ -5,12 +5,12 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    MALE_PREFIXES = %w(Mr.).freeze
-    FEMALE_PREFIXES = %w(Mrs. Miss.).freeze
-    OTHER_PREFIXES =  %w(Ms. Dr.).freeze
+    MALE_PREFIXES = %w[Mr.].freeze
+    FEMALE_PREFIXES = %w[Mrs. Miss.].freeze
+    OTHER_PREFIXES =  %w[Ms. Dr.].freeze
     PREFIXES = (MALE_PREFIXES + FEMALE_PREFIXES + OTHER_PREFIXES).freeze
     FIRST_NAMES = (FIRST_NAMES_FEMALE + FIRST_NAMES_MALE).freeze
-    SUFFIXES = %w(Jr. Sr. I II III IV V MD DDS PhD DVM).freeze
+    SUFFIXES = %w[Jr. Sr. I II III IV V MD DDS PhD DVM].freeze
 
     def name
       "#{first_name} #{last_name}"
@@ -94,13 +94,6 @@ module FFaker
       end
     end
 
-    def html_safe_last_name
-      loop do
-        t = LAST_NAMES.sample
-        return t unless t.include? "'"
-      end
-    end
-
     def prefix
       fetch_sample(PREFIXES)
     end

data/lib/ffaker/name_br.rb

@@ -5,8 +5,8 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    MALE_PREFIXES = %w(Sr.).freeze
-    FEMALE_PREFIXES = %w(Sra. Srta.).freeze
+    MALE_PREFIXES = %w[Sr.].freeze
+    FEMALE_PREFIXES = %w[Sra. Srta.].freeze
     PREFIXES = (MALE_PREFIXES + FEMALE_PREFIXES).freeze
     FIRST_NAMES = (FIRST_NAMES_FEMALE + FIRST_NAMES_MALE).freeze
 

data/lib/ffaker/name_cs.rb

@@ -10,15 +10,15 @@ module FFaker
     extend self
 
     FIRST_NAMES = {
-      female: %w(Alena Andrea Anna Barbora Božena Dagmar Dana Eliška Eva Hana Helena Irena Ivana Jana Jarmila Jaroslava Jiřina Jitka Kateřina Kristýna Lenka Libuše Lucie Ludmila Marcela Marie Markéta Marta Martina Michaela Miroslava Monika Pavla Petra Tereza Věra Veronika Vlasta Zdeňka Zuzana),
-      male: %w(Adam Aleš Alexandr Alois Antonín Bedřich Bohumil Bohuslav Břetislav Dalibor Daniel David Denis Dominik Dušan Eduard Emil Filip František Ivan Ivo Jakub Jan Jaromír Jaroslav Jindřich Jiří Josef Jozef Kamil Karel Kryštof Ladislav Leoš Libor Lubomír Luboš Luděk Ludvík Lukáš Marcel Marek Marian Martin Matěj Matyáš Michael Michal Milan Miloslav Miloš Miroslav Oldřich Ondřej Otakar Patrik Pavel Petr Přemysl Radek Radim Radomír Radovan René Richard Robert Roman Rostislav Rudolf Samuel Stanislav Šimon Štefan Štěpán Tadeáš Tomáš Václav Viktor Vilém Vít Vítězslav Vladimír Vladislav Vlastimil Vojtěch Vratislav Zbyněk Zdeněk)
+      female: %w[Alena Andrea Anna Barbora Božena Dagmar Dana Eliška Eva Hana Helena Irena Ivana Jana Jarmila Jaroslava Jiřina Jitka Kateřina Kristýna Lenka Libuše Lucie Ludmila Marcela Marie Markéta Marta Martina Michaela Miroslava Monika Pavla Petra Tereza Věra Veronika Vlasta Zdeňka Zuzana],
+      male: %w[Adam Aleš Alexandr Alois Antonín Bedřich Bohumil Bohuslav Břetislav Dalibor Daniel David Denis Dominik Dušan Eduard Emil Filip František Ivan Ivo Jakub Jan Jaromír Jaroslav Jindřich Jiří Josef Jozef Kamil Karel Kryštof Ladislav Leoš Libor Lubomír Luboš Luděk Ludvík Lukáš Marcel Marek Marian Martin Matěj Matyáš Michael Michal Milan Miloslav Miloš Miroslav Oldřich Ondřej Otakar Patrik Pavel Petr Přemysl Radek Radim Radomír Radovan René Richard Robert Roman Rostislav Rudolf Samuel Stanislav Šimon Štefan Štěpán Tadeáš Tomáš Václav Viktor Vilém Vít Vítězslav Vladimír Vladislav Vlastimil Vojtěch Vratislav Zbyněk Zdeněk]
     }.freeze
     LAST_NAMES = {
-      female: %w(Dvořáková Černá Benešová Fialová Doležalová Čermáková Blažková Bartošová Čechová Dostálová Bláhová Burešová Dušková Beranová Bednářová Bártová Fišerová Bílková Beránková Brožová Čížková Adámková Daňková Filipová Červenková Čapková Bendová Adamcová Dvořáčková Brabcová Davidová Březinová Dlouhá Dohnalová Burianová Dufková Fojtíková Burdová Červená Boháčová Bartoňová Doleželová Dudová Adamová Bauerová Divišová Coufalová Čejková Berková Balážová),
-      male: %w(Dvořák Černý Beneš Fiala Doležal Čermák Blažek Bartoš Čech Dostál Bláha Bureš Dušek Beran Bednář Bárta Bílek Beránek Fišer Brož Čížek Filip Červenka Adámek Daněk Dvořáček Benda Adamec Brabec Březina David Burian Čapek Dohnal Dlouhý Fojtík Bartoň Červený Dufek Burda Duda Adam Boháč Doležel Baláž Diviš Coufal Bauer Dolejší)
+      female: %w[Dvořáková Černá Benešová Fialová Doležalová Čermáková Blažková Bartošová Čechová Dostálová Bláhová Burešová Dušková Beranová Bednářová Bártová Fišerová Bílková Beránková Brožová Čížková Adámková Daňková Filipová Červenková Čapková Bendová Adamcová Dvořáčková Brabcová Davidová Březinová Dlouhá Dohnalová Burianová Dufková Fojtíková Burdová Červená Boháčová Bartoňová Doleželová Dudová Adamová Bauerová Divišová Coufalová Čejková Berková Balážová],
+      male: %w[Dvořák Černý Beneš Fiala Doležal Čermák Blažek Bartoš Čech Dostál Bláha Bureš Dušek Beran Bednář Bárta Bílek Beránek Fišer Brož Čížek Filip Červenka Adámek Daněk Dvořáček Benda Adamec Brabec Březina David Burian Čapek Dohnal Dlouhý Fojtík Bartoň Červený Dufek Burda Duda Adam Boháč Doležel Baláž Diviš Coufal Bauer Dolejší]
     }.freeze
-    SUFFIXES = %w(Ph.D. Th.D. DSc.).freeze
-    GENDERS = [:male, :female, :random].freeze # :nodoc:
+    SUFFIXES = %w[Ph.D. Th.D. DSc.].freeze
+    GENDERS = %i[male female random].freeze # :nodoc:
 
     # All names generated inside the block will have the same sex.
     # Can be called with explicit sex which will affect
@@ -32,7 +32,7 @@ module FFaker
     #   person.last_name    # => "Nováková"
     #   person.first_name   # => "Jana"
     def with_same_sex(sex = :random)
-      @fixed_sex = sex == :random ? GENDERS[rand(2)] : sex
+      @fixed_sex = sex == :random ? GENDERS[rand(0..1)] : sex
       yield
     ensure
       @fixed_sex = nil
@@ -46,7 +46,7 @@ module FFaker
     # for_sex defaults to :random.
     def name(for_sex = :random)
       with_same_sex(for_sex) do
-        case rand(10)
+        case rand(0..9)
         when 0     then "#{prefix} #{first_name} #{last_name} #{suffix}"
         when 1..2  then "#{prefix} #{first_name} #{last_name}"
         else "#{first_name} #{last_name}"
@@ -79,9 +79,11 @@ module FFaker
     private
 
     def select_sex(sex) # :nodoc:
-      given_sex = @fixed_sex ? @fixed_sex : sex
-      raise ArgumentError, "Unknown sex #{given_sex}" unless GENDERS.include?(given_sex)
-      given_sex == :random ? GENDERS[rand(2)] : given_sex
+      @fixed_sex ||= nil
+      given_sex = @fixed_sex || sex
+      raise ArgumentError, "Unknown sex #{given_sex}" \
+        unless GENDERS.include?(given_sex)
+      given_sex == :random ? GENDERS[rand(0..1)] : given_sex
     end
   end
 end

data/lib/ffaker/name_da.rb

@@ -9,7 +9,7 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    PREFIXES = %w(Hr. Fr. Dr. Prof.).freeze
+    PREFIXES = %w[Hr. Fr. Dr. Prof.].freeze
 
     def name(gender = :any)
       generate_name(first_name(gender))
@@ -29,7 +29,7 @@ module FFaker
 
     def first_name(gender = :any)
       case gender
-      when :any then rand(2) == 0 ? first_name(:male) : first_name(:female)
+      when :any then rand(0..1) == 0 ? first_name(:male) : first_name(:female)
       when :male then fetch_sample(MALE_FIRST_NAMES)
       when :female then fetch_sample(FEMALE_FIRST_NAMES)
       else
@@ -48,7 +48,7 @@ module FFaker
     private
 
     def generate_name(first_name)
-      case rand(8)
+      case rand(0..7)
       when 0    then "#{prefix} #{first_name} #{last_name}"
       when 1..2 then "#{first_name} #{last_name} #{last_name}"
       else           "#{first_name} #{last_name}"