faker 1.9.6 → 2.1.2

data/lib/faker/default/omniauth.rb

@@ -10,12 +10,12 @@ module Faker
 
     def initialize(name: nil, email: nil)
       @name = name || "#{Name.first_name} #{Name.last_name}"
-      @email = email || Internet.safe_email(self.name)
+      @email = email || Internet.safe_email(name: self.name)
       @first_name, @last_name = self.name.split
     end
 
     class << self
-      def google(name: nil, email: nil, uid: Number.number(9))
+      def google(name: nil, email: nil, uid: Number.number(digits: 9).to_s)
         auth = Omniauth.new(name: name, email: email)
         {
           provider: 'google_oauth2',
@@ -44,7 +44,7 @@ module Faker
               profile: "https://plus.google.com/#{uid}",
               picture: image,
               gender: gender,
-              birthday: Date.backward(36_400).strftime('%Y-%m-%d'),
+              birthday: Date.backward(days: 36_400).strftime('%Y-%m-%d'),
               local: 'en',
               hd: "#{Company.name.downcase}.com"
             },
@@ -52,7 +52,7 @@ module Faker
               'iss' => 'accounts.google.com',
               'at_hash' => Crypto.md5,
               'email_verified' => true,
-              'sub' => Number.number(28).to_s,
+              'sub' => Number.number(digits: 28).to_s,
               'azp' => 'APP_ID',
               'email' => auth.email,
               'aud' => 'APP_ID',
@@ -64,7 +64,7 @@ module Faker
         }
       end
 
-      def facebook(name: nil, email: nil, username: nil, uid: Number.number(7))
+      def facebook(name: nil, email: nil, username: nil, uid: Number.number(digits: 7).to_s)
         auth = Omniauth.new(name: name, email: email)
         username ||= "#{auth.first_name.downcase[0]}#{auth.last_name.downcase}"
         {
@@ -92,7 +92,7 @@ module Faker
               link: "http://www.facebook.com/#{username}",
               username: username,
               location: {
-                id: Number.number(9),
+                id: Number.number(digits: 9).to_s,
                 name: city_state
               },
               gender: gender,
@@ -106,7 +106,7 @@ module Faker
         }
       end
 
-      def twitter(name: nil, nickname: nil, uid: Number.number(6))
+      def twitter(name: nil, nickname: nil, uid: Number.number(digits: 6).to_s)
         auth = Omniauth.new(name: name)
         nickname ||= auth.name.downcase.delete(' ')
         location = city_state
@@ -179,7 +179,7 @@ module Faker
         }
       end
 
-      def linkedin(name: nil, email: nil, uid: Number.number(6))
+      def linkedin(name: nil, email: nil, uid: Number.number(digits: 6).to_s)
         auth = Omniauth.new(name: name, email: email)
         first_name = auth.first_name.downcase
         last_name = auth.last_name.downcase
@@ -242,7 +242,7 @@ module Faker
         }
       end
 
-      def github(name: nil, email: nil, uid: Number.number(8))
+      def github(name: nil, email: nil, uid: Number.number(digits: 8).to_s)
         auth = Omniauth.new(name: name, email: email)
         login = auth.name.downcase.tr(' ', '-')
         html_url = "https://github.com/#{login}"
@@ -293,8 +293,8 @@ module Faker
               public_gists: random_number_from_range(1..1000),
               followers: random_number_from_range(1..1000),
               following: random_number_from_range(1..1000),
-              created_at: Time.backward(36_400).iso8601,
-              updated_at: Time.backward(2).iso8601
+              created_at: Time.backward(days: 36_400).iso8601,
+              updated_at: Time.backward(days: 2).iso8601
             }
           }
         }

data/lib/faker/default/phone_number.rb

@@ -40,7 +40,7 @@ module Faker
       # US and Canada only
       # Can be used for both extensions and last four digits of phone number.
       # Since extensions can be of variable length, this method taks a length parameter
-      def subscriber_number(length = 4)
+      def subscriber_number(length: 4)
         rand.to_s[2..(1 + length)]
       end
 

data/lib/faker/default/placeholdit.rb

@@ -5,7 +5,7 @@ module Faker
     class << self
       SUPPORTED_FORMATS = %w[png jpg gif jpeg].freeze
 
-      def image(size = '300x300', format = 'png', background_color = nil, text_color = nil, text = nil)
+      def image(size: '300x300', format: 'png', background_color: nil, text_color: nil, text: nil)
         background_color = generate_color if background_color == :random
         text_color = generate_color if text_color == :random
 

data/lib/faker/default/relationship.rb

@@ -5,7 +5,7 @@ module Faker
     flexible :relationship
 
     class << self
