faker 3.6.0 → 3.8.0

data/lib/faker/music/bossa_nova.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'music'
-
 module Faker
   class Music
     class BossaNova < Base

data/lib/faker/music/grateful_dead.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'music'
-
 module Faker
   class Music
     class GratefulDead < Base

data/lib/faker/music/pearl_jam.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'music'
-
 module Faker
   class Music
     class PearlJam < Base

data/lib/faker/music/rush.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'music'
-
 module Faker
   class Music
     class Rush < Base

data/lib/faker/music/smashing_pumpkins.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'music'
-
 module Faker
   class Music
     class SmashingPumpkins < Base

data/lib/faker/{music/music.rb → music.rb}

@@ -2,6 +2,10 @@
 
 module Faker
   class Music < Base
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+
     class << self
       NOTE_LETTERS = %w[C D E F G A B].freeze
       ACCIDENTAL_SIGNS = ['b', '#', ''].freeze

data/lib/faker/quotes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Faker
+  class Quotes
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+  end
+end

data/lib/faker/religion/bible.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Faker
-  module Religion
+  class Religion
     class Bible < Base
       flexible :bible
 

data/lib/faker/religion.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Faker
+  class Religion
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+  end
+end

data/lib/faker/sports.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Faker
+  class Sports
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+  end
+end

data/lib/faker/travel.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Faker
+  class Travel
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+  end
+end

data/lib/faker/tv_shows.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Faker
+  class TvShows
+    if Faker::Config.lazy_loading?
+      Faker.lazy_load(self)
+    end
+  end
+end

data/lib/faker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Faker # :nodoc:
-  VERSION = '3.6.0'
+  VERSION = '3.8.0'
 end

data/lib/faker.rb

@@ -38,6 +38,18 @@ module Faker
       def random
         Thread.current[:faker_config_random] || Random
       end
+
+      def lazy_loading?
+        if ENV.key?('FAKER_LAZY_LOAD') && !ENV['FAKER_LAZY_LOAD'].nil?
+          %w[true TRUE 1].include?(ENV.fetch('FAKER_LAZY_LOAD', nil))
+        else
+          Thread.current[:faker_lazy_loading] == true
+        end
+      end
+
+      def lazy_loading=(value)
+        Thread.current[:faker_lazy_loading] = value
+      end
     end
   end
 
@@ -95,12 +107,12 @@ module Faker
         reg
           .gsub(%r{^/?\^?}, '').gsub(%r{\$?/?$}, '') # Ditch the anchors
           .gsub(/\{(\d+)\}/, '{\1,\1}').gsub('?', '{0,1}') # All {2} become {2,2} and ? become {0,1}
-          .gsub(/(\[[^\]]+\])\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                # [12]{1,2} becomes [12] or [12][12]
-          .gsub(/(\([^)]+\))\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                 # (12|34){1,2} becomes (12|34) or (12|34)(12|34)
-          .gsub(/(\\?.)\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                      # A{1,2} becomes A or AA or \d{3} becomes \d\d\d
-          .gsub(/\((.*?)\)/) { |match| sample(match.gsub(/[()]/, '').split('|')) } # (this|that) becomes 'this' or 'that'
-          .gsub(/\[([^\]]+)\]/) { |match| match.gsub(/(\w-\w)/) { |range| sample(Array(Range.new(*range.split('-')))) } } # All A-Z inside of [] become C (or X, or whatever)
-          .gsub(/\[([^\]]+)\]/) { |_match| sample(Regexp.last_match(1).chars) } # All [ABC] become B (or A or C)
+          .gsub(/(\[[^\]]++\])\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                # [12]{1,2} becomes [12] or [12][12]
+          .gsub(/(\([^)]++\))\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                 # (12|34){1,2} becomes (12|34) or (12|34)(12|34)
+          .gsub(/(\\?.)\{(\d+),(\d+)\}/) { |_match| Regexp.last_match(1) * sample(Array(Range.new(Regexp.last_match(2).to_i, Regexp.last_match(3).to_i))) }                       # A{1,2} becomes A or AA or \d{3} becomes \d\d\d
+          .gsub(/\((.*?)\)/) { |match| sample(match.gsub(/[()]/, '').split('|')) }                                                                                                # (this|that) becomes 'this' or 'that'
+          .gsub(/\[([^\]]++)\]/) { |match| match.gsub(/(\w-\w)/) { |range| sample(Array(Range.new(*range.split('-')))) } }                                                        # All A-Z inside of [] become C (or X, or whatever)
+          .gsub(/\[([^\]]++)\]/) { |_match| sample(Regexp.last_match(1).chars) }                                                                                                  # All [ABC] become B (or A or C)
           .gsub('\d') { |_match| sample(Numbers) }
           .gsub('\w') { |_match| sample(Letters) }
       end
