faker 1.8.7 → 1.9.1

data/lib/faker/team.rb

@@ -15,10 +15,13 @@ module Faker
         fetch('address.state')
       end
 
+      def sport
+        fetch('team.sport')
+      end
+
       def mascot
         fetch('team.mascot')
       end
     end
-
   end
 end

data/lib/faker/the_it_crowd.rb

@@ -0,0 +1,21 @@
+module Faker
+  class TheITCrowd < Base
+    class << self
+      def actor
+        fetch('the_it_crowd.actors')
+      end
+
+      def character
+        fetch('the_it_crowd.characters')
+      end
+
+      def email
+        fetch('the_it_crowd.emails')
+      end
+
+      def quote
+        fetch('the_it_crowd.quotes')
+      end
+    end
+  end
+end

data/lib/faker/time.rb

@@ -1,14 +1,14 @@
 module Faker
   class Time < Faker::Date
     TIME_RANGES = {
-      :all => (0..23),
-      :day => (9..17),
-      :night => (18..23),
-      :morning => (6..11),
-      :afternoon => (12..17),
-      :evening => (17..21),
-      :midnight => (0..4)
-    }
+      all: (0..23),
+      day: (9..17),
+      night: (18..23),
+      morning: (6..11),
+      afternoon: (12..17),
+      evening: (17..21),
+      midnight: (0..4)
+    }.freeze
 
     class << self
       def between(from, to, period = :all, format = nil)
@@ -31,11 +31,11 @@ module Faker
       end
 
       def time_with_format(time, format)
-        format.nil? ? time : I18n.l( DateTime.parse(time.to_s), :format => format )
+        format.nil? ? time : I18n.l(DateTime.parse(time.to_s), format: format)
       end
 
       def hours(period)
-        raise ArgumentError, 'invalid period' unless TIME_RANGES.has_key? period
+        raise ArgumentError, 'invalid period' unless TIME_RANGES.key? period
         sample(TIME_RANGES[period].to_a)
       end
 

data/lib/faker/twin_peaks.rb

@@ -4,11 +4,11 @@ module Faker
       def character
         fetch('twin_peaks.characters')
       end
-      
+
       def location
         fetch('twin_peaks.locations')
       end
-      
+
       def quote
         fetch('twin_peaks.quotes')
       end

data/lib/faker/twitter.rb

@@ -86,7 +86,7 @@ module Faker
       end
 
       def screen_name
-        Faker::Internet.user_name(nil, ['_'])[0...20]
+        Faker::Internet.username(nil, ['_'])[0...20]
       end
 
       private

data/lib/faker/types.rb

@@ -1,86 +1,82 @@
 module Faker
   class Types < Base
     CHARACTERS = ('0'..'9').to_a + ('a'..'z').to_a
-    SIMPLE_TYPES = [:string, :fixnum]
-    COMPLEX_TYPES = [:hash, :array]
-    
+    SIMPLE_TYPES = %i[string fixnum].freeze
+    COMPLEX_TYPES = %i[hash array].freeze
+
     class << self
-      def string(words=1)
+      def rb_string(words = 1)
         resolved_num = resolve(words)
-        word_list = (
+        word_list =
           translate('faker.lorem.words')
-        )
-        word_list = word_list * ((resolved_num / word_list.length) + 1)
-        shuffle(word_list)[0, resolved_num].join(" ")
+
+        word_list *= ((resolved_num / word_list.length) + 1)
+        shuffle(word_list)[0, resolved_num].join(' ')
       end
-      
+
       def character
         sample(CHARACTERS)
       end
-      
-      def integer(from=0, to=100)
+
+      def rb_integer(from = 0, to = 100)
         rand(from..to).to_i
       end
-      
-      def hash(key_count=1)
-        Hash.new.tap do |hsh|
-          key_count.times do
-            hsh.merge!({self.string.to_sym => self.random_type})
+
+      def rb_hash(key_count = 1)
+        {}.tap do |hsh|
+          Lorem.words(key_count * 2).uniq.first(key_count).each do |s|
+            hsh.merge!(s.to_sym => random_type)
           end
         end
       end