-      def familial(connection = nil)
+      def familial(connection: nil)
         familial_connections = translate('faker.relationship.familial').keys
 
         if connection.nil?

data/lib/faker/default/source.rb

@@ -3,7 +3,7 @@
 module Faker
   class Source < Base
     class << self
-      def hello_world(lang = :ruby)
+      def hello_world(lang: :ruby)
         fetch("source.hello_world.#{lang}")
       end
 
@@ -12,7 +12,7 @@ module Faker
         code.gsub('faker_string_to_print', str)
       end
 
-      def print_1_to_10(lang = :ruby)
+      def print_1_to_10(lang: :ruby)
         fetch("source.print_1_to_10.#{lang}")
       end
     end

data/lib/faker/default/south_africa.rb

@@ -44,7 +44,7 @@ module Faker
       end
 
       def vat_number
-        Faker::Finance.vat_number('ZA')
+        Faker::Finance.vat_number(country: 'ZA')
       end
     end
   end

data/lib/faker/default/space.rb

@@ -56,8 +56,8 @@ module Faker
         fetch('space.meteorite')
       end
 
-      def launch_vehicule
-        fetch('space.launch_vehicule')
+      def launch_vehicle
+        fetch('space.launch_vehicle')
       end
     end
   end

data/lib/faker/default/string.rb

@@ -3,7 +3,7 @@
 module Faker
   class String < Base
     class << self
-      def random(length = 32)
+      def random(length: 32)
         utf8string select_a length
       end
 

data/lib/faker/default/stripe.rb

@@ -3,7 +3,7 @@
 module Faker
   class Stripe < Base
     class << self
-      def valid_card(card_type = nil)
+      def valid_card(card_type: nil)
         valid_cards = translate('faker.stripe.valid_cards').keys
 
         if card_type.nil?
@@ -18,7 +18,7 @@ module Faker
         fetch('stripe.valid_cards.' + card_type)
       end
 
-      def valid_token(card_type = nil)
+      def valid_token(card_type: nil)
         valid_tokens = translate('faker.stripe.valid_tokens').keys
 
         if card_type.nil?
@@ -33,7 +33,7 @@ module Faker
         fetch('stripe.valid_tokens.' + card_type)
       end
 
-      def invalid_card(card_error = nil)
+      def invalid_card(card_error: nil)
         invalid_cards = translate('faker.stripe.invalid_cards').keys
 
         if card_error.nil?
@@ -57,7 +57,7 @@ module Faker
         rand_in_range(start_year, start_year + 5).to_s
       end
 
-      def ccv(card_type = nil)
+      def ccv(card_type: nil)
         (card_type.to_s == 'amex' ? rand_in_range(1000, 9999) : rand_in_range(100, 999)).to_s
       end
     end

data/lib/faker/default/time.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Faker
-  class Time < Faker::Date
+  class Time < Base
     TIME_RANGES = {
       all: (0..23),
       day: (9..17),
@@ -13,17 +13,26 @@ module Faker
     }.freeze
 
     class << self
-      def between(from, to, period = :all, format = nil)
-        time = period == :between ? rand(from..to) : date_with_random_time(super(from, to), period)
+      def between(from:, to:, format: nil)
+        from = get_time_object(from)
+        to = get_time_object(to)
+
+        time = Faker::Base.rand_in_range(from, to)
+        time_with_format(time, format)
+      end
+
+      def between_dates(from:, to:, period: :all, format: nil)
+        date = Faker::Date.between(from: from, to: to)
+        time = date_with_random_time(date, period)
         time_with_format(time, format)
       end
 
-      def forward(days = 365, period = :all, format = nil)
-        time_with_format(date_with_random_time(super(days), period), format)
+      def forward(days: 365, period: :all, format: nil)
+        time_with_format(date_with_random_time(Faker::Date.forward(days: days), period), format)
       end
 
-      def backward(days = 365, period = :all, format = nil)
-        time_with_format(date_with_random_time(super(days), period), format)
+      def backward(days: 365, period: :all, format: nil)
+        time_with_format(date_with_random_time(Faker::Date.backward(days: days), period), format)
       end
 
       private
@@ -33,7 +42,7 @@ 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.localize(time, format: format)
       end
 
       def hours(period)
@@ -49,6 +58,12 @@ module Faker
       def seconds
         sample((0..59).to_a)
       end
+
+      def get_time_object(time)
+        time = ::Time.parse(time) if time.is_a? String
+        time = time.to_time if time.respond_to?(:to_time)
+        time
+      end
     end
   end
 end

data/lib/faker/default/twitter.rb

@@ -5,49 +5,49 @@ module Faker
     class << self
       def user(include_status: true, include_email: false)
         user_id = id
