factory_bot 5.1.0 → 6.2.0

data/lib/factory_bot/factory_runner.rb

@@ -1,11 +1,11 @@
 module FactoryBot
   class FactoryRunner
     def initialize(name, strategy, traits_and_overrides)
-      @name     = name
+      @name = name
       @strategy = strategy
 
       @overrides = traits_and_overrides.extract_options!
-      @traits    = traits_and_overrides
+      @traits = traits_and_overrides
     end
 
     def run(runner_strategy = @strategy, &block)
@@ -22,7 +22,7 @@ module FactoryBot
         strategy: runner_strategy,
         traits: @traits,
         overrides: @overrides,
-        factory: factory,
+        factory: factory
       }
 
       ActiveSupport::Notifications.instrument("factory_bot.run_factory", instrumentation_payload) do

data/lib/factory_bot/find_definitions.rb

@@ -7,7 +7,7 @@ module FactoryBot
     attr_accessor :definition_file_paths
   end
 
-  self.definition_file_paths = %w(factories test/factories spec/factories)
+  self.definition_file_paths = %w[factories test/factories spec/factories]
 
   def self.find_definitions
     absolute_definition_file_paths = definition_file_paths.map { |path| File.expand_path(path) }

data/lib/factory_bot/internal.rb

@@ -1,26 +1,20 @@
 module FactoryBot
   # @api private
   module Internal
-    DEFAULT_STRATEGIES = {
-      build:          FactoryBot::Strategy::Build,
-      create:         FactoryBot::Strategy::Create,
-      attributes_for: FactoryBot::Strategy::AttributesFor,
-      build_stubbed:  FactoryBot::Strategy::Stub,
-      null:           FactoryBot::Strategy::Null,
-    }.freeze
-
-    DEFAULT_CALLBACKS = [
-      :after_create, :after_build, :after_stub, :after_create
-    ].freeze
-
     class << self
-      delegate :callback_names,
-               :factories,
-               :inline_sequences,
-               :sequences,
-               :strategies,
-               :traits,
-               to: :configuration
+      delegate :after,
+        :before,
+        :callbacks,
+        :constructor,
+        :factories,
+        :initialize_with,
+        :inline_sequences,
+        :sequences,
+        :skip_create,
+        :strategies,
+        :to_create,
+        :traits,
+        to: :configuration
 
       def configuration
         @configuration ||= Configuration.new
@@ -86,16 +80,11 @@ module FactoryBot
       end
 
       def register_default_strategies
-        DEFAULT_STRATEGIES.each(&method(:register_strategy))
-      end
-
-      def register_default_callbacks
-        DEFAULT_CALLBACKS.each(&method(:register_callback))
-      end
-
-      def register_callback(name)
-        name = name.to_sym
-        callback_names << name
+        register_strategy(:build, FactoryBot::Strategy::Build)
+        register_strategy(:create, FactoryBot::Strategy::Create)
+        register_strategy(:attributes_for, FactoryBot::Strategy::AttributesFor)
+        register_strategy(:build_stubbed, FactoryBot::Strategy::Stub)
+        register_strategy(:null, FactoryBot::Strategy::Null)
       end
     end
   end

data/lib/factory_bot/linter.rb

@@ -19,17 +19,16 @@ module FactoryBot
     attr_reader :factories_to_lint, :invalid_factories, :factory_strategy
 
     def calculate_invalid_factories
-      factories_to_lint.reduce(Hash.new([])) do |result, factory|
+      factories_to_lint.each_with_object(Hash.new([])) do |factory, result|
         errors = lint(factory)
         result[factory] |= errors unless errors.empty?
-        result
       end
     end
 
     class FactoryError
       def initialize(wrapped_error, factory)
         @wrapped_error = wrapped_error
-        @factory       = factory
+        @factory = factory
       end
 
       def message
@@ -72,8 +71,8 @@ module FactoryBot
       result = []
       begin
         FactoryBot.public_send(factory_strategy, factory.name)
