factory_bot 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d19c695ef0088d163b82c6b32066d4385d4be7fb8c0dc0b29c350d2e2187f2d
-  data.tar.gz: 55270eb96b553aa9b0c186bc7eeaf9d084fc79252b7fb8443d6276b1865168cc
+  metadata.gz: 802da48aa95dce3321f20d0173c5dcf041c5393fb0c270fb8ae2029ce12b6ed9
+  data.tar.gz: 0aa227896ef66ccf100f88b1aa4e9aa26c5bc657fee76739a73e15072bc80572
 SHA512:
-  metadata.gz: d61c40f944ae69e27a32e0992d8c289e9d0d9d5a48efe2998b8c53eca17be8a3591f886762866155032662e0eb32a4d52f342cfc1c88b22e637cab3d6e999f81
-  data.tar.gz: 2aa21a35633016a9e9871c9e56782af137a209ad1c155d51d768ba129d5dea016c54f9d1186191d2ed24e616f5d6516b78698488b8ee536fd929e28c7055ff1f
+  metadata.gz: 63554d6765398f0c524cb8cd45b1a0da83da1d8aba9f359d0e4c44e42cdbd0d93edb8e38c668e0310ad709905c5cd6a3c35e640ad8c45a06a8b7d4090b4e6161
+  data.tar.gz: fe3be69bdd601384da0a7f2ec7e1fcf00ae7d4984c65423e31e94c1b7f3d7bb04345371daaea19d794365972b59f69f9f3403b0ef8b8ef7d7349d89404284ac2

data/GETTING_STARTED.md

@@ -1018,6 +1018,14 @@ To set the attributes for each of the factories, you can pass in a hash as you n
 twenty_year_olds = build_list(:user, 25, date_of_birth: 20.years.ago)
 ```
 
+In order to set different attributes for each factory, these methods may be passed a block, with the factory and the index as parameters:
+
+```ruby
+twenty_somethings = build_list(:user, 10) do |user, i|
+  user.date_of_birth = (20 + i).years.ago
+end
+```
+
 `build_stubbed_list` will give you fully stubbed out instances:
 
 ```ruby
@@ -1066,7 +1074,7 @@ Example Rake task:
 namespace :factory_bot do
   desc "Verify that all FactoryBot factories are valid"
   task lint: :environment do
-    if Rails.env.test?    
+    if Rails.env.test?
       conn = ActiveRecord::Base.connection
       conn.transaction do
         FactoryBot.lint