-        background_image_url = Faker::LoremPixel.image('600x400') # TODO: Make the dimensions change
-        profile_image_url = Faker::Avatar.image(user_id, '48x48')
+        background_image_url = Faker::LoremPixel.image(size: '600x400') # TODO: Make the dimensions change
+        profile_image_url = Faker::Avatar.image(slug: user_id, size: '48x48')
         user = {
           id: user_id,
           id_str: user_id.to_s,
-          contributors_enabled: Faker::Boolean.boolean(0.1),
+          contributors_enabled: Faker::Boolean.boolean(true_ratio: 0.1),
           created_at: created_at,
-          default_profile_image: Faker::Boolean.boolean(0.1),
-          default_profile: Faker::Boolean.boolean(0.1),
+          default_profile_image: Faker::Boolean.boolean(true_ratio: 0.1),
+          default_profile: Faker::Boolean.boolean(true_ratio: 0.1),
           description: Faker::Lorem.sentence,
           entities:  user_entities,
-          favourites_count: Faker::Number.between(1, 100_000),
+          favourites_count: Faker::Number.between(to: 1, from: 100_000),
           follow_request_sent: false,
-          followers_count: Faker::Number.between(1, 10_000_000),
+          followers_count: Faker::Number.between(to: 1, from: 10_000_000),
           following: false,
-          friends_count: Faker::Number.between(1, 100_000),
-          geo_enabled: Faker::Boolean.boolean(0.1),
-          is_translation_enabled: Faker::Boolean.boolean(0.1),
-          is_translator: Faker::Boolean.boolean(0.1),
+          friends_count: Faker::Number.between(to: 1, from: 100_000),
+          geo_enabled: Faker::Boolean.boolean(true_ratio: 0.1),
+          is_translation_enabled: Faker::Boolean.boolean(true_ratio: 0.1),
+          is_translator: Faker::Boolean.boolean(true_ratio: 0.1),
           lang: Faker::Address.country_code,
-          listed_count: Faker::Number.between(1, 1000),
+          listed_count: Faker::Number.between(to: 1, from: 1000),
           location: "#{Faker::Address.city}, #{Faker::Address.state_abbr}, #{Faker::Address.country_code}",
           name: Faker::Name.name,
           notifications: false,
           profile_background_color: Faker::Color.hex_color,
           profile_background_image_url_https: background_image_url,
           profile_background_image_url: background_image_url.sub('https://', 'http://'),
-          profile_background_tile: Faker::Boolean.boolean(0.1),
-          profile_banner_url: Faker::LoremPixel.image('1500x500'),
+          profile_background_tile: Faker::Boolean.boolean(true_ratio: 0.1),
+          profile_banner_url: Faker::LoremPixel.image(size: '1500x500'),
           profile_image_url_https: profile_image_url,
           profile_image_url: profile_image_url.sub('https://', 'http://'),
           profile_link_color: Faker::Color.hex_color,
           profile_sidebar_border_color: Faker::Color.hex_color,
           profile_sidebar_fill_color: Faker::Color.hex_color,
           profile_text_color: Faker::Color.hex_color,
-          profile_use_background_image: Faker::Boolean.boolean(0.4),
-          protected: Faker::Boolean.boolean(0.1),
+          profile_use_background_image: Faker::Boolean.boolean(true_ratio: 0.4),
+          protected: Faker::Boolean.boolean(true_ratio: 0.1),
           screen_name: screen_name,
-          statuses_count: Faker::Number.between(1, 100_000),
+          statuses_count: Faker::Number.between(to: 1, from: 100_000),
           time_zone: Faker::Address.time_zone,
-          url: Faker::Internet.url('example.com'),
+          url: Faker::Internet.url(host: 'example.com'),
           utc_offset: utc_offset,
-          verified: Faker::Boolean.boolean(0.1)
+          verified: Faker::Boolean.boolean(true_ratio: 0.1)
         }
         user[:status] = Faker::Twitter.status(include_user: false) if include_status
         user[:email] = Faker::Internet.safe_email if include_email
@@ -63,7 +63,7 @@ module Faker
           coordinates: nil,
           created_at: created_at,
           entities:  status_entities(include_photo: include_photo),
-          favorite_count: Faker::Number.between(1, 10_000),
+          favorite_count: Faker::Number.between(to: 1, from: 10_000),
           favorited: false,
           geo: nil,
           in_reply_to_screen_name: nil,
@@ -74,11 +74,11 @@ module Faker
           lang: Faker::Address.country_code,
           nil: nil,
           place: nil,
-          possibly_sensitive: Faker::Boolean.boolean(0.1),
-          retweet_count: Faker::Number.between(1, 10_000),
+          possibly_sensitive: Faker::Boolean.boolean(true_ratio: 0.1),
+          retweet_count: Faker::Number.between(to: 1, from: 10_000),
           retweeted_status:  nil,
           retweeted: false,
