faker 1.8.7 → 1.9.1

data/lib/faker/dune.rb

@@ -26,11 +26,11 @@ module Faker
 
           unless quoted_characters.include?(character.to_sym)
             raise ArgumentError,
-              "Characters quoted can be left blank or #{quoted_characters.join(', ')}"
+                  "Characters quoted can be left blank or #{quoted_characters.join(', ')}"
           end
         end
 
-        return fetch('dune.quotes.' + character)
+        fetch('dune.quotes.' + character)
       end
 
       def saying(source = nil)
@@ -43,11 +43,11 @@ module Faker
 
           unless sourced_sayings.include?(source.to_sym)
             raise ArgumentError,
-              "Sources quoted in sayings can be left blank or #{sourced_sayings.join(', ')}"
+                  "Sources quoted in sayings can be left blank or #{sourced_sayings.join(', ')}"
           end
         end
 
-        return fetch('dune.sayings.' + source)
+        fetch('dune.sayings.' + source)
       end
     end
   end

data/lib/faker/elder_scrolls.rb

@@ -5,6 +5,10 @@ module Faker
         fetch('elder_scrolls.race')
       end
 
+      def city
+        fetch('elder_scrolls.city')
+      end
+
       def creature
         fetch('elder_scrolls.creature')
       end
@@ -16,6 +20,18 @@ module Faker
       def dragon
         fetch('elder_scrolls.dragon')
       end
+
+      def name
+        "#{fetch('elder_scrolls.first_name')} #{fetch('elder_scrolls.last_name')}"
+      end
+
+      def first_name
+        fetch('elder_scrolls.first_name')
+      end
+
+      def last_name
+        fetch('elder_scrolls.last_name')
+      end
     end
   end
 end

data/lib/faker/electrical_components.rb

@@ -0,0 +1,19 @@
+module Faker
+  class ElectricalComponents < Base
+    flexible :electrical_components
+
+    class << self
+      def active
+        fetch('electrical_components.active')
+      end
+
+      def passive
+        fetch('electrical_components.passive')
+      end
+
+      def electromechanical
+        fetch('electrical_components.electromechanical')
+      end
+    end
+  end
+end

data/lib/faker/ethereum.rb

@@ -0,0 +1,12 @@
+module Faker
+  class Ethereum < Base
+    class << self
+      def address
+        hex_alphabet = '0123456789abcdef'
+        var = '0x'
+        40.times { var << sample(shuffle(hex_alphabet.split(''))) }
+        var
+      end
+    end
+  end
+end

data/lib/faker/famous_last_words.rb

@@ -0,0 +1,11 @@
+module Faker
+  class FamousLastWords < Base
+    flexible :famous_last_words
+
+    class << self
+      def last_words
+        fetch('famous_last_words.last_words')
+      end
+    end
+  end
+end

data/lib/faker/file.rb

@@ -1,7 +1,6 @@
 module Faker
   class File < Base
     class << self
-
       def extension
         fetch('file.extension')
       end
@@ -11,14 +10,12 @@ module Faker
       end
 
       def file_name(dir = nil, name = nil, ext = nil, directory_separator = '/')
-
-        dir = Faker::Internet::slug unless dir
-        name = Faker::Lorem::word.downcase unless name
+        dir ||= Faker::Internet.slug
+        name ||= Faker::Lorem.word.downcase
         ext ||= extension
 
         [dir, name].join(directory_separator) + ".#{ext}"
       end
-
     end
   end
 end

data/lib/faker/fillmurray.rb

@@ -1,11 +1,10 @@
 module Faker
   class Fillmurray < Base
     class << self
-
       def image(grayscale = false, width = 200, height = 200)
-        raise ArgumentError, "Width should be a number" unless width.to_s.match(/^\d+$/)
-        raise ArgumentError, "Height should be a number" unless height.to_s.match(/^\d+$/)
-        raise ArgumentError, "Grayscale should be a boolean" unless [true, false].include?(grayscale)
+        raise ArgumentError, 'Width should be a number' unless width.to_s =~ /^\d+$/
+        raise ArgumentError, 'Height should be a number' unless height.to_s =~ /^\d+$/
+        raise ArgumentError, 'Grayscale should be a boolean' unless [true, false].include?(grayscale)
 
         grayscale == true ? "https://fillmurray.com/g/#{width}/#{height}" : "https://fillmurray.com/#{width}/#{height}"
       end

data/lib/faker/finance.rb

@@ -1,9 +1,8 @@
 module Faker
   class Finance < Base