-      
-      def complex_hash(key_count=1)
-        Hash.new.tap do |hsh|
-          key_count.times do
-            hsh.merge!({self.string.to_sym => self.random_complex_type})
+
+      def complex_rb_hash(key_count = 1)
+        {}.tap do |hsh|
+          Lorem.words(key_count * 2).uniq.first(key_count).each do |s|
+            hsh.merge!(s.to_sym => random_complex_type)
           end
         end
       end
-      
-      def array(len=1)
-        Array.new.tap do |ar|
+
+      def rb_array(len = 1)
+        [].tap do |ar|
           len.times do
-            ar.push self.random_type
+            ar.push random_type
           end
         end
       end
-      
+
       def random_type
         type_to_use = SIMPLE_TYPES[rand(0..SIMPLE_TYPES.length - 1)]
         case type_to_use
         when :string
-          self.string
+          rb_string
         when :fixnum
-          self.integer
-        else
-          self.integer
+          rb_integer
         end
       end
-      
+
       def random_complex_type
         types = SIMPLE_TYPES + COMPLEX_TYPES
         type_to_use = types[rand(0..types.length - 1)]
         case type_to_use
         when :string
-          self.string
+          rb_string
         when :fixnum
-          self.integer
+          rb_integer
         when :hash
-          self.hash
+          rb_hash
         when :array
-          self.array
-        else
-          self.integer
+          rb_array
         end
       end
-      
+
       private
-      
+
       def titleize(word)
         word.split(/(\W)/).map(&:capitalize).join
       end
-      
+
       def resolve(value)
         case value
         when Array then sample(value)

data/lib/faker/university.rb

@@ -16,12 +16,12 @@ module Faker
       end
 
       def greek_organization
-        3.times.map { |_| sample(greek_alphabet) }.join
+        Array.new(3) { |_| sample(greek_alphabet) }.join
       end
 
       def greek_alphabet
-        ['Α', 'B', 'Γ', 'Δ', 'E', 'Z', 'H', 'Θ', 'I', 'K', 'Λ', 'M', 'N', 'Ξ',
-         'O', 'Π', 'P', 'Σ', 'T', 'Y', 'Φ', 'X', 'Ψ', 'Ω']
+        %w[Α B Γ Δ E Z H Θ I K Λ M N Ξ
+           O Π P Σ T Y Φ X Ψ Ω]
       end
     end
   end

data/lib/faker/vehicle.rb

@@ -2,17 +2,17 @@ module Faker
   class Vehicle < Base
     flexible :vehicle
 
-    VIN_CHARS = '0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ'
-    VIN_MAP = '0123456789X'
-    VIN_WEIGHTS = '8765432X098765432'
+    VIN_CHARS = '0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ'.freeze
+    VIN_MAP = '0123456789X'.freeze
+    VIN_WEIGHTS = '8765432X098765432'.freeze
 
     class << self
-      #ISO 3779
+      # ISO 3779
       def vin
         _, wmi, wmi_ext = sample(fetch_all('vehicle.manufacture'))
 
-        c = VIN_CHARS.split('').reject{ |n| n == '.'}
-        vehicle_identification_number = wmi.split('').concat( Array.new(14) { sample(c) } )
+        c = VIN_CHARS.split('').reject { |n| n == '.' }
+        vehicle_identification_number = wmi.split('').concat(Array.new(14) { sample(c) })
         (12..14).to_a.each_with_index { |n, i| vehicle_identification_number[n] = wmi_ext[i] } unless wmi_ext.nil?
         vehicle_identification_number[10] = fetch('vehicle.year')
         vehicle_identification_number[8] = vin_checksum(vehicle_identification_number)
@@ -24,16 +24,78 @@ module Faker
         sample(fetch_all('vehicle.manufacture')).first
       end
 
