ffaker 2.2.0 → 2.3.0

data/lib/ffaker/lorem_ar.rb

@@ -7,11 +7,11 @@ module FFaker
     extend self
 
     def word
-      WORDS.sample
+      fetch_sample(WORDS)
     end
 
     def words(num = 3)
-      WORDS.sample(num)
+      fetch_sample(WORDS, count: num)
     end
 
     def sentence(word_count = 4)
@@ -21,13 +21,13 @@ module FFaker
       "#{s}."
     end
 
-    alias_method :phrase, :sentence
+    alias phrase sentence
 
     def sentences(sentence_count = 3)
       (1..sentence_count).map { sentence }
     end
 
-    alias_method :phrases, :sentences
+    alias phrases sentences
 
     def paragraph(sentence_count = 3)
       sentences(sentence_count + rand(3)).join(' ')

data/lib/ffaker/lorem_cn.rb

@@ -7,11 +7,11 @@ module FFaker
     extend self
 
     def word
-      WORDS.sample
+      fetch_sample(WORDS)
     end
 
     def words(num = 3)
-      WORDS.sample(num)
+      fetch_sample(WORDS, count: num)
     end
 
     def sentence(word_count = 4)
@@ -23,7 +23,7 @@ module FFaker
     def sentences(sentence_count = 3)
       s = (1..sentence_count).map { sentence }
       def s.to_s
-        result = self.join(' ')
+        result = join(' ')
         result[-1] = '。'
         result
       end

data/lib/ffaker/lorem_fr.rb

@@ -6,11 +6,11 @@ module FFaker
     extend self
 
     def word
-      WORDS.sample
+      fetch_sample(WORDS)
     end
 
     def words(num = 3)
-      WORDS.sample(num)
+      fetch_sample(WORDS, count: num)
     end
 
     def sentence(word_count = 4)
@@ -20,13 +20,13 @@ module FFaker
       "#{s}."
     end
 
-    alias_method :phrase, :sentence
+    alias phrase sentence
 
     def sentences(sentence_count = 3)
       (1..sentence_count).map { sentence }
     end
 
-    alias_method :phrases, :sentences
+    alias phrases sentences
 
     def paragraph(sentence_count = 3)
       sentences(sentence_count + rand(3)).join(' ')

data/lib/ffaker/lorem_ja.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module FFaker
+  module LoremJA
+    extend ModuleUtils
+    extend self
+
+    def character
+      fetch_sample(CHARACTERS)
+    end
+
+    def characters(count = 20)
+      fetch_sample(CHARACTERS, count: count).join
+    end
+
+    def word
+      fetch_sample(WORDS)
+    end
+
+    def words(count = 3)
+      fetch_sample(WORDS, count: count)
+    end
+
+    def sentence
+      fetch_sample(SENTENCES)
+    end
+
+    def sentences(count = 3)
+      (1..count).map { fetch_sample(SENTENCES) }
+    end
+
+    def paragraph(sentence_count = 3)
+      sentences(sentence_count).join('、') + '、' + fetch_sample(SENTENCES_END) + '。'
+    end
+
+    def paragraphs(count = 3)
+      (1..count).map { paragraph }
+    end
+  end
+end

data/lib/ffaker/lorem_kr.rb

@@ -6,24 +6,24 @@ module FFaker
     extend self
 
     def word
-      WORDS.sample
+      fetch_sample(WORDS)
     end
 
     def words(num = 3)
-      WORDS.sample(num)
+      fetch_sample(WORDS, count: num)
     end
 
     def sentence(word_count = 4)
       "#{words(word_count + rand(5) + 1).join(' ')}."
     end
 
-    alias_method :phrase, :sentence
+    alias phrase sentence
 
     def sentences(sentence_count = 3)
       (1..sentence_count).map { sentence }
     end
 
-    alias_method :phrases, :sentences
+    alias phrases sentences
 
     def paragraph(sentence_count = 3)
       sentences(sentence_count + rand(3)).join(' ')

data/lib/ffaker/lorem_ua.rb

@@ -6,29 +6,27 @@ module FFaker
     extend self
 
     def word
-      WORDS.sample
+      fetch_sample(WORDS)
     end
 
     def words(num = 3)
-      WORDS.sample(num)
+      fetch_sample(WORDS, count: num)
     end
 
     def sentence(word_count = 7)
       elements = words(word_count + rand(10))