@@ -133,7 +145,8 @@ module Faker
       # formatted translation: e.g., "#{first_name} #{last_name}".
       def parse(key)
         fetched = fetch(key)
-        parts = fetched.scan(/(\(?)#\{([A-Za-z]+\.)?([^}]+)\}([^#]+)?/).map do |prefix, kls, meth, etc|
+
+        parts = fetched.scan(/(\(?)#\{([A-Za-z]+\.)?([^}]+)\}([^#]++)?/).map do |prefix, kls, meth, etc|
           # If the token had a class Prefix (e.g., Name.first_name)
           # grab the constant, otherwise use self
           cls = kls ? Faker.const_get(kls.chop) : self
@@ -274,7 +287,47 @@ module Faker
       end
     end
   end
+
+  if Faker::Config.lazy_loading?
+    def self.load_path(*constants)
+      constants.map do |class_name|
+        class_name
+          .to_s
+          .gsub('::', '/')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr('-', '_')
+          .downcase
+      end.join('/')
+    end
+
+    def self.lazy_load(klass)
+      def klass.const_missing(class_name)
+        load_path = case class_name
+                    when :DnD
+                      Faker.load_path('faker/games/dnd')
+                    else
+                      Faker.load_path(name, class_name)
+                    end
+
+        begin
+          require(load_path)
+        rescue LoadError
+          require(load_path.gsub('faker/', 'faker/default/'))
+        end
+
+        const_get(class_name)
+      end
+    end
+
+    lazy_load(self)
+  end
 end
 
-# require faker objects
-Dir.glob(File.join(mydir, 'faker', '/**/*.rb')).each { |file| require file }
+unless Faker::Config.lazy_loading?
+  rb_files = []
+  rb_files << File.join(mydir, 'faker', '*.rb')
+  rb_files << File.join(mydir, 'faker', '/**/*.rb')
+
+  Dir.glob(rb_files).each { |file| require file }
+end

data/lib/helpers/positional_generator.rb

@@ -278,8 +278,6 @@ class PositionalGenerator
     #       [2]
     #     ]
     def build_stack(graph)
-      require 'set'
-
       terminals = graph.filter_map { |(from, to)| to.nil? && from }
       stack = [terminals]
       seen = Set.new(terminals)

data/lib/helpers/unique_generator.rb

@@ -30,7 +30,7 @@ module Faker
       method_name.to_s.start_with?('faker_') || super
     end
 
-    RetryLimitExceeded = Class.new(StandardError)
+    class RetryLimitExceeded < StandardError; end
 
     def previous_results
       Thread.current[:faker_unique_generator_previous_results] ||= {}

data/lib/locales/README.md

@@ -20,7 +20,7 @@ Faker::Hipster.word #=> "kogi"
 
 ## How to update a locale with more translations
 
-To update a locale with more translation features, simply add a new field to the .yml file that corresponds to an existing piece of functionality in the "en.yml" file. In this example, that would mean providing Chinese hipster words.
+To update a locale with more translation features, simply add a new field to the `.yml` file that corresponds to an existing piece of functionality in the "en.yml" file. In this example, that would mean providing Chinese hipster words.
 
 ```yaml
 # /lib/locales/zh-CN.yml
@@ -52,5 +52,5 @@ Faker::Config.default_locale = :pt
 In threaded server environments, e.g., Puma, locale per thread can be set as the following:
 
 ```ruby
-  Faker::Config.locale = :es
+Faker::Config.locale = :es
 ```

data/lib/locales/en/book.yml

@@ -139,7 +139,6 @@ en:
         - The Proper Study
         - Quo Vadis
         - Recalled to Life
-        - Recalled to Life
         - Ring of Bright Water
         - The Road Less Traveled
         - A Scanner Darkly

data/lib/locales/en/football.yml

@@ -23,6 +23,15 @@ en:
         - PSV Eindhoven
         - LA Galaxy
         - Paris Saint Germain
+        - FC Porto
+        - Manchester City
+        - Sporting
+        - Atalanta
+        - Villareal
+        - Lyon
+        - AS Monaco
+        - Bayer 04 Leverkusen
+        - Aston Villa
       players:
         - Lionel Messi
         - Gerard Pique