-    private
+      def mileage
+        rand_in_range(10_000, 90_000)
+      end
+
+      def year
+        rand_in_range(2005, ::Time.now.year)
+      end
+
+      def make
+        fetch('vehicle.makes')
+      end
+
+      def model(make_of_model = '')
+        return fetch("vehicle.models_by_make.#{make}") if make_of_model.empty?
+        fetch("vehicle.models_by_make.#{make_of_model}")
+      end
+
+      def make_and_model
+        m = make
+        "#{m} #{model(m)}"
+      end
+
+      def style
+        fetch('vehicle.styles')
+      end
+
+      def color
+        fetch('vehicle.colors')
+      end
+
+      def transmission
+        fetch('vehicle.transmissions')
+      end
 
-      def calculate_vin_weight(character, i)
-        (VIN_CHARS.index(character) % 10) * VIN_MAP.index(VIN_WEIGHTS[i])
+      def drive_type
+        fetch('vehicle.drive_types')
+      end
+
+      def fuel_type
+        fetch('vehicle.fuel_types')
+      end
+
+      def door_count
+        "#{fetch('vehicle.door_count')} #{fetch('vehicle.door')}"
+      end
+
+      def car_type
+        fetch('vehicle.car_types')
+      end
+
+      def engine
+        "#{fetch('vehicle.engine_size')} #{fetch('vehicle.cylinder_engine')}"
+      end
+      alias engine_size engine
+
+      def car_options
+        Array.new(rand(5...10)) { fetch('vehicle.car_options') }
+      end
+
+      def standard_specs
+        Array.new(rand(5...10)) { fetch('vehicle.standard_specs') }
+      end
+
+      private
+
+      def calculate_vin_weight(character, idx)
+        (VIN_CHARS.index(character) % 10) * VIN_MAP.index(VIN_WEIGHTS[idx])
       end
 
       def vin_checksum(vehicle_identification_number)
         VIN_MAP[vehicle_identification_number.each_with_index.map(&method(:calculate_vin_weight)).inject(:+) % 11]
       end
-
     end
   end
 end

data/lib/faker/verb.rb

@@ -0,0 +1,25 @@
+module Faker
+  class Verb < Base
+    class << self
+      def base
+        fetch('verbs.base')
+      end
+
+      def past
+        fetch('verbs.past')
+      end
+
+      def past_participle
+        fetch('verbs.past_participle')
+      end
+
+      def simple_present
+        fetch('verbs.simple_present')
+      end
+
+      def ing_form
+        fetch('verbs.ing_form')
+      end
+    end
+  end
+end

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "1.8.7"
+  VERSION = '1.9.1'.freeze
 end

data/lib/faker/world_cup.rb

@@ -0,0 +1,25 @@
+module Faker
+  class WorldCup < Base
+    class << self
+      def team
+        fetch('world_cup.teams')
+      end
+
+      def city
+        fetch('world_cup.cities')
+      end
+
+      def stadium
+        fetch('world_cup.stadiums')
+      end
+
+      def group(group = 'group_A')
+        fetch("world_cup.groups.#{group}")
+      end
+
+      def roster(country = 'Egypt', type = 'coach')
+        fetch("world_cup.rosters.#{country}.#{type}")
+      end
+    end
+  end
+end

data/lib/helpers/char.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module Faker
   module Char
     def self.prepare(string)
@@ -10,16 +9,16 @@ module Faker
     def self.fix_umlauts(string)
       string.gsub(/[äöüß]/i) do |match|
         case match.downcase
-          when "ä" 'ae'
-          when "ö" 'oe'
-          when "ü" 'ue'
-          when "ß" 'ss'
+        when 'ä' then 'ae'
+        when 'ö' then 'oe'
+        when 'ü' then 'ue'
+        when 'ß' then 'ss'
         end
       end
     end
 
     def self.romanize_cyrillic(string)
