faker 3.5.1 → 3.8.0

data/lib/faker/default/company.rb

@@ -494,7 +494,7 @@ module Faker
           # Construct taxpayer number
           gen.group(name: :taxpayer_number) do |g_|
             g_.letter(length: 3, ranges: ['A'..'Z'])
-            g_.letter(length: 1, ranges: [%w[A B C F G H L J P T K]].to_a)
+            g_.letter(length: 1, ranges: [%w[A B C F G H L J P T K]])
             g_.letter(length: 1, ranges: ['A'..'Z'])
             g_.int(length: 4, ranges: [0..9999])
             g_.letter(length: 1, ranges: ['A'..'Z'])
@@ -591,7 +591,7 @@ module Faker
 
       def weight_sum(array, weights)
         sum = 0
-        (0..weights.size - 1).each do |index|
+        (0..(weights.size - 1)).each do |index|
           sum += (array[index] * weights[index])
         end
         sum

data/lib/faker/default/crypto.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'openssl'
-
 module Faker
   class Crypto < Base
     class << self

data/lib/faker/default/driving_licence.rb

@@ -61,11 +61,11 @@ module Faker
       #   Faker::DrivingLicence.uk_driving_licence             #=> "70702548"
       #
       # @faker.version 1.9.2
-      def uk_driving_licence(*args)
+      def uk_driving_licence(*)
         if Faker::Config.random.rand < NI_CHANCE
           northern_irish_driving_licence
         else
-          british_driving_licence(*args)
+          british_driving_licence(*)
         end
       end
 
@@ -104,7 +104,7 @@ module Faker
           end
           g.computed do
             gender_marker = gender == :female ? 50 : 0
-            format('%02d', (dob.month + gender_marker))
+            format('%02d', dob.month + gender_marker)
           end
           g.computed do
             format('%02d', dob.day)

data/lib/faker/default/finance.rb

@@ -97,11 +97,11 @@ module Faker
       ##
       # Returns a random condominium fiscal code.
       #
-      # @param country [String] Two capital letter country code to use for the vat number.
+      # @param country [String] Two capital letter country code to use for the condominium fiscal code number.
       # @return [String]
       #
       # @example
-      #   Faker::Finance.condominium_fiscal_code #=> "012345678"
+      #   Faker::Finance.condominium_fiscal_code #=> "01234567890"
       #
       # @faker.version next
       def condominium_fiscal_code(country: 'IT')

data/lib/faker/default/hipster.rb

@@ -147,7 +147,7 @@ module Faker
 
         paragraph += " #{paragraph(sentence_count: 3, supplemental: supplemental)}" while paragraph.length < characters
 
-        "#{paragraph[0...characters - 1]}."
+        "#{paragraph[0...(characters - 1)]}."
       end
     end
   end

data/lib/faker/default/html.rb

@@ -14,7 +14,7 @@ module Faker
       # @faker.version 3.2.1
       def heading
         level = rand(1..6)
-        "<h#{level}>#{Lorem.word.capitalize}</h#{level}>"
+        "<h#{level}>#{Faker::Lorem.word.capitalize}</h#{level}>"
       end
 
       ##
@@ -97,7 +97,7 @@ module Faker
       #
       # @faker.version 3.2.1
       def code
-        "<code>#{Lorem.sentence(word_count: 1)}</code>"
+        "<code>#{Faker::Lorem.sentence(word_count: 1)}</code>"
       end
 
       ##
@@ -165,7 +165,7 @@ module Faker
       #   Faker::HTML.element(tag: 'div', content: "This is a div with XSS attributes.", attributes: {class: 'xss', onclick: "alert('XSS')"}) #=> "<div class=\"xss\" onclick=\"alert('XSS')\">This is a div with XSS attributes.</div>"
       #
       # @faker.version 3.2.1