-
-    CREDIT_CARD_TYPES = [:visa, :mastercard, :discover, :american_express,
-                         :diners_club, :jcb, :switch, :solo, :dankort,
-                         :maestro, :forbrugsforeningen, :laser].freeze
+    CREDIT_CARD_TYPES = %i[visa mastercard discover american_express
+                           diners_club jcb switch solo dankort
+                           maestro forbrugsforeningen laser].freeze
 
     class << self
       def credit_card(*types)

data/lib/faker/food.rb

@@ -1,22 +1,42 @@
 module Faker
   class Food < Base
     class << self
+      # Retrieves a typical dish from each country
       def dish
         fetch('food.dish')
       end
 
+      # Retrieves a description about some dish
+      def description
+        fetch('food.descriptions')
+      end
+
+      # Retrieves an ingredient
       def ingredient
         fetch('food.ingredients')
       end
 
+      # Retrieves a fruit
+      def fruits
+        fetch('food.fruits')
+      end
+
+      # Retrieves a vegetable
+      def vegetables
+        fetch('food.vegetables')
+      end
+
+      # Retrieves some random spice
       def spice
         fetch('food.spices')
       end
 
+      # Retrieves cooking measures
       def measurement
         fetch('food.measurement_sizes') + ' ' + fetch('food.measurements')
       end
-      
+
+      # Retrieves metric mesurements
       def metric_measurement
         fetch('food.metric_measurements')
       end

data/lib/faker/football.rb

@@ -0,0 +1,21 @@
+module Faker
+  class Football < Base
+    class << self
+      def team
+        fetch('football.teams')
+      end
+
+      def player
+        fetch('football.players')
+      end
+
+      def coach
+        fetch('football.coaches')
+      end
+
+      def competition
+        fetch('football.competitions')
+      end
+    end
+  end
+end

data/lib/faker/gender.rb

@@ -0,0 +1,13 @@
+module Faker
+  class Gender < Base
+    class << self
+      def type
+        fetch('gender.types')
+      end
+
+      def binary_type
+        fetch('gender.binary_types')
+      end
+    end
+  end
+end

data/lib/faker/greek_philosophers.rb

@@ -0,0 +1,13 @@
+module Faker
+  class GreekPhilosophers < Base
+    class << self
+      def name
+        fetch('greek_philosophers.names')
+      end
+
+      def quote
+        fetch('greek_philosophers.quotes')
+      end
+    end
+  end
+end

data/lib/faker/hacker.rb

@@ -1,4 +1,4 @@
-#Port of http://shinytoylabs.com/jargon/
+# Port of http://shinytoylabs.com/jargon/
 module Faker
   class Hacker < Base
     flexible :hacker
@@ -29,17 +29,15 @@ module Faker
       end
 
       def phrases
-         [ "If we #{verb} the #{noun}, we can get to the #{abbreviation} #{noun} through the #{adjective} #{abbreviation} #{noun}!",
-           "We need to #{verb} the #{adjective} #{abbreviation} #{noun}!",
-           "Try to #{verb} the #{abbreviation} #{noun}, maybe it will #{verb} the #{adjective} #{noun}!",
-           "You can't #{verb} the #{noun} without #{ingverb} the #{adjective} #{abbreviation} #{noun}!",
-           "Use the #{adjective} #{abbreviation} #{noun}, then you can #{verb} the #{adjective} #{noun}!",
-           "The #{abbreviation} #{noun} is down, #{verb} the #{adjective} #{noun} so we can #{verb} the #{abbreviation} #{noun}!",
-           "#{ingverb} the #{noun} won't do anything, we need to #{verb} the #{adjective} #{abbreviation} #{noun}!".capitalize,
-           "I'll #{verb} the #{adjective} #{abbreviation} #{noun}, that should #{noun} the #{abbreviation} #{noun}!"
-           ]
+        ["If we #{verb} the #{noun}, we can get to the #{abbreviation} #{noun} through the #{adjective} #{abbreviation} #{noun}!",
+         "We need to #{verb} the #{adjective} #{abbreviation} #{noun}!",
+         "Try to #{verb} the #{abbreviation} #{noun}, maybe it will #{verb} the #{adjective} #{noun}!",
+         "You can't #{verb} the #{noun} without #{ingverb} the #{adjective} #{abbreviation} #{noun}!",
+         "Use the #{adjective} #{abbreviation} #{noun}, then you can #{verb} the #{adjective} #{noun}!",
+         "The #{abbreviation} #{noun} is down, #{verb} the #{adjective} #{noun} so we can #{verb} the #{abbreviation} #{noun}!",
+         "#{ingverb} the #{noun} won't do anything, we need to #{verb} the #{adjective} #{abbreviation} #{noun}!".capitalize,
+         "I'll #{verb} the #{adjective} #{abbreviation} #{noun}, that should #{noun} the #{abbreviation} #{noun}!"]
       end
     end