-      rescue StandardError => error
-        result |= [FactoryError.new(error, factory)]
+      rescue => e
+        result |= [FactoryError.new(e, factory)]
       end
       result
     end
@@ -81,20 +80,17 @@ module FactoryBot
     def lint_traits(factory)
       result = []
       factory.definition.defined_traits.map(&:name).each do |trait_name|
-        begin
-          FactoryBot.public_send(factory_strategy, factory.name, trait_name)
-        rescue StandardError => error
-          result |=
-            [FactoryTraitError.new(error, factory, trait_name)]
-        end
+        FactoryBot.public_send(factory_strategy, factory.name, trait_name)
+      rescue => e
+        result |= [FactoryTraitError.new(e, factory, trait_name)]
       end
       result
     end
 
     def error_message
-      lines = invalid_factories.map do |_factory, exceptions|
+      lines = invalid_factories.map { |_factory, exceptions|
         exceptions.map(&error_message_type)
-      end.flatten
+      }.flatten
 
       <<~ERROR_MESSAGE.strip
         The following factories are invalid:

data/lib/factory_bot/null_factory.rb

@@ -10,12 +10,18 @@ module FactoryBot
     delegate :defined_traits, :callbacks, :attributes, :constructor,
       :to_create, to: :definition
 
-    def compile; end
+    def compile
+    end
 
-    def class_name; end
+    def class_name
+    end
 
-    def evaluator_class; FactoryBot::Evaluator; end
+    def evaluator_class
+      FactoryBot::Evaluator
+    end
 
-    def hierarchy_class; FactoryBot::DefinitionHierarchy; end
+    def hierarchy_class
+      FactoryBot::DefinitionHierarchy
+    end
   end
 end

data/lib/factory_bot/null_object.rb

@@ -5,7 +5,7 @@ module FactoryBot
       @methods_to_respond_to = methods_to_respond_to.map(&:to_s)
     end
 
-    def method_missing(name, *args, &block)
+    def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing
       if respond_to?(name)
         nil
       else
@@ -13,12 +13,8 @@ module FactoryBot
       end
     end
 
-    def respond_to?(method, _include_private = false)
+    def respond_to?(method)
       @methods_to_respond_to.include? method.to_s
     end
-
-    def respond_to_missing?(*)
-      false
-    end
   end
 end

data/lib/factory_bot/registry.rb

@@ -7,7 +7,7 @@ module FactoryBot
     attr_reader :name
 
     def initialize(name)
-      @name  = name
+      @name = name
       @items = ActiveSupport::HashWithIndifferentAccess.new
     end
 
@@ -21,11 +21,11 @@ module FactoryBot
 
     def find(name)
       @items.fetch(name)
-    rescue KeyError => key_error
-      raise key_error_with_custom_message(key_error)
+    rescue KeyError => e
+      raise key_error_with_custom_message(e)
     end
 
-    alias :[] :find
+    alias_method :[], :find
 
     def register(name, item)
       @items[name] = item

data/lib/factory_bot/reload.rb

@@ -2,7 +2,6 @@ module FactoryBot
   def self.reload
     Internal.reset_configuration
     Internal.register_default_strategies
-    Internal.register_default_callbacks
     find_definitions
   end
 end

data/lib/factory_bot/sequence.rb

@@ -6,14 +6,14 @@ module FactoryBot
     attr_reader :name
 
     def initialize(name, *args, &proc)
-      @name    = name
-      @proc    = proc
+      @name = name
+      @proc = proc
 
-      options  = args.extract_options!
-      @value   = args.first || 1
+      options = args.extract_options!
+      @value = args.first || 1
       @aliases = options.fetch(:aliases) { [] }
 
-      if !@value.respond_to?(:peek)
+      unless @value.respond_to?(:peek)
         @value = EnumeratorAdapter.new(@value)
       end
     end

data/lib/factory_bot/strategy/null.rb

@@ -1,9 +1,11 @@
 module FactoryBot
   module Strategy
     class Null
-      def association(runner); end
+      def association(runner)
+      end
 
