ffaker 1.30.0 → 1.31.0

data/lib/ffaker/dizzle_ipsum.rb

@@ -11,7 +11,7 @@ module Faker
     extend self
 
     def word
-      DIZZLE_WORDS.rand
+      DIZZLE_WORDS.sample
     end
 
     def words(num = 3)

data/lib/ffaker/education.rb

@@ -6,34 +6,34 @@ module Faker
     extend self
 
     def degree_short
-      "#{DEGREE_SHORT_PREFIX.rand} in #{major}"
+      "#{DEGREE_SHORT_PREFIX.sample} in #{major}"
     end
 
     def degree
-      "#{DEGREE_PREFIX.rand} in #{major}"
+      "#{DEGREE_PREFIX.sample} in #{major}"
     end
 
     def major
-      "#{MAJOR_ADJ.rand} #{MAJOR_NOUN.rand}"
+      "#{MAJOR_ADJ.sample} #{MAJOR_NOUN.sample}"
     end
 
     def school_name
-      SCHOOL_PREFIX.rand + SCHOOL_SUFFIX.rand
+      SCHOOL_PREFIX.sample + SCHOOL_SUFFIX.sample
     end
 
     def school_generic_name
       case rand(2)
-      when 0 then AddressUS::STATE.rand
+      when 0 then AddressUS::STATE.sample
       when 1 then school_name
       end
     end
 
     def school
       case rand(5)
-      when (0..1)  then "#{school_name} #{SCHOOL_TYPE.rand}"
-      when 2 then "#{school_generic_name} #{SCHOOL_ADJ.rand} #{SCHOOL_TYPE.rand}"
-      when 3 then "#{SCHOOL_UNI.rand} of #{school_generic_name}"
-      when 4 then "#{school_generic_name} #{SCHOOL_TYPE.rand} of #{MAJOR_NOUN.rand}"
+      when (0..1)  then "#{school_name} #{SCHOOL_TYPE.sample}"
+      when 2 then "#{school_generic_name} #{SCHOOL_ADJ.sample} #{SCHOOL_TYPE.sample}"
+      when 3 then "#{SCHOOL_UNI.sample} of #{school_generic_name}"
+      when 4 then "#{school_generic_name} #{SCHOOL_TYPE.sample} of #{MAJOR_NOUN.sample}"
       end
     end
 

data/lib/ffaker/food.rb

@@ -8,20 +8,20 @@ module Faker
     end
 
     def vegetable
-      VEGETABLE.rand
+      VEGETABLE.sample
     end
 
     def fruit
-      FRUIT.rand
+      FRUIT.sample
     end
 
     def meat
-      MEAT.rand
+      MEAT.sample
     end
 
     def herb_or_spice
-      HERB_SPICE.rand
+      HERB_SPICE.sample
     end
 
   end
-end
+end

data/lib/ffaker/gender.rb

@@ -5,10 +5,10 @@ module Faker
     extend ModuleUtils
     extend self
 
-    GENDERS = ['male', 'female']
+    GENDERS = %w(male female)
 
     def random
-      GENDERS[rand(GENDERS.size)]
+      GENDERS.sample
     end
 
     alias_method :maybe, :random

data/lib/ffaker/gender_cn.rb

@@ -5,10 +5,10 @@ module Faker
     extend ModuleUtils
     extend self
 
-    GENDERS = ['男', '女']
+    GENDERS = %w(男 女)
 
     def random
-      GENDERS[rand(GENDERS.size)]
+      GENDERS.sample
     end
 
     alias_method :maybe, :random

data/lib/ffaker/gender_kr.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module Faker
+  module GenderKR
+    extend ModuleUtils
+    extend self
+
+    GENDERS = %w(남 녀)
+
+    def random
+      GENDERS.sample
+    end
+
+    alias_method :maybe, :random
+    alias_method :sample, :random
+  end
+end

data/lib/ffaker/geolocation.rb

@@ -6,11 +6,11 @@ module Faker
     extend self
 
     def lat