-
   end
 end

data/lib/faker/harry_potter.rb

@@ -20,6 +20,10 @@ module Faker
       def house
         fetch('harry_potter.houses')
       end
+
+      def spell
+        fetch('harry_potter.spells')
+      end
     end
   end
 end

data/lib/faker/hipster.rb

@@ -3,7 +3,7 @@ module Faker
     class << self
       def word
         random_word = sample(translate('faker.hipster.words'))
-        random_word.match(/\s/) ? word : random_word
+        random_word =~ /\s/ ? word : random_word
       end
 
       def words(num = 3, supplemental = false, spaces_allowed = false)
@@ -12,11 +12,11 @@ module Faker
           translate('faker.hipster.words') +
           (supplemental ? translate('faker.lorem.words') : [])
         )
-        word_list = word_list * ((resolved_num / word_list.length) + 1)
+        word_list *= ((resolved_num / word_list.length) + 1)
 
         return shuffle(word_list)[0, resolved_num] if spaces_allowed
         words = shuffle(word_list)[0, resolved_num]
-        words.each_with_index { |w, i| words[i] = word if w.match(/\s/) }
+        words.each_with_index { |w, i| words[i] = word if w =~ /\s/ }
       end
 
       def sentence(word_count = 4, supplemental = false, random_words_to_add = 6)
@@ -43,7 +43,15 @@ module Faker
         end
       end
 
-    private
+      def paragraph_by_chars(chars = 256, supplemental = false)
+        paragraph = paragraph(3, supplemental)
+
+        paragraph += ' ' + paragraph(3, supplemental) while paragraph.length < chars
+
+        paragraph[0...chars - 1] + '.'
+      end
+
+      private
 
       # If an array or range is passed, a random value will be selected.
       # All other values are simply returned.

data/lib/faker/id_number.rb

@@ -1,16 +1,15 @@
 module Faker
   class IDNumber < Base
-
+    CHECKS = 'TRWAGMYFPDXBNJZSQVHLCKE'.freeze
     INVALID_SSN = [
-        /0{3}-\d{2}-\d{4}/,
-        /\d{3}-0{2}-\d{4}/,
-        /\d{3}-\d{2}-0{4}/,
-        /666-\d{2}-\d{4}/,
-        /9\d{2}-\d{2}-\d{4}/
-    ]
+      /0{3}-\d{2}-\d{4}/,
+      /\d{3}-0{2}-\d{4}/,
+      /\d{3}-\d{2}-0{4}/,
+      /666-\d{2}-\d{4}/,
+      /9\d{2}-\d{2}-\d{4}/
+    ].freeze
 
     class << self
-
       def valid
         _translate('valid')
       end
@@ -25,12 +24,28 @@ module Faker
         INVALID_SSN.any? { |regex| regex =~ ssn } ? ssn_valid : ssn
       end
 
+      def spanish_citizen_number
+        num = Faker::Number.number(8)
+        mod = num.to_i % 23
+        check = CHECKS[mod]
+        "#{num}-#{check}"
+      end
+
+      def spanish_foreign_citizen_number
+        code = 'XYZ'
+        digits = Faker::Number.number(7)
+        prefix = code[rand(code.length)]
+        prefix_val = 'XYZ'.index(prefix).to_s
+        mod = "#{prefix_val}#{digits}".to_i % 23
+        check = CHECKS[mod]
+        "#{prefix}-#{digits}-#{check}"
+      end
+
       private
 
       def _translate(key)
         parse("id_number.#{key}")
       end
     end
-
   end
 end

data/lib/faker/internet.rb

@@ -1,47 +1,53 @@
 module Faker
   class Internet < Base
     class << self
-
-      def email(name = nil)
-        [user_name(name), domain_name].join('@')
+      def email(name = nil, *separators)
+        if separators
+          [username(name, separators), domain_name].join('@')
+        else
+          [username(name), domain_name].join('@')
+        end
       end
 
       def free_email(name = nil)
-        [user_name(name), fetch('internet.free_email')].join('@')
+        [username(name), fetch('internet.free_email')].join('@')
       end
 
       def safe_email(name = nil)
-        [user_name(name), 'example.'+ sample(%w[org com net])].join('@')
+        [username(name), 'example.' + sample(%w[org com net])].join('@')
       end
 