-      def result(evaluation); end
+      def result(evaluation)
+      end
     end
   end
 end

data/lib/factory_bot/strategy/stub.rb

@@ -21,9 +21,13 @@ module FactoryBot
         :update_attributes!,
         :update_attributes,
         :update_column,
-        :update_columns,
+        :update_columns
       ].freeze
 
+      def self.next_id=(id)
+        @@next_id = id
+      end
+
       def association(runner)
         runner.run(:build_stubbed)
       end
@@ -64,7 +68,7 @@ module FactoryBot
           DISABLED_PERSISTENCE_METHODS.each do |write_method|
             define_singleton_method(write_method) do |*args|
               raise "stubbed models are not allowed to access the database - "\
-                    "#{self.class}##{write_method}(#{args.join(',')})"
+                    "#{self.class}##{write_method}(#{args.join(",")})"
             end
           end
         end

data/lib/factory_bot/strategy_syntax_method_registrar.rb

@@ -11,6 +11,14 @@ module FactoryBot
       define_pair_strategy_method
     end
 
+    def self.with_index(block, index)
+      if block&.arity == 2
+        ->(instance) { block.call(instance, index) }
+      else
+        block
+      end
+    end
+
     private
 
     def define_singular_strategy_method
@@ -29,7 +37,10 @@ module FactoryBot
           raise ArgumentError, "count missing for #{strategy_name}_list"
         end
 
-        Array.new(amount) { send(strategy_name, name, *traits_and_overrides, &block) }
+        Array.new(amount) do |i|
+          block_with_index = StrategySyntaxMethodRegistrar.with_index(block, i)
+          send(strategy_name, name, *traits_and_overrides, &block_with_index)
+        end
       end
     end
 

data/lib/factory_bot/syntax/default.rb

@@ -15,7 +15,7 @@ module FactoryBot
         def factory(name, options = {}, &block)
           factory = Factory.new(name, options)
           proxy = FactoryBot::DefinitionProxy.new(factory.definition)
-          proxy.instance_eval(&block) if block_given?
+          proxy.instance_eval(&block) if block
 
           Internal.register_factory(factory)
 
@@ -33,29 +33,17 @@ module FactoryBot
           Internal.register_trait(Trait.new(name, &block))
         end
 
-        def to_create(&block)
-          FactoryBot.to_create(&block)
-        end
-
-        def skip_create
-          FactoryBot.skip_create
-        end
-
-        def initialize_with(&block)
-          FactoryBot.initialize_with(&block)
-        end
-
         def self.run(block)
           new.instance_eval(&block)
         end
 
-        delegate :before, :after, :callback, to: :configuration
-
-        private
-
-        def configuration
-          Internal.configuration
-        end
+        delegate :after,
+          :before,
+          :callback,
+          :initialize_with,
+          :skip_create,
+          :to_create,
+          to: FactoryBot::Internal
       end
 
       class ModifyDSL

data/lib/factory_bot/trait.rb

@@ -9,13 +9,13 @@ module FactoryBot
       @definition = Definition.new(@name)
       proxy = FactoryBot::DefinitionProxy.new(@definition)
 
-      if block_given?
+      if block
         proxy.instance_eval(&@block)
       end
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait, :constructor,
-             :callbacks, :attributes, to: :@definition
+      :callbacks, :attributes, to: :@definition
 
     def names
       [@name]

data/lib/factory_bot/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "5.1.0".freeze
+  VERSION = "6.2.0".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Josh Clayton
 - Joe Ferris
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -124,21 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.54'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.54'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -219,6 +205,7 @@ files:
 - lib/factory_bot/definition.rb
 - lib/factory_bot/definition_hierarchy.rb
 - lib/factory_bot/definition_proxy.rb
+- lib/factory_bot/enum.rb
 - lib/factory_bot/errors.rb
 - lib/factory_bot/evaluation.rb
 - lib/factory_bot/evaluator.rb
@@ -250,7 +237,7 @@ homepage: https://github.com/thoughtbot/factory_bot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,15 +245,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance
   factories.