-      if Faker::Config.locale == "uk"
+      if Faker::Config.locale == 'uk'
         # Based on conventions abopted by BGN/PCGN for Ukrainian
         uk_chars = {
           'а' => 'a',  'б' => 'b',  'в' => 'v',  'г' => 'h',  'ґ' => 'g',  'д' => 'd',
@@ -39,22 +38,22 @@ module Faker
         return string.gsub(/[а-яА-ЯіїєґІЇЄҐ]/, uk_chars)
       end
 
-      if Faker::Config.locale == "ru"
+      if Faker::Config.locale == 'ru'
         # Based on conventions abopted by BGN/PCGN for Russian
         ru_chars = {
-            'а' => 'a',  'б' => 'b',  'в' => 'v',    'г' => 'h',  'д' => 'd',  'е' => 'e',
-            'ё' => 'ye', 'ж' => 'zh', 'з' => 'z',    'и' => 'i',  'й' => 'y',  'к' => 'k',
-            'л' => 'l',  'м' => 'm',  'н' => 'n',    'о' => 'o',  'п' => 'p',  'р' => 'r',
-            'с' => 's',  'т' => 't',  'у' => 'u',    'ф' => 'f',  'х' => 'kh', 'ц' => 'ts',
-            'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shch', 'ы' => 'у',  'э' => 'e',  'ю' => 'yu',
-            'я' => 'ya',
-            'А' => 'a',  'Б' => 'b',  'В' => 'v',    'Г' => 'h',  'Д' => 'd',  'Е' => 'e',
-            'Ё' => 'ye', 'Ж' => 'zh', 'З' => 'z',    'И' => 'i',  'Й' => 'y',  'К' => 'k',
-            'Л' => 'l',  'М' => 'm',  'Н' => 'n',    'О' => 'o',  'П' => 'p',  'Р' => 'r',
-            'С' => 's',  'Т' => 't',  'У' => 'u',    'Ф' => 'f',  'Х' => 'kh', 'Ц' => 'ts',
-            'Ч' => 'ch', 'Ш' => 'sh', 'Щ' => 'shch', 'Ы' => 'у',  'Э' => 'e',  'Ю' => 'yu',
-            'Я' => 'ya',
-            'ь' => '',   'ъ' => '' # Ignore symbols, because its standard presentation is not allowed in URLs
+          'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'h', 'д' => 'd', 'е' => 'e',
+          'ё' => 'ye', 'ж' => 'zh', 'з' => 'z',    'и' => 'i',  'й' => 'y',  'к' => 'k',
+          'л' => 'l',  'м' => 'm',  'н' => 'n',    'о' => 'o',  'п' => 'p',  'р' => 'r',
+          'с' => 's',  'т' => 't',  'у' => 'u',    'ф' => 'f',  'х' => 'kh', 'ц' => 'ts',
+          'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shch', 'ы' => 'у',  'э' => 'e',  'ю' => 'yu',
+          'я' => 'ya',
+          'А' => 'a',  'Б' => 'b',  'В' => 'v',    'Г' => 'h',  'Д' => 'd',  'Е' => 'e',
+          'Ё' => 'ye', 'Ж' => 'zh', 'З' => 'z',    'И' => 'i',  'Й' => 'y',  'К' => 'k',
+          'Л' => 'l',  'М' => 'm',  'Н' => 'n',    'О' => 'o',  'П' => 'p',  'Р' => 'r',
+          'С' => 's',  'Т' => 't',  'У' => 'u',    'Ф' => 'f',  'Х' => 'kh', 'Ц' => 'ts',
+          'Ч' => 'ch', 'Ш' => 'sh', 'Щ' => 'shch', 'Ы' => 'у',  'Э' => 'e',  'Ю' => 'yu',
+          'Я' => 'ya',
+          'ь' => '', 'ъ' => '' # Ignore symbols, because its standard presentation is not allowed in URLs
         }
         return string.gsub(/[а-яА-Я]/, ru_chars)
       end