-      def user_name(specifier = nil, separators = %w(. _))
+      def username(specifier = nil, separators = %w[. _])
         with_locale(:en) do
-          if specifier.respond_to?(:scan)
-            return specifier.scan(/\w+/).shuffle.join(sample(separators)).downcase
-          elsif specifier.kind_of?(Integer)
+          return shuffle(specifier.scan(/\w+/)).join(sample(separators)).downcase if specifier.respond_to?(:scan)
+          if specifier.is_a?(Integer)
             # If specifier is Integer and has large value, Argument error exception is raised to overcome memory full error
-            raise ArgumentError, "Given argument is too large" if specifier > 10**6
+            raise ArgumentError, 'Given argument is too large' if specifier > 10**6
             tries = 0 # Don't try forever in case we get something like 1_000_000.
-            begin
-              result = user_name(nil, separators)
+            result = nil
+            loop do
+              result = username(nil, separators)
               tries += 1
-            end while result.length < specifier && tries < 7
-            return result * (specifier/result.length + 1) if specifier > 0
-          elsif specifier.kind_of?(Range)
+              break unless result.length < specifier && tries < 7
+            end
+            return result * (specifier / result.length + 1) if specifier > 0
+          elsif specifier.is_a?(Range)
             tries = 0
-            begin
-              result = user_name(specifier.min, separators)
+            result = nil
+            loop do
+              result = username(specifier.min, separators)
               tries += 1
-            end while !specifier.include?(result.length) && tries < 7
+              break unless !specifier.include?(result.length) && tries < 7
+            end
             return result[0...specifier.max]
           end
 
           sample([
-            Char.prepare(Name.first_name),
-            [Name.first_name, Name.last_name].map{ |name|
-              Char.prepare(name)
-            }.join(sample(separators))
-          ])
+                   Char.prepare(Name.first_name),
+                   [Name.first_name, Name.last_name].map do |name|
+                     Char.prepare(name)
+                   end.join(sample(separators))
+                 ])
         end
       end
 
@@ -60,7 +66,7 @@ module Faker
         end
 
         if special_chars