-      if elements.count > 10
-        elements.insert(rand(3..(elements.count - 3)), ',')
-      end
+      elements.insert(rand(3..(elements.count - 3)), ',') if elements.count > 10
       result = elements.join(' ').gsub(' , ', ', ')
       capitalize_ukrainian("#{result}#{sentence_type_mark}")
     end
 
-    alias_method :phrase, :sentence
+    alias phrase sentence
 
     def sentences(sentence_count = 3)
       (1..sentence_count).map { sentence }
     end
 
-    alias_method :phrases, :sentences
+    alias phrases sentences
 
     def paragraph(sentence_count = 5)
       sentences(sentence_count + rand(3)).join(' ')
@@ -42,9 +40,9 @@ module FFaker
 
     def sentence_type_mark
       case rand(10)
-      when 0..7 then "."
-      when 8    then "!"
-      when 9    then "?"
+      when 0..7 then '.'
+      when 8    then '!'
+      when 9    then '?'
       end
     end
 
@@ -56,4 +54,3 @@ module FFaker
     end
   end
 end
-

data/lib/ffaker/movie.rb

@@ -6,12 +6,12 @@ module FFaker
     extend self
 
     SUFFIXES = [
-      "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"
-    ]
-    COLORS = %w{Red Yellow Black White}
+      '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
 
-    RATINGS = %w(G PG PG-13 R NC-17)  # According to MPAA
+    RATINGS = %w(G PG PG-13 R NC-17).freeze # According to MPAA
 
     def title
       case rand(4)
@@ -23,45 +23,43 @@ module FFaker
     end
 
     def rating
-      RATINGS.sample
+      fetch_sample(RATINGS)
     end
 
     private
 
     def title_with_prefix
-      "#{PREFIXES.sample} #{maybe_adj_or_adv}#{NOUNS.sample}"
+      "#{fetch_sample(PREFIXES)} #{maybe_adj_or_adv}#{fetch_sample(NOUNS)}"
     end
 
     def title_with_suffix
-      "The #{maybe_adj_or_adv}#{NOUNS.sample} #{SUFFIXES.sample}"
+      "The #{maybe_adj_or_adv}#{fetch_sample(NOUNS)} #{fetch_sample(SUFFIXES)}"
     end
 
     def maybe_adj_or_adv
-      if rand(2) == 1
-        ADJ_AND_ADV.sample + " "
-      end
+      fetch_sample(ADJ_AND_ADV) + ' ' if rand(2) == 1
     end
 
     def simple_title
-      "#{ADJ_AND_ADV.sample} #{NOUNS.sample}"
+      "#{fetch_sample(ADJ_AND_ADV)} #{fetch_sample(NOUNS)}"
     end
 
     def title_from_formula
       case rand(13)
-      when 0 then "#{NOUNS.sample} 2: Electric Boogaloo"
-      when 1 then "The #{NOUNS.sample} Without a #{NOUNS.sample}"
-      when 2 then "The #{NOUNS.sample} from #{rand(20_000)} Leagues"
+      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 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. #{NOUNS.sample}"
+      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 8 then "The #{NOUNS.sample} from #{FFaker::Address.neighborhood}"
+      when 8 then "The #{fetch_sample(NOUNS)} from #{FFaker::Address.neighborhood}"
       when 9 then "Christmas on #{FFaker::Address.street_name}"
-      when 10 then "The #{COLORS.sample} Rose of #{FFaker::AddressUK.country}"
-      when 11 then "Hard Boiled #{NOUNS.sample}"
+      when 10 then "The #{fetch_sample(COLORS)} Rose of #{FFaker::AddressUK.country}"
+      when 11 then "Hard Boiled #{fetch_sample(NOUNS)}"
       else
-        ::String.new.tap{|s| n = simple_title; s.replace("#{n} 2: Son of #{n}")}
+        ::String.new.tap { |s| n = simple_title; s.replace("#{n} 2: Son of #{n}") }
       end
     end
   end

data/lib/ffaker/music.rb

@@ -6,19 +6,19 @@ module FFaker
     extend self
 
     def genre
-      GENRES.sample
+      fetch_sample(GENRES)
     end
 
     def album
-      ALBUMS.sample
+      fetch_sample(ALBUMS)
     end
 
     def artist
-      ARTISTS.sample
+      fetch_sample(ARTISTS)
     end
 
     def song
-      SONGS.sample
+      fetch_sample(SONGS)
     end
   end
 end

data/lib/ffaker/name.rb