-      def element(tag: 'div', content: Lorem.sentence(word_count: 3), attributes: { class: Lorem.word, onclick: "#{Lorem.word}()" })
+      def element(tag: 'div', content: Faker::Lorem.sentence(word_count: 3), attributes: { class: Faker::Lorem.word, onclick: "#{Faker::Lorem.word}()" })
         attribute_string = attributes.map { |key, value| "#{key}=\"#{value}\"" }.join(' ')
         "<#{tag} #{attribute_string}>#{content}</#{tag}>"
       end
@@ -187,7 +187,7 @@ module Faker
       def random(exclude: [])
         method_list = available_methods
         exclude.each { |ex| method_list.delete_if { |meth| meth == ex.to_sym } }
-        send(method_list[Faker::Config.random.rand(0..method_list.length - 1)])
+        send(method_list[Faker::Config.random.rand(0..(method_list.length - 1))])
       end
 
       ##

data/lib/faker/default/id_number.rb

@@ -137,7 +137,7 @@ module Faker
           Faker::Number.number(digits: 2),
           Faker::Number.between(from: 13, to: 99),
           Faker::Number.between(from: 32, to: 99)
-        ].map(&:to_s).join
+        ].join
 
         id_number = [
           invalid_date_of_birth,

data/lib/faker/default/invoice.rb

@@ -13,8 +13,8 @@ module Faker
       # @return [Integer]
       #
       # @example
-      #   Faker::Finance.amount_between #=> 0
-      #   Faker::Finance.amount_between(0, 10) #=> 4.33
+      #   Faker::Invoice.amount_between #=> 0
+      #   Faker::Invoice.amount_between(from: 0, to: 10) #=> 4.33
       #
       # @faker.version 1.9.0
       def amount_between(from: 0, to: 0)

data/lib/faker/default/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Json < Base
     require 'json'
@@ -104,17 +106,20 @@ module Faker
       end
 
       def add_hash(key_array, hash, width, options)
-        string_to_eval = 'hash'
+        string_to_eval = 'hash'.dup
+
         key_array.length.times do |index|
           string_to_eval << "['#{key_array[index]}']"
         end
         string_to_eval << " = #{build_shallow_hash(width, options)}"
         eval(string_to_eval)
+
         hash
       end
 
       def build_keys_from_array(key_array)
-        key_string = ''
+        key_string = ''.dup
+
         key_array.each do |value|
           key_string << "['#{value}']"
         end

data/lib/faker/default/lorem.rb

@@ -58,7 +58,7 @@ module Faker
       #
       # @faker.version 2.1.3
       def character
-        sample(Types::CHARACTERS)
+        sample(Faker::Types::CHARACTERS)
       end
 
       ##
@@ -78,7 +78,7 @@ module Faker
       #
       # @faker.version 2.1.3
       def characters(number: 255, min_alpha: 0, min_numeric: 0)
-        Alphanumeric.alphanumeric(number: number, min_alpha: min_alpha, min_numeric: min_numeric)
+        Faker::Alphanumeric.alphanumeric(number: number, min_alpha: min_alpha, min_numeric: min_numeric)
       end
 
       ##
@@ -194,7 +194,7 @@ module Faker
 
         paragraph += " #{paragraph(sentence_count: 3, supplemental: supplemental)}" while paragraph.length < number
 
-        "#{paragraph[0...number - 1]}."
+        "#{paragraph[0...(number - 1)]}."
       end
 
       ##

data/lib/faker/default/lorem_flickr.rb

@@ -96,7 +96,7 @@ module Faker
       private
 
       def build_url(size, format, search_terms, match_all)
-        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /^[0-9]+x[0-9]+$/
+        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /\A[0-9]+x[0-9]+\z/
 
         url_parts = ['https://loremflickr.com']
         url_parts << format

data/lib/faker/default/markdown.rb

@@ -13,7 +13,7 @@ module Faker
       #
       # @faker.version 1.8.0
       def headers
-        "#{fetch('markdown.headers')} #{Lorem.word.capitalize}"
+        "#{fetch('markdown.headers')} #{Faker::Lorem.word.capitalize}"
       end
 
       ##
@@ -28,7 +28,7 @@ module Faker
       def emphasis
         paragraph = Faker::Lorem.paragraph(sentence_count: 3)
         words = paragraph.split
-        position = rand(0..words.length - 1)
+        position = rand(0..(words.length - 1))
         formatting = fetch('markdown.emphasis')
         words[position] = "#{formatting}#{words[position]}#{formatting}"
         words.join(' ')
@@ -95,7 +95,7 @@ module Faker
       #
       # @faker.version 1.8.0
       def block_code
-        "```ruby\n#{Lorem.sentence(word_count: 1)}\n```"
+        "```ruby\n#{Faker::Lorem.sentence(word_count: 1)}\n```"
       end
 
       ##
@@ -110,7 +110,7 @@ module Faker
       def table
         table = []
         3.times do
-          table << "#{Lorem.word} | #{Lorem.word} | #{Lorem.word}"
+          table << "#{Faker::Lorem.word} | #{Faker::Lorem.word} | #{Faker::Lorem.word}"
         end
         table.insert(1, '---- | ---- | ----')
         table.join("\n")
@@ -133,7 +133,7 @@ module Faker
       def random(*args)
         method_list = available_methods
         args&.each { |ex| method_list.delete_if { |meth| meth == ex.to_sym } }
-        send(method_list[Faker::Config.random.rand(0..method_list.length - 1)])
+        send(method_list[Faker::Config.random.rand(0..(method_list.length - 1))])
       end
 
       ##

data/lib/faker/default/national_health_service.rb

@@ -20,8 +20,7 @@ module Faker
         # If the check digit is equivalent to 10, the number is invalid.
         # See https://en.wikipedia.org/wiki/NHS_number
         base_number -= 1 if check_digit(number: base_number) == 10
-        "#{base_number}#{check_digit(number: base_number)}".to_s
-                                                           .chars
+        "#{base_number}#{check_digit(number: base_number)}".chars
                                                            .insert(3, ' ')
                                                            .insert(7, ' ')
                                                            .join

data/lib/faker/default/omniauth.rb

@@ -11,8 +11,8 @@ module Faker
     def initialize(name: nil, email: nil)
       super()
 
-      @name = name || "#{Name.first_name} #{Name.last_name}"
-      @email = email || Internet.email(name: self.name)
+      @name = name || "#{Faker::Name.first_name} #{Faker::Name.last_name}"
+      @email = email || Faker::Internet.email(name: self.name)
       @first_name, @last_name = self.name.split
     end
 
@@ -27,8 +27,8 @@ module Faker
       # @return [Hash] An auth hash in the format provided by omniauth-google.
       #
       # @faker.version 1.8.0
-      def google(name: nil, email: nil, uid: Number.number(digits: 9).to_s)
-        auth = Omniauth.new(name: name, email: email)
+      def google(name: nil, email: nil, uid: Faker::Number.number(digits: 9).to_s)
+        auth = new(name: name, email: email)
         {
           provider: 'google_oauth2',
           uid: uid,
@@ -40,9 +40,9 @@ module Faker
             image: image
           },
           credentials: {
-            token: Crypto.md5,
-            refresh_token: Crypto.md5,
-            expires_at: Time.forward.to_i,
+            token: Faker::Crypto.md5,
+            refresh_token: Faker::Crypto.md5,
+            expires_at: Faker::Time.forward.to_i,
             expires: true
           },
           extra: {
@@ -56,20 +56,20 @@ module Faker
               profile: "https://plus.google.com/#{uid}",
               picture: image,
               gender: gender,
-              birthday: Date.backward(days: 36_400).strftime('%Y-%m-%d'),
+              birthday: Faker::Date.backward(days: 36_400).strftime('%Y-%m-%d'),
               locale: 'en',
-              hd: "#{Company.name.downcase}.com"
+              hd: "#{Faker::Company.name.downcase}.com"
             },
             id_info: {
               iss: 'accounts.google.com',
-              at_hash: Crypto.md5,
+              at_hash: Faker::Crypto.md5,
               email_verified: true,
-              sub: Number.number(digits: 28).to_s,
+              sub: Faker::Number.number(digits: 28).to_s,
               azp: 'APP_ID',
               email: auth.email,
               aud: 'APP_ID',
-              iat: Time.forward.to_i,
-              exp: Time.forward.to_i,
+              iat: Faker::Time.forward.to_i,
+              exp: Faker::Time.forward.to_i,
               openid_id: "https://www.google.com/accounts/o8/id?id=#{uid}"
             }
           }