-      LATLNG.rand[0]
+      LATLNG.sample[0]
     end
 
     def lng
-      LATLNG.rand[1]
+      LATLNG.sample[1]
     end
 
     LATLNG = k [

data/lib/ffaker/healthcare_ipsum.rb

@@ -10,7 +10,7 @@ module Faker
     extend self
 
     def word
-      HEALTHCARE_WORDS.rand
+      HEALTHCARE_WORDS.sample
     end
 
     def words(num = 3)

data/lib/ffaker/hipster_ipsum.rb

@@ -11,7 +11,7 @@ module Faker
     extend self
 
     def word
-      HIPSTER_WORDS.rand
+      HIPSTER_WORDS.sample
     end
 
     def words(num = 3)

data/lib/ffaker/html_ipsum.rb

@@ -74,18 +74,18 @@ module Faker
       s = "<table>
       <thead>
       <tr>
-      <th>#{word.capitalize!}</th>
-      <th>#{word.capitalize!}</th>
-      <th>#{word.capitalize!}</th>
-      <th>#{word.capitalize!}</th>
+      <th>#{word.capitalize}</th>
+      <th>#{word.capitalize}</th>
+      <th>#{word.capitalize}</th>
+      <th>#{word.capitalize}</th>
       </tr>
       </thead>
       <tbody>"
       rows.times do
         s << "<tr>
-                <td>#{words(1).capitalize!}</td>
-                <td>#{words(1).capitalize!}</td>
-                <td>#{words(1).capitalize!}</td>
+                <td>#{words(1).capitalize}</td>
+                <td>#{words(1).capitalize}</td>
+                <td>#{words(1).capitalize}</td>
                 <td>#{a}</td>
               </tr>"
       end
@@ -94,12 +94,12 @@ module Faker
     end
 
     def body
-      s = "<h1>#{words(2).capitalize!}</h1>"
+      s = "<h1>#{words(2).capitalize}</h1>"
       rand(4).times do
         s << "<p>#{fancy_string}</p>"
       end
       s << table(rand(4))
-      s << "<h2>#{words(2).capitalize!}</h2>
+      s << "<h2>#{words(2).capitalize}</h2>
       <ol>"
       rand(4).times do
         s << "<li>#{paragraph 1}</li>"

data/lib/ffaker/identification.rb

@@ -14,11 +14,11 @@ module Faker
     end
 
     def ethnicity
-      ETHNICITIES.rand
+      ETHNICITIES.sample
     end
 
     def gender
-      GENDERS.rand
+      GENDERS.sample
     end
 
     ETHNICITIES = k ['African American', 'Asian/Pacific Islander', 'Caucasian', 'Hispanic', 'Native American', 'Multiracial', 'Other', 'Prefer not to respond']

data/lib/ffaker/identification_es.rb

@@ -6,7 +6,7 @@ module Faker
     extend self
 
     def gender
-      GENDERS.rand
+      GENDERS.sample
     end
 
     GENDERS = k %w(Hombre Mujer)

data/lib/ffaker/identification_es_co.rb

@@ -18,15 +18,15 @@ module Faker
   alias_method :id, :drivers_license
 
     def driver_license_category
-      category = LICENSE_CATEGORY.rand
+      category = LICENSE_CATEGORY.sample
       # the categories are A1 A2 B1 B2 B3 C1 C2 C3
       num = category == 'A' ? 1 + rand(2) : 1 + rand(3)
-      category.concat(num.to_s)
+      "#{category}#{num}"
     end
 
     def blood_type #RH
-      sign = %w(+ -).shuffle.shift
-      BLOOD_TYPE.rand.concat sign
+      sign = %w(+ -).sample
+      "#{BLOOD_TYPE.sample}#{sign}"
     end
 
     def expedition_date

data/lib/ffaker/identification_mx.rb

@@ -14,7 +14,7 @@ module Faker
       consonants_n = CONSONANTS + ["Ñ"]
       all_letters = consonants_n + VOWELS
       date = ::Time.at(rand * ::Time.now.to_f).strftime("%y%m%d")
-      "#{ArrayUtils.rand(consonants_n)}#{ArrayUtils.rand(VOWELS)}#{ArrayUtils.random_pick(all_letters,2).join}#{date}#{ArrayUtils.random_pick(HOMOCLAVE,3).join}"
+      "#{consonants_n.sample}#{VOWELS.sample}#{ArrayUtils.random_pick(all_letters,2).join}#{date}#{ArrayUtils.random_pick(HOMOCLAVE,3).join}"
     end
 
     # http://es.wikipedia.org/wiki/Registro_Federal_de_Contribuyentes_(M%C3%A9xico)
@@ -27,9 +27,9 @@ module Faker
     end
 
     # http://es.wikipedia.org/wiki/Registro_Federal_de_Contribuyentes_(M%C3%A9xico)
-    # Registro Federal de Contribuyentes (R.F.C.) 
+    # Registro Federal de Contribuyentes (R.F.C.)
     def rfc
-      ArrayUtils.rand([rfc_persona_moral, rfc_persona_fisica])
+      [rfc_persona_moral, rfc_persona_fisica].sample
     end
 
     # http://es.wikipedia.org/wiki/Clave_%C3%9Anica_de_Registro_de_Poblaci%C3%B3n
@@ -38,7 +38,7 @@ module Faker
       all_letters = CONSONANTS + VOWELS
       hm = ["H","M"]
       date = ::Time.at(rand * ::Time.now.to_f).strftime("%y%m%d")
-      "#{ArrayUtils.rand(CONSONANTS)}#{ArrayUtils.rand(VOWELS)}#{ArrayUtils.random_pick(all_letters,2).join}#{date}#{ArrayUtils.rand(hm)}#{ArrayUtils.rand(ESTADOS_CURP)}#{ArrayUtils.random_pick(CONSONANTS,3).join}#{ArrayUtils.rand(HOMOCLAVE)}#{rand(10)}"
+      "#{CONSONANTS.sample}#{VOWELS.sample}#{ArrayUtils.random_pick(all_letters,2).join}#{date}#{hm.sample}#{ESTADOS_CURP.sample}#{ArrayUtils.random_pick(CONSONANTS,3).join}#{HOMOCLAVE.sample}#{rand(10)}"
     end
 
 

data/lib/ffaker/internet.rb

@@ -12,11 +12,11 @@ module Faker
     # returns an email address of an online disposable email service (like tempinbox.com).
     # you can really send an email to these addresses an access it by going to the service web pages.
     def disposable_email(name = nil)
-      [ user_name(name), DISPOSABLE_HOSTS.rand ].join('@')
+      [ user_name(name), DISPOSABLE_HOSTS.sample ].join('@')
     end
 
     def free_email(name = nil)
-      "#{user_name(name)}@#{HOSTS.rand}"
+      "#{user_name(name)}@#{HOSTS.sample}"
     end
 
     def safe_email(name = nil)
@@ -25,18 +25,16 @@ module Faker
 
     def user_name(name = nil)
       if name
-        parts = ArrayUtils.shuffle(name.scan(/\w+/)).join(ArrayUtils.rand(%w(. _)))
-        parts.downcase!
-        parts
+        parts = ArrayUtils.shuffle(name.scan(/\w+/)).join(%w(. _).sample)
+        parts.downcase
       else
         case rand(2)
         when 0
           Name.first_name.gsub(/\W/, '').downcase
         when 1
-          parts = [ Name.first_name, Name.last_name ].each {|n| n.gsub!(/\W/, '') }
-          parts = parts.join ArrayUtils.rand(%w(. _))
-          parts.downcase!
-          parts
+          parts = [ Name.first_name, Name.last_name ].map{|n| n.gsub(/\W/, '') }
+          parts = parts.join(%w(. _).sample)
+          parts.downcase
         end
       end
     end
@@ -53,7 +51,7 @@ module Faker
     end
 
     def domain_suffix
-      DOMAIN_SUFFIXES.rand
+      DOMAIN_SUFFIXES.sample
     end
 
     def uri(protocol)
@@ -69,7 +67,7 @@ module Faker
     end
 
     def slug(words = nil, glue = nil)
-      glue ||= SLUG_DELIMITERS.rand
+      glue ||= SLUG_DELIMITERS.sample
 
       (words || Faker::Lorem::words(2).join(glue)).downcase
     end

data/lib/ffaker/internet_se.rb

@@ -17,11 +17,11 @@ module Faker
     # (like tempinbox.com). you can really send an email to these
     # addresses an access it by going to the service web pages.
     def disposable_email(name = nil)
-      "#{user_name(name)}@#{DISPOSABLE_HOSTS.rand}"
+      "#{user_name(name)}@#{DISPOSABLE_HOSTS.sample}"
     end
 
     def free_email(name = nil)
-      "#{user_name(name)}@#{HOSTS.rand}"
+      "#{user_name(name)}@#{HOSTS.sample}"
     end
 
     # Used to fake login names were dot is not allowed
@@ -62,9 +62,8 @@ module Faker
     end
 
     def join_to_user_name(array_parts)
-      join_char = ArrayUtils.rand(%w(. _))
-      array_parts.map!(&:downcase)
-      array_parts.join(join_char)
+      join_char = %w(. _).sample
+      array_parts.map(&:downcase).join(join_char)
     end
 
     def domain_name
@@ -83,7 +82,7 @@ module Faker
     end
 
     def domain_suffix
-      DOMAIN_SUFFIXES.rand
+      DOMAIN_SUFFIXES.sample
     end
 
     def uri(protocol)
@@ -99,7 +98,7 @@ module Faker
     end
 
     def slug(words = nil, glue = nil)
-      glue ||= SLUG_DELIMITERS.rand
+      glue ||= SLUG_DELIMITERS.sample
 
       (words || Faker::Lorem::words(2).join(' ')).gsub(' ', glue).downcase
     end

data/lib/ffaker/job.rb

@@ -6,7 +6,7 @@ module Faker
     extend self
 
     def title
-      "#{JOB_PREFIX.rand} #{JOB_ADJ.rand} #{JOB_NOUN.rand}"
+      "#{JOB_PREFIX.sample} #{JOB_ADJ.sample} #{JOB_NOUN.sample}"
     end
   end
 end

data/lib/ffaker/job_fr.rb

@@ -8,7 +8,7 @@ module Faker
     JOB_ADJECTIVES = k ['', 'general', '', 'adjoint', '', 'associé', '']
 
     def title
-      "#{JOB_PREFIXES.rand} #{JOB_ADJECTIVES.rand} #{JOB_NOUNS.rand}"
+      "#{JOB_PREFIXES.sample} #{JOB_ADJECTIVES.sample} #{JOB_NOUNS.sample}"
     end
   end
 end

data/lib/ffaker/job_ja.rb

@@ -6,7 +6,7 @@ module Faker
     extend self
 
     def title
-      "#{JOB_NOUNS.rand}"
+      JOB_NOUNS.sample
     end
   end
 end

data/lib/ffaker/job_kr.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Faker
+  module JobKR
+    extend ModuleUtils
+    extend self
+
+    def title
+      JOB_NOUNS.sample
+    end
+  end
+end

data/lib/ffaker/locale.rb

@@ -10,7 +10,7 @@ module Faker
       if given_language && code_index
         LANGUAGE_CODE[code_index]
       else
-        LANGUAGE_CODE.rand
+        LANGUAGE_CODE.sample
       end
     end
 
@@ -19,9 +19,9 @@ module Faker
       if given_code && language_index
         LANGUAGE[language_index]
       else
-        LANGUAGE.rand
+        LANGUAGE.sample
       end
     end
 
   end
-end
+end