-          source: "<a href=\"#{Faker::Internet.url('example.com')}\" rel=\"nofollow\">#{Faker::Company.name}</a>",
+          source: "<a href=\"#{Faker::Internet.url(host: 'example.com')}\" rel=\"nofollow\">#{Faker::Company.name}</a>",
           text: Faker::Lorem.sentence,
           truncated: false
         }
@@ -88,21 +88,21 @@ module Faker
       end
 
       def screen_name
-        Faker::Internet.username(nil, ['_'])[0...20]
+        Faker::Internet.username(specifier: nil, separators: ['_'])[0...20]
       end
 
       private
 
       def id
-        Faker::Number.between(1, 9_223_372_036_854_775_807)
+        Faker::Number.between(from: 1, to: 9_223_372_036_854_775_807)
       end
 
       def created_at
-        Faker::Date.between('2006-03-21', ::Date.today).strftime('%a %b %d %H:%M:%S %z %Y')
+        Faker::Date.between(from: '2006-03-21', to: ::Date.today).strftime('%a %b %d %H:%M:%S %z %Y')
       end
 
       def utc_offset
-        Faker::Number.between(-43_200, 50_400)
+        Faker::Number.between(to: -43_200, from: 50_400)
       end
 
       def user_entities
@@ -130,7 +130,7 @@ module Faker
       def photo_entity
         # TODO: Dynamic image sizes
         # TODO: Return accurate indices
-        media_url = Faker::LoremPixel.image('1064x600')
+        media_url = Faker::LoremPixel.image(size: '1064x600')
         media_id = id
         {
           id: media_id,
@@ -141,9 +141,9 @@ module Faker
           ],
           media_url: media_url.sub('https://', 'http://'),
           media_url_https: media_url,
-          url: Faker::Internet.url('example.com'),
+          url: Faker::Internet.url(host: 'example.com'),
           display_url: 'example.com',
-          expanded_url: Faker::Internet.url('example.com'),
+          expanded_url: Faker::Internet.url(host: 'example.com'),
           type: 'photo',
           sizes:  {
             medium:  {

data/lib/faker/default/types.rb

@@ -7,7 +7,7 @@ module Faker
     COMPLEX_TYPES = %i[hash array].freeze
 
     class << self
-      def rb_string(words = 1)
+      def rb_string(words: 1)
         resolved_num = resolve(words)
         word_list =
           translate('faker.lorem.words')
@@ -20,23 +20,23 @@ module Faker
         sample(CHARACTERS)
       end
 
-      def rb_integer(from = 0, to = 100)
+      def rb_integer(from: 0, to: 100)
         rand(from..to).to_i
       end
 
-      def rb_hash(key_count = 1, type = random_type)
+      def rb_hash(number: 1, type: random_type)
         {}.tap do |hsh|
-          Lorem.words(key_count * 2).uniq.first(key_count).each do |s|
+          Lorem.words(number: number * 2).uniq.first(number).each do |s|
             hsh.merge!(s.to_sym => type)
           end
         end
       end
 
-      def complex_rb_hash(key_count = 1)
-        rb_hash(key_count, random_complex_type)
+      def complex_rb_hash(number: 1)
+        rb_hash(number: number, type: random_complex_type)
       end
 
-      def rb_array(len = 1)
+      def rb_array(len: 1)
         [].tap do |ar|
           len.times do
             ar.push random_type

data/lib/faker/default/vehicle.rb

@@ -26,7 +26,7 @@ module Faker
         fetch('vehicle.makes')
       end
 
-      def model(make_of_model = '')
+      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}")
@@ -35,7 +35,7 @@ module Faker
       def make_and_model
         m = make
 
-        "#{m} #{model(m)}"
+        "#{m} #{model(make_of_model: m)}"
       end
 
       def style
@@ -82,16 +82,16 @@ module Faker
       alias door_count doors
 
       def year
-        Faker::Time.backward(rand_in_range(365, 5475), :all, '%Y').to_i
+        Faker::Time.backward(days: rand_in_range(365, 5475), period: :all, format: '%Y').to_i
       end
 
-      def mileage(min = MILEAGE_MIN, max = MILEAGE_MAX)
+      def mileage(min: MILEAGE_MIN, max: MILEAGE_MAX)
         rand_in_range(min, max)
       end
 
       alias kilometrage mileage
 
-      def license_plate(state_abreviation = '')
+      def license_plate(state_abreviation: '')
         return regexify(bothify(fetch('vehicle.license_plate'))) if state_abreviation.empty?
 
         key = 'vehicle.license_plate_by_state.' + state_abreviation