@@ -87,8 +87,8 @@ module Faker
       # @return [Hash] An auth hash in the format provided by omniauth-facebook.
       #
       # @faker.version 1.8.0
-      def facebook(name: nil, email: nil, username: nil, uid: Number.number(digits: 7).to_s)
-        auth = Omniauth.new(name: name, email: email)
+      def facebook(name: nil, email: nil, username: nil, uid: Faker::Number.number(digits: 7).to_s)
+        auth = new(name: name, email: email)
         username ||= "#{auth.first_name.downcase[0]}#{auth.last_name.downcase}"
         {
           provider: 'facebook',
@@ -102,7 +102,7 @@ module Faker
             verified: random_boolean
           },
           credentials: {
-            token: Crypto.md5,
+            token: Faker::Crypto.md5,
             expires_at: Time.forward.to_i,
             expires: true
           },
@@ -115,7 +115,7 @@ module Faker
               link: "http://www.facebook.com/#{username}",
               username: username,
               location: {
-                id: Number.number(digits: 9).to_s,
+                id: Faker::Number.number(digits: 9).to_s,
                 name: city_state
               },
               gender: gender,
@@ -123,7 +123,7 @@ module Faker
               timezone: timezone,
               locale: 'en_US',
               verified: random_boolean,
-              updated_time: Time.backward.iso8601
+              updated_time: Faker::Time.backward.iso8601
             }
           }
         }