-          chars = %w(! @ # $ % ^ & *)
+          chars = %w[! @ # $ % ^ & *]
           rand(1..min_length).times do |i|
             temp[i] = chars[rand(chars.length)]
           end
@@ -73,7 +79,7 @@ module Faker
         with_locale(:en) { [Char.prepare(domain_word), domain_suffix].join('.') }
       end
 
-      def fix_umlauts(string='')
+      def fix_umlauts(string = '')
         Char.fix_umlauts(string)
       end
 
@@ -85,87 +91,91 @@ module Faker
         fetch('internet.domain_suffix')
       end
 
-      def mac_address(prefix='')
-        prefix_digits = prefix.split(':').map{ |d| d.to_i(16) }
-        address_digits = (6 - prefix_digits.size).times.map{ rand(256) }
-        (prefix_digits + address_digits).map{ |d| '%02x' % d }.join(':')
+      def mac_address(prefix = '')
+        prefix_digits = prefix.split(':').map { |d| d.to_i(16) }
+        address_digits = Array.new((6 - prefix_digits.size)) { rand(256) }
+        (prefix_digits + address_digits).map { |d| format('%02x', d) }.join(':')
       end
 
       def ip_v4_address
         ary = (2..254).to_a
-        [ sample(ary), sample(ary), sample(ary), sample(ary) ].join('.')
+        [sample(ary), sample(ary), sample(ary), sample(ary)].join('.')
       end
 
       def private_ip_v4_address
-        begin
+        addr = nil
+        loop do
           addr = ip_v4_address
-        end while !private_net_checker[addr]
+          break if private_net_checker[addr]
+        end
         addr
       end
 
       def public_ip_v4_address
-        begin
+        addr = nil
+        loop do
           addr = ip_v4_address
-        end while reserved_net_checker[addr]
+          break unless reserved_net_checker[addr]
+        end
         addr
       end
 
       def private_nets_regex
         [
-          /^10\./,                                       # 10.0.0.0    – 10.255.255.255
-          /^100\.(6[4-9]|[7-9]\d|1[0-1]\d|12[0-7])\./,   # 100.64.0.0  – 100.127.255.255
-          /^127\./,                                      # 127.0.0.0   – 127.255.255.255
-          /^169\.254\./,                                 # 169.254.0.0 – 169.254.255.255
-          /^172\.(1[6-9]|2\d|3[0-1])\./,                 # 172.16.0.0  – 172.31.255.255
-          /^192\.0\.0\./,                                # 192.0.0.0   – 192.0.0.255
-          /^192\.168\./,                                 # 192.168.0.0 – 192.168.255.255
-          /^198\.(1[8-9])\./                             # 198.18.0.0  – 198.19.255.255
+          /^10\./,                                       # 10.0.0.0    - 10.255.255.255
+          /^100\.(6[4-9]|[7-9]\d|1[0-1]\d|12[0-7])\./,   # 100.64.0.0  - 100.127.255.255
+          /^127\./,                                      # 127.0.0.0   - 127.255.255.255
+          /^169\.254\./,                                 # 169.254.0.0 - 169.254.255.255
+          /^172\.(1[6-9]|2\d|3[0-1])\./,                 # 172.16.0.0  - 172.31.255.255
+          /^192\.0\.0\./,                                # 192.0.0.0   - 192.0.0.255
+          /^192\.168\./,                                 # 192.168.0.0 - 192.168.255.255
+          /^198\.(1[8-9])\./                             # 198.18.0.0  - 198.19.255.255
         ]
       end
 
       def private_net_checker
-        lambda { |addr| private_nets_regex.any? { |net| net =~ addr } }
+        ->(addr) { private_nets_regex.any? { |net| net =~ addr } }
       end
 
       def reserved_nets_regex
         [
-          /^0\./,                 # 0.0.0.0      – 0.255.255.255
-          /^192\.0\.2\./,         # 192.0.2.0    – 192.0.2.255
-          /^192\.88\.99\./,       # 192.88.99.0  – 192.88.99.255
-          /^198\.51\.100\./,      # 198.51.100.0 – 198.51.100.255
-          /^203\.0\.113\./,       # 203.0.113.0  – 203.0.113.255
-          /^(22[4-9]|23\d)\./,    # 224.0.0.0    – 239.255.255.255
-          /^(24\d|25[0-5])\./     # 240.0.0.0    – 255.255.255.254  and  255.255.255.255
+          /^0\./,                 # 0.0.0.0      - 0.255.255.255
+          /^192\.0\.2\./,         # 192.0.2.0    - 192.0.2.255
+          /^192\.88\.99\./,       # 192.88.99.0  - 192.88.99.255
+          /^198\.51\.100\./,      # 198.51.100.0 - 198.51.100.255
+          /^203\.0\.113\./,       # 203.0.113.0  - 203.0.113.255
+          /^(22[4-9]|23\d)\./,    # 224.0.0.0    - 239.255.255.255
+          /^(24\d|25[0-5])\./     # 240.0.0.0    - 255.255.255.254  and  255.255.255.255
         ]
       end
 
       def reserved_net_checker
-        ->(addr){ (private_nets_regex + reserved_nets_regex).any? { |net| net =~ addr } }
+        ->(addr) { (private_nets_regex + reserved_nets_regex).any? { |net| net =~ addr } }
       end
 
       def ip_v4_cidr
-        "#{ip_v4_address}/#{1 + rand(31)}"
+        "#{ip_v4_address}/#{rand(1..31)}"
       end
 
       def ip_v6_address
-        (1..8).map { rand(65536).to_s(16) }.join(':')
+        (1..8).map { rand(65_536).to_s(16) }.join(':')
       end
 
       def ip_v6_cidr
-        "#{ip_v6_address}/#{1 + rand(127)}"
+        "#{ip_v6_address}/#{rand(1..127)}"
       end
 
-      def url(host = domain_name, path = "/#{user_name}", scheme = 'http')
+      def url(host = domain_name, path = "/#{username}", scheme = 'http')
         "#{scheme}://#{host}#{path}"
       end
 
       def slug(words = nil, glue = nil)
         glue ||= sample(%w[- _ .])
-        (words || Faker::Lorem::words(2).join(' ')).gsub(' ', glue).downcase
+        (words || Faker::Lorem.words(2).join(' ')).delete(',.').gsub(' ', glue).downcase
       end
 
       def device_token
-        shuffle(rand(16 ** 64).to_s(16).rjust(64, '0').chars.to_a).join
+        shuffle(rand(16**64).to_s(16).rjust(64, '0').chars.to_a).join
       end
 
       def user_agent(vendor = nil)
@@ -173,6 +183,8 @@ module Faker
         agents = vendor.respond_to?(:to_sym) && agent_hash[vendor.to_sym] || agent_hash[sample(agent_hash.keys)]
         sample(agents)
       end
+
+      alias user_name username
     end
   end
 end