@@ -5,31 +5,120 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    PREFIXES = %w(Mr. Mrs. Ms. Miss Dr.)
-    SUFFIXES = %w(Jr. Sr. I II III IV V MD DDS PhD DVM)
+    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
 
     def name
-      case rand(10)
-      when 0 then "#{prefix} #{first_name} #{last_name}"
-      when 1 then "#{first_name} #{last_name} #{suffix}"
-      else        "#{first_name} #{last_name}"
-      end
+      "#{first_name} #{last_name}"
+    end
+
+    def html_safe_name
+      "#{first_name} #{html_safe_last_name}"
+    end
+
+    def name_with_prefix
+      fetch_sample(
+        [
+          female_name_with_prefix,
+          male_name_with_prefix
+        ]
+      )
+    end
+
+    def name_with_suffix
+      fetch_sample(
+        [
+          female_name_with_suffix,
+          male_name_with_suffix
+        ]
+      )
+    end
+
+    def name_with_prefix_suffix
+      fetch_sample(
+        [
+          female_name_with_prefix_suffix,
+          male_name_with_prefix_suffix
+        ]
+      )
+    end
+
+    def female_name_with_prefix
+      "#{female_prefix} #{first_name_female} #{last_name}"
+    end
+
+    def male_name_with_prefix
+      "#{male_prefix} #{first_name_male} #{last_name}"
+    end
+
+    def female_name_with_suffix
+      "#{first_name_female} #{last_name} #{suffix}"
+    end
+
+    def male_name_with_suffix
+      "#{first_name_male} #{last_name} #{suffix}"
+    end
+
+    def female_name_with_prefix_suffix
+      "#{female_prefix} #{first_name_female} #{last_name} #{suffix}"
+    end
+
+    def male_name_with_prefix_suffix
+      "#{male_prefix} #{first_name_male} #{last_name} #{suffix}"
     end
 
     def first_name
-      FIRST_NAMES.sample
+      fetch_sample(FIRST_NAMES)
+    end
+
+    def first_name_female
+      fetch_sample(FIRST_NAMES_FEMALE)
+    end
+
+    def first_name_male
+      fetch_sample(FIRST_NAMES_MALE)
     end
 
     def last_name
-      LAST_NAMES.sample
+      fetch_sample(LAST_NAMES)
+    end
+
+    def html_safe_last_name
+      loop do
+        t = LAST_NAMES.sample
+        return t unless t.include? "'"
+      end
+    end
+
+    def html_safe_last_name
+      loop do
+        t = LAST_NAMES.sample
+        return t unless t.include? "'"
+      end
     end
 
     def prefix
-      PREFIXES.sample
+      fetch_sample(PREFIXES)
+    end
+
+    def female_prefix
+      fetch_sample(FEMALE_PREFIXES)
+    end
+
+    def male_prefix
+      fetch_sample(MALE_PREFIXES)
+    end
+
+    def other_prefix
+      fetch_sample(OTHER_PREFIXES)
     end
 
     def suffix
-      SUFFIXES.sample
+      fetch_sample(SUFFIXES)
     end
   end
 end

data/lib/ffaker/name_br.rb

@@ -5,27 +5,58 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    PREFIXES = %w(Sr. Sra. Srta.)
+    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
 
     def name
       "#{first_name} #{last_name}"
     end
 
     def name_with_prefix
-      "#{prefix} #{name}"
+      fetch_sample(
+        [
+          female_name_with_prefix,
+          male_name_with_prefix
+        ]
+      )
+    end
+
+    def female_name_with_prefix
+      "#{female_prefix} #{first_name_female} #{last_name}"
+    end
+
+    def male_name_with_prefix
+      "#{male_prefix} #{first_name_male} #{last_name}"
     end
 
     def first_name
-      FIRST_NAMES.sample
+      fetch_sample(FIRST_NAMES)
+    end
+
+    def first_name_female
+      fetch_sample(FIRST_NAMES_FEMALE)
+    end
+
+    def first_name_male
+      fetch_sample(FIRST_NAMES_MALE)
     end
 
     def last_name
-      LAST_NAMES.sample
+      fetch_sample(LAST_NAMES)
     end
 
     def prefix
-      PREFIXES.sample
+      fetch_sample(PREFIXES)
+    end
+
+    def female_prefix
+      fetch_sample(FEMALE_PREFIXES)
+    end
+
+    def male_prefix
+      fetch_sample(MALE_PREFIXES)
     end
   end
 end
-