@@ -139,11 +139,11 @@ module Faker
       # @return [Hash] An auth hash in the format provided by omniauth-twitter.
       #
       # @faker.version 1.8.0
-      def twitter(name: nil, nickname: nil, uid: Number.number(digits: 6).to_s)
-        auth = Omniauth.new(name: name)
+      def twitter(name: nil, nickname: nil, uid: Faker::Number.number(digits: 6).to_s)
+        auth = new(name: name)
         nickname ||= auth.name.downcase.delete(' ')
         location = city_state
-        description = Lorem.sentence
+        description = Faker::Lorem.sentence
         {
           provider: 'twitter',
           uid: uid,
@@ -159,26 +159,26 @@ module Faker
             }
           },
           credentials: {
-            token: Crypto.md5,
-            secret: Crypto.md5
+            token: Faker::Crypto.md5,
+            secret: Faker::Crypto.md5
           },
           extra: {
             access_token: '',
             raw_info: {
               name: auth.name,
               listed_count: random_number_from_range(1..10),
-              profile_sidebar_border_color: Color.hex_color,
+              profile_sidebar_border_color: Faker::Color.hex_color,
               url: nil,
               lang: 'en',
               statuses_count: random_number_from_range(1..1000),
               profile_image_url: image,
               profile_background_image_url_https: image,
               location: location,
-              time_zone: Address.city,
+              time_zone: Faker::Address.city,
               follow_request_sent: random_boolean,
               id: uid,
               profile_background_tile: random_boolean,
-              profile_sidebar_fill_color: Color.hex_color,
+              profile_sidebar_fill_color: Faker::Color.hex_color,
               followers_count: random_number_from_range(1..10_000),
               default_profile_image: random_boolean,
               screen_name: '',
@@ -186,7 +186,7 @@ module Faker
               utc_offset: timezone,
               verified: random_boolean,
               favourites_count: random_number_from_range(1..10),
-              profile_background_color: Color.hex_color,
+              profile_background_color: Faker::Color.hex_color,
               is_translator: random_boolean,
               friends_count: random_number_from_range(1..10_000),
               notifications: random_boolean,
@@ -194,8 +194,8 @@ module Faker
               profile_background_image_url: image,
               protected: random_boolean,
               description: description,
-              profile_link_color: Color.hex_color,
-              created_at: Time.backward.strftime('%a %b %d %H:%M:%S %z %Y'),
+              profile_link_color: Faker::Color.hex_color,
+              created_at: Faker::Time.backward.strftime('%a %b %d %H:%M:%S %z %Y'),
               id_str: uid,
               profile_image_url_https: image,
               default_profile: random_boolean,
@@ -222,15 +222,15 @@ module Faker
       # @return [Hash] An auth hash in the format provided by omniauth-linkedin.
       #
       # @faker.version 1.8.0
-      def linkedin(name: nil, email: nil, uid: Number.number(digits: 6).to_s)
+      def linkedin(name: nil, email: nil, uid: Faker::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
         location = city_state
-        description = Lorem.sentence
-        token = Crypto.md5
-        secret = Crypto.md5
-        industry = Commerce.department
+        description = Faker::Lorem.sentence
+        token = Faker::Crypto.md5
+        secret = Faker::Crypto.md5
+        industry = Faker::Commerce.department
         url = "http://www.linkedin.com/in/#{first_name}#{last_name}"
         {
           provider: 'linkedin',
@@ -244,7 +244,7 @@ module Faker
             location: location,
             description: description,
             image: image,
-            phone: PhoneNumber.phone_number,
+            phone: Faker::PhoneNumber.phone_number,
             headline: description,
             industry: industry,
             urls: {
@@ -275,7 +275,7 @@ module Faker
               industry: industry,
               lastName: auth.last_name,
               location: {
-                country: { code: Address.country_code.downcase },
+                country: { code: Faker::Address.country_code.downcase },
                 name: city_state.split(', ').first
               },
               pictureUrl: image,
@@ -295,8 +295,8 @@ module Faker
       # @return [Hash] An auth hash in the format provided by omniauth-github.
       #
       # @faker.version 1.8.0
-      def github(name: nil, email: nil, uid: Number.number(digits: 8).to_s)
-        auth = Omniauth.new(name: name, email: email)
+      def github(name: nil, email: nil, uid: Faker::Number.number(digits: 8).to_s)
+        auth = new(name: name, email: email)
         login = auth.name.downcase.tr(' ', '-')
         html_url = "https://github.com/#{login}"
         api_url = "https://api.github.com/users/#{login}"
@@ -346,8 +346,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(days: 36_400).iso8601,
-              updated_at: Time.backward(days: 2).iso8601
+              created_at: Faker::Time.backward(days: 36_400).iso8601,
+              updated_at: Faker::Time.backward(days: 2).iso8601
             }
           }
         }
@@ -364,8 +364,8 @@ module Faker
       #
       # @faker.version 2.3.0
       def apple(name: nil, email: nil, uid: nil)
-        uid ||= "#{Number.number(digits: 6)}.#{Number.hexadecimal(digits: 32)}.#{Number.number(digits: 4)}"
-        auth = Omniauth.new(name: name, email: email)
+        uid ||= "#{Faker::Number.number(digits: 6)}.#{Faker::Number.hexadecimal(digits: 32)}.#{Faker::Number.number(digits: 4)}"
+        auth = new(name: name, email: email)
         {
           provider: 'apple',
           uid: uid,
@@ -376,20 +376,20 @@ module Faker
             last_name: auth.last_name
           },
           credentials: {
-            token: Crypto.md5,
-            refresh_token: Crypto.md5,
-            expires_at: Time.forward.to_i,
+            token: Faker::Crypto.md5,
+            refresh_token: Faker::Crypto.md5,
+            expires_at: Faker::Time.forward.to_i,
             expires: true
           },
           extra: {
             raw_info: {
               iss: 'https://appleid.apple.com',
               aud: 'CLIENT_ID',
-              exp: Time.forward.to_i,
-              iat: Time.forward.to_i,
+              exp: Faker::Time.forward.to_i,
+              iat: Faker::Time.forward.to_i,
               sub: uid,
-              at_hash: Crypto.md5,
-              auth_time: Time.forward.to_i,
+              at_hash: Faker::Crypto.md5,
+              auth_time: Faker::Time.forward.to_i,
               email: auth.email,
               email_verified: true
             }
@@ -408,8 +408,8 @@ module Faker
       #
       # @faker.version next
       def auth0(name: nil, email: nil, uid: nil)
-        uid ||= "auth0|#{Number.hexadecimal(digits: 24)}"
-        auth = Omniauth.new(name: name, email: email)
+        uid ||= "auth0|#{Faker::Number.hexadecimal(digits: 24)}"
+        auth = new(name: name, email: email)
         {
           provider: 'auth0',
           uid: uid,
@@ -423,9 +423,9 @@ module Faker
             expires_at: Time.forward.to_i,
             expires: true,
             token_type: 'Bearer',
-            id_token: Crypto.sha256,
-            token: Crypto.md5,
-            refresh_token: Crypto.md5
+            id_token: Faker::Crypto.sha256,
+            token: Faker::Crypto.md5,
+            refresh_token: Faker::Crypto.md5
           },
           extra: {
             raw_info: {
@@ -434,8 +434,8 @@ module Faker
               iss: 'https://auth0.com/',
               sub: uid,
               aud: 'Auth012345',
-              iat: Time.forward.to_i,
-              exp: Time.forward.to_i
+              iat: Faker::Time.forward.to_i,
+              exp: Faker::Time.forward.to_i
             }
           }
         }
@@ -452,11 +452,11 @@ module Faker
       end
 
       def image
-        Placeholdit.image
+        Faker::Placeholdit.image
       end
 
       def city_state
-        "#{Address.city}, #{Address.state}"
+        "#{Faker::Address.city}, #{Faker::Address.state}"
       end
 
       def random_number_from_range(range)

data/lib/faker/default/placeholdit.rb

@@ -30,7 +30,7 @@ module Faker
         background_color = generate_color if background_color == :random
         text_color = generate_color if text_color == :random
 
-        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /^[0-9]+x[0-9]+$/
+        raise ArgumentError, 'Size should be specified in format 300x300' unless size =~ /\A[0-9]+x[0-9]+\z$/
         raise ArgumentError, "Supported formats are #{SUPPORTED_FORMATS.join(', ')}" unless SUPPORTED_FORMATS.include?(format)
         raise ArgumentError, "background_color must be a hex value without '#'" unless background_color.nil? || background_color =~ /((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/
         raise ArgumentError, "text_color must be a hex value without '#'" unless text_color.nil? || text_color =~ /((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/
@@ -45,7 +45,7 @@ module Faker
       private
 
       def generate_color
-        format('%06x', (rand * 0xffffff))
+        format('%06x', rand * 0xffffff)
       end
     end
   end

data/lib/faker/default/string.rb

@@ -24,7 +24,7 @@ module Faker
       private
 
       def select_a(length)
-        if length.class.included_modules.include? Enumerable
+        if length.class.include?(Enumerable)
           select_a sample(length.to_enum.to_a)
         else
           length # recursive base case

data/lib/faker/default/types.rb

@@ -116,7 +116,7 @@ module Faker
       #
       # @faker.version 1.8.6
       def random_type
-        type_to_use = SIMPLE_TYPES[rand(0..SIMPLE_TYPES.length - 1)]
+        type_to_use = SIMPLE_TYPES[rand(0..(SIMPLE_TYPES.length - 1))]
         case type_to_use
         when :string
           rb_string
@@ -136,7 +136,7 @@ module Faker
       # @faker.version 1.8.6
       def random_complex_type
         types = SIMPLE_TYPES + COMPLEX_TYPES
-        type_to_use = types[rand(0..types.length - 1)]
+        type_to_use = types[rand(0..(types.length - 1))]
         case type_to_use
         when :string
           rb_string