@@ -1413,12 +1421,12 @@ with associations, as below:
 
 ```ruby
 FactoryBot.define do
-  factory :united_states, class: Location do
+  factory :united_states, class: "Location" do
     name { 'United States' }
     association :location_group, factory: :north_america
   end
 
-  factory :north_america, class: LocationGroup do
+  factory :north_america, class: "LocationGroup" do
     name { 'North America' }
   end
 end

data/NEWS.md

@@ -1,5 +1,12 @@
 # News
 
+## 5.2.0 (April 24, 2020)
+  * Added: Pass index to block for `*_list` methods
+  * Deprecated: top-level methods meant only for internal use: `callbacks`, `configuration`, `constructor`, `initialize_with`, `register_sequence`, `resent_configuration`, `skip_create`, `to_create`
+
+## 5.1.2 (March 25, 2020)
+  * Fixed: Ruby 2.7 keyword deprecation warning in FactoryBot.lint
+
 ## 5.1.1 (October 2, 2019)
   * Improved: performance of traits
   * Fixed: registering strategies on JRuby

data/README.md

@@ -72,14 +72,14 @@ Contributing
 
 Please see [CONTRIBUTING.md](https://github.com/thoughtbot/factory_bot/blob/master/CONTRIBUTING.md).
 
-factory_bot was originally written by Joe Ferris and is now maintained by Josh
-Clayton. Many improvements and bugfixes were contributed by the [open source
+factory_bot was originally written by Joe Ferris and is maintained by thoughtbot.
+Many improvements and bugfixes were contributed by the [open source
 community](https://github.com/thoughtbot/factory_bot/graphs/contributors).
 
 License
 -------
 
-factory_bot is Copyright © 2008-2019 Joe Ferris and thoughtbot. It is free
+factory_bot is Copyright © 2008-2020 Joe Ferris and thoughtbot. It is free
 software, and may be redistributed under the terms specified in the
 [LICENSE] file.
 
@@ -89,7 +89,7 @@ software, and may be redistributed under the terms specified in the
 About thoughtbot
 ----------------
 
-![thoughtbot](https://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
+![thoughtbot](https://thoughtbot.com/brand_assets/93:44.svg)
 
 factory_bot is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/lib/factory_bot.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext/module/attribute_accessors"
 require "active_support/deprecation"
 require "active_support/notifications"
 
+require "factory_bot/internal"
 require "factory_bot/definition_hierarchy"
 require "factory_bot/configuration"
 require "factory_bot/errors"
@@ -45,19 +46,10 @@ require "factory_bot/decorator/invocation_tracker"
 require "factory_bot/decorator/new_constructor"
 require "factory_bot/linter"
 require "factory_bot/version"
-require "factory_bot/internal"
 
 module FactoryBot
   Deprecation = ActiveSupport::Deprecation.new("6.0", "factory_bot")
 
-  def self.configuration
-    Internal.configuration
-  end
-
-  def self.reset_configuration
-    Internal.reset_configuration
-  end
-
   mattr_accessor :use_parent_strategy, instance_accessor: false
   self.use_parent_strategy = true
 
@@ -71,23 +63,17 @@ module FactoryBot
   def self.lint(*args)
     options = args.extract_options!
     factories_to_lint = args[0] || FactoryBot.factories
-    Linter.new(factories_to_lint, options).lint!
+    Linter.new(factories_to_lint, **options).lint!
   end
 
   class << self
-    delegate :callbacks,
-             :callback_names,
+    delegate :callback_names,
+             :callbacks,
+             :configuration,
              :constructor,
              :factories,
+             :factory_by_name,
              :initialize_with,
-             :sequences,
-             :skip_create,
-             :strategies,
-             :to_create,
-             :traits,
-             to: :configuration
-
-    delegate :factory_by_name,
              :register_callback,
              :register_default_callbacks,
              :register_default_strategies,
@@ -95,10 +81,16 @@ module FactoryBot
              :register_sequence,
              :register_strategy,
              :register_trait,
+             :reset_configuration,
              :rewind_sequences,
              :sequence_by_name,
+             :sequences,
+             :skip_create,
+             :strategies,
              :strategy_by_name,
+             :to_create,
              :trait_by_name,
+             :traits,
              to: Internal
 
     attr_accessor :allow_class_lookup
@@ -106,15 +98,23 @@ module FactoryBot
     deprecate :allow_class_lookup,
               :allow_class_lookup=,
               :callback_names,
+              :callbacks,
+              :configuration,
+              :constructor,
               :factory_by_name,
+              :initialize_with,
               :register_callback,
               :register_default_callbacks,
               :register_default_strategies,
               :register_factory,
+              :register_sequence,
               :register_trait,
+              :reset_configuration,
               :sequence_by_name,
               :sequences,
+              :skip_create,
               :strategies,
+              :to_create,
               :trait_by_name,
               :traits,
               deprecator: Deprecation

data/lib/factory_bot/attribute/dynamic.rb

@@ -16,6 +16,7 @@ module FactoryBot
                   else instance_exec(&block)
                   end
           raise SequenceAbuseError if FactoryBot::Sequence === value
+
           value
         }
       end

data/lib/factory_bot/configuration.rb

@@ -24,7 +24,7 @@ module FactoryBot
     end
 
     delegate :to_create, :skip_create, :constructor, :before, :after,
-      :callback, :callbacks, to: :@definition
+             :callback, :callbacks, to: :@definition
 
     def initialize_with(&block)
       @definition.define_constructor(&block)

data/lib/factory_bot/decorator.rb

@@ -6,7 +6,7 @@ module FactoryBot
       @component = component
     end
 
-    def method_missing(name, *args, &block) # rubocop:disable Style/MethodMissing
+    def method_missing(name, *args, &block) # rubocop:disable Style/MethodMissingSuper
       @component.send(name, *args, &block)
     end
 

data/lib/factory_bot/decorator/invocation_tracker.rb

@@ -6,7 +6,7 @@ module FactoryBot
         @invoked_methods = []
       end
 
-      def method_missing(name, *args, &block) # rubocop:disable Style/MethodMissing
+      def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing
         @invoked_methods << name
         super
       end

data/lib/factory_bot/definition.rb

@@ -49,7 +49,7 @@ module FactoryBot
 
         defined_traits.each do |defined_trait|
           base_traits.each       { |bt| bt.define_trait defined_trait }
-          additional_traits.each { |bt| bt.define_trait defined_trait }
+          additional_traits.each { |at| at.define_trait defined_trait }
         end
 
         @compiled = true

data/lib/factory_bot/definition_hierarchy.rb

@@ -1,16 +1,6 @@
 module FactoryBot
   class DefinitionHierarchy
-    def callbacks
-      FactoryBot.callbacks
-    end
-
-    def constructor
-      FactoryBot.constructor
-    end
-
-    def to_create
-      FactoryBot.to_create
-    end
+    delegate :callbacks, :constructor, :to_create, to: Internal
 
     def self.build_from_definition(definition)
       build_to_create(&definition.to_create)

data/lib/factory_bot/definition_proxy.rb

@@ -88,7 +88,7 @@ module FactoryBot
     #   end
     #
     # are equivalent.
-    def method_missing(name, *args, &block) # rubocop:disable Style/MethodMissing
+    def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing, Style/MethodMissingSuper
       association_options = args.first
 
       if association_options.nil?

data/lib/factory_bot/evaluator.rb

@@ -37,7 +37,7 @@ module FactoryBot
       @instance = object_instance
     end
 
-    def method_missing(method_name, *args, &block) # rubocop:disable Style/MethodMissing
+    def method_missing(method_name, *args, &block) # rubocop:disable Style/MethodMissingSuper
       if @instance.respond_to?(method_name)
         @instance.send(method_name, *args, &block)
       else

data/lib/factory_bot/internal.rb

@@ -1,24 +1,19 @@
 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,
+      delegate :after,
+               :before,
+               :callback_names,
+               :callbacks,
+               :constructor,
                :factories,
+               :initialize_with,
                :inline_sequences,
                :sequences,
+               :skip_create,
                :strategies,
+               :to_create,
                :traits,
                to: :configuration
 
@@ -86,11 +81,18 @@ module FactoryBot
       end
 
       def register_default_strategies
-        DEFAULT_STRATEGIES.each { |name, klass| register_strategy(name, klass) }
+        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
 
       def register_default_callbacks
-        DEFAULT_CALLBACKS.each(&method(:register_callback))
+        register_callback(:after_create)
+        register_callback(:after_build)
+        register_callback(:after_stub)
+        register_callback(:before_create)
       end
 
       def register_callback(name)

data/lib/factory_bot/linter.rb

@@ -72,8 +72,8 @@ module FactoryBot
       result = []
       begin
         FactoryBot.public_send(factory_strategy, factory.name)
-      rescue StandardError => error
-        result |= [FactoryError.new(error, factory)]
+      rescue StandardError => e
+        result |= [FactoryError.new(e, factory)]
       end
       result
     end
@@ -83,9 +83,9 @@ module FactoryBot
       factory.definition.defined_traits.map(&:name).each do |trait_name|
         begin
           FactoryBot.public_send(factory_strategy, factory.name, trait_name)
-        rescue StandardError => error
+        rescue StandardError => e
           result |=
-            [FactoryTraitError.new(error, factory, trait_name)]
+            [FactoryTraitError.new(e, factory, trait_name)]
         end
       end
       result

data/lib/factory_bot/null_factory.rb

@@ -8,7 +8,7 @@ module FactoryBot
     end
 
     delegate :defined_traits, :callbacks, :attributes, :constructor,
-      :to_create, to: :definition
+             :to_create, to: :definition
 
     def compile; end
 

data/lib/factory_bot/registry.rb

@@ -21,8 +21,8 @@ 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

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

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "5.1.1".freeze
+  VERSION = "5.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,16 +127,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +263,8 @@ files:
 homepage: https://github.com/thoughtbot/factory_bot
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/thoughtbot/factory_bot/blob/master/NEWS.md
 post_install_message: 
 rdoc_options: []
 require_paths: