factory_bot 4.8.2 → 5.2.0

data/lib/factory_bot/trait.rb

@@ -4,12 +4,14 @@ module FactoryBot
     attr_reader :name, :definition
 
     def initialize(name, &block)
-      @name = name
+      @name = name.to_s
       @block = block
       @definition = Definition.new(@name)
-
       proxy = FactoryBot::DefinitionProxy.new(@definition)
-      proxy.instance_eval(&@block) if block_given?
+
+      if block_given?
+        proxy.instance_eval(&@block)
+      end
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait, :constructor,
@@ -25,6 +27,7 @@ module FactoryBot
     end
 
     protected
+
     attr_reader :block
   end
 end

data/lib/factory_bot/version.rb

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

data/lib/factory_bot.rb

@@ -1,59 +1,57 @@
-require 'set'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/deprecation'
-require 'active_support/notifications'
-
-require 'factory_bot/definition_hierarchy'
-require 'factory_bot/configuration'
-require 'factory_bot/errors'
-require 'factory_bot/factory_runner'
-require 'factory_bot/strategy_syntax_method_registrar'
-require 'factory_bot/strategy_calculator'
-require 'factory_bot/strategy/build'
-require 'factory_bot/strategy/create'
-require 'factory_bot/strategy/attributes_for'
-require 'factory_bot/strategy/stub'
-require 'factory_bot/strategy/null'
-require 'factory_bot/registry'
-require 'factory_bot/null_factory'
-require 'factory_bot/null_object'
-require 'factory_bot/evaluation'
-require 'factory_bot/factory'
-require 'factory_bot/attribute_assigner'
-require 'factory_bot/evaluator'
-require 'factory_bot/evaluator_class_definer'
-require 'factory_bot/attribute'
-require 'factory_bot/callback'
-require 'factory_bot/callbacks_observer'
-require 'factory_bot/declaration_list'
-require 'factory_bot/declaration'
-require 'factory_bot/sequence'
-require 'factory_bot/attribute_list'
-require 'factory_bot/trait'
-require 'factory_bot/aliases'
-require 'factory_bot/definition'
-require 'factory_bot/definition_proxy'
-require 'factory_bot/syntax'
-require 'factory_bot/syntax_runner'
-require 'factory_bot/find_definitions'
-require 'factory_bot/reload'
-require 'factory_bot/decorator'
-require 'factory_bot/decorator/attribute_hash'
-require 'factory_bot/decorator/class_key_hash'
-require 'factory_bot/decorator/disallows_duplicates_registry'
-require 'factory_bot/decorator/invocation_tracker'
-require 'factory_bot/decorator/new_constructor'
-require 'factory_bot/linter'
-require 'factory_bot/version'
+require "set"
+require "active_support/core_ext/module/delegation"
+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"
+require "factory_bot/factory_runner"
+require "factory_bot/strategy_syntax_method_registrar"
+require "factory_bot/strategy_calculator"
+require "factory_bot/strategy/build"
+require "factory_bot/strategy/create"
+require "factory_bot/strategy/attributes_for"
+require "factory_bot/strategy/stub"
+require "factory_bot/strategy/null"
+require "factory_bot/registry"
+require "factory_bot/null_factory"
+require "factory_bot/null_object"
+require "factory_bot/evaluation"
+require "factory_bot/factory"
+require "factory_bot/attribute_assigner"
+require "factory_bot/evaluator"
+require "factory_bot/evaluator_class_definer"
+require "factory_bot/attribute"
+require "factory_bot/callback"
+require "factory_bot/callbacks_observer"
+require "factory_bot/declaration_list"
+require "factory_bot/declaration"
+require "factory_bot/sequence"
+require "factory_bot/attribute_list"
+require "factory_bot/trait"
+require "factory_bot/aliases"
+require "factory_bot/definition"
+require "factory_bot/definition_proxy"
+require "factory_bot/syntax"
+require "factory_bot/syntax_runner"
+require "factory_bot/find_definitions"
+require "factory_bot/reload"
+require "factory_bot/decorator"
+require "factory_bot/decorator/attribute_hash"
+require "factory_bot/decorator/disallows_duplicates_registry"
+require "factory_bot/decorator/invocation_tracker"
+require "factory_bot/decorator/new_constructor"
+require "factory_bot/linter"
+require "factory_bot/version"
 
 module FactoryBot
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
+  Deprecation = ActiveSupport::Deprecation.new("6.0", "factory_bot")
 
-  def self.reset_configuration
-    @configuration = nil
-  end
+  mattr_accessor :use_parent_strategy, instance_accessor: false
+  self.use_parent_strategy = true
 
   # Look for errors in factories and (optionally) their traits.
   # Parameters:
@@ -61,96 +59,67 @@ module FactoryBot
   # options:
   #   traits: true - to lint traits as well as factories
   #   strategy: :create - to specify the strategy for linting
+  #   verbose: true - to include full backtraces for each linting error
   def self.lint(*args)
     options = args.extract_options!
     factories_to_lint = args[0] || FactoryBot.factories
-    linting_strategy = options[:traits] ? :factory_and_traits : :factory
-    factory_strategy = options[:strategy] || :create
-    Linter.new(factories_to_lint, linting_strategy, factory_strategy).lint!
+    Linter.new(factories_to_lint, **options).lint!
   end
 
   class << self
-    delegate :factories,
-             :sequences,
-             :traits,
+    delegate :callback_names,
              :callbacks,
+             :configuration,
+             :constructor,
+             :factories,
+             :factory_by_name,
+             :initialize_with,
+             :register_callback,
+             :register_default_callbacks,
+             :register_default_strategies,
+             :register_factory,
+             :register_sequence,
+             :register_strategy,
+             :register_trait,
+             :reset_configuration,
+             :rewind_sequences,
+             :sequence_by_name,
+             :sequences,
+             :skip_create,
              :strategies,
-             :callback_names,
+             :strategy_by_name,
              :to_create,
-             :skip_create,
-             :initialize_with,
-             :constructor,
-             :duplicate_attribute_assignment_from_initialize_with,
-             :duplicate_attribute_assignment_from_initialize_with=,
-             :allow_class_lookup,
-             :allow_class_lookup=,
-             :use_parent_strategy,
-             :use_parent_strategy=,
-             to: :configuration
-  end
-
-  def self.register_factory(factory)
-    factory.names.each do |name|
-      factories.register(name, factory)
-    end
-    factory
-  end
-
-  def self.factory_by_name(name)
-    factories.find(name)
-  end
-
-  def self.register_sequence(sequence)
-    sequence.names.each do |name|
-      sequences.register(name, sequence)
-    end
-    sequence
-  end
-
-  def self.sequence_by_name(name)
-    sequences.find(name)
-  end
-
-  def self.register_trait(trait)
-    trait.names.each do |name|
-      traits.register(name, trait)
-    end
-    trait
-  end
-
-  def self.trait_by_name(name)
-    traits.find(name)
-  end
-
-  def self.register_strategy(strategy_name, strategy_class)
-    strategies.register(strategy_name, strategy_class)
-    StrategySyntaxMethodRegistrar.new(strategy_name).define_strategy_methods
-  end
-
-  def self.strategy_by_name(name)
-    strategies.find(name)
-  end
-
-  def self.register_default_strategies
-    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 self.register_default_callbacks
-    register_callback(:after_build)
-    register_callback(:after_create)
-    register_callback(:after_stub)
-    register_callback(:before_create)
-  end
-
-  def self.register_callback(name)
-    name = name.to_sym
-    callback_names << name
+             :trait_by_name,
+             :traits,
+             to: Internal
+
+    attr_accessor :allow_class_lookup
+
+    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
   end
 end
 
-FactoryBot.register_default_strategies
-FactoryBot.register_default_callbacks
+FactoryBot::Internal.register_default_strategies
+FactoryBot::Internal.register_default_callbacks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 5.2.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,58 +17,72 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  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: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.15
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.15
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,33 +124,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,10 +193,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  factory_bot provides a framework and DSL for defining and
-                        using factories - less error-prone, more explicit, and
-                        all-around easier to work with than fixtures.
+description: factory_bot provides a framework and DSL for defining and using factories
+  - less error-prone, more explicit, and all-around easier to work with than fixtures.
 email:
 - jclayton@thoughtbot.com
 - jferris@thoughtbot.com
@@ -162,42 +202,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
 - ".yardopts"
-- Appraisals
 - CONTRIBUTING.md
 - GETTING_STARTED.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - NAME.md
-- NEWS
+- NEWS.md
 - README.md
-- Rakefile
-- cucumber.yml
-- factory_bot.gemspec
-- factory_girl.gemspec
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
-- gemfiles/4.0.gemfile
-- gemfiles/4.0.gemfile.lock
-- gemfiles/4.1.gemfile
-- gemfiles/4.1.gemfile.lock
-- gemfiles/4.2.gemfile
-- gemfiles/4.2.gemfile.lock
-- gemfiles/5.0.gemfile
-- gemfiles/5.0.gemfile.lock
 - lib/factory_bot.rb
 - lib/factory_bot/aliases.rb
 - lib/factory_bot/attribute.rb
 - lib/factory_bot/attribute/association.rb
 - lib/factory_bot/attribute/dynamic.rb
 - lib/factory_bot/attribute/sequence.rb
-- lib/factory_bot/attribute/static.rb
 - lib/factory_bot/attribute_assigner.rb
 - lib/factory_bot/attribute_list.rb
 - lib/factory_bot/callback.rb
@@ -207,11 +224,9 @@ files:
 - lib/factory_bot/declaration/association.rb
 - lib/factory_bot/declaration/dynamic.rb
 - lib/factory_bot/declaration/implicit.rb
-- lib/factory_bot/declaration/static.rb
 - lib/factory_bot/declaration_list.rb
 - lib/factory_bot/decorator.rb
 - lib/factory_bot/decorator/attribute_hash.rb
-- lib/factory_bot/decorator/class_key_hash.rb
 - lib/factory_bot/decorator/disallows_duplicates_registry.rb
 - lib/factory_bot/decorator/invocation_tracker.rb
 - lib/factory_bot/decorator/new_constructor.rb
@@ -225,6 +240,7 @@ files:
 - lib/factory_bot/factory.rb
 - lib/factory_bot/factory_runner.rb
 - lib/factory_bot/find_definitions.rb
+- lib/factory_bot/internal.rb
 - lib/factory_bot/linter.rb
 - lib/factory_bot/null_factory.rb
 - lib/factory_bot/null_object.rb
@@ -244,11 +260,11 @@ files:
 - lib/factory_bot/syntax_runner.rb
 - lib/factory_bot/trait.rb
 - lib/factory_bot/version.rb
-- lib/factory_girl.rb
 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:
@@ -257,15 +273,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance

data/.autotest

@@ -1,9 +0,0 @@
-Autotest.add_hook :initialize do |at|
-  at.clear_mappings
-
-  at.add_mapping(%r{^test/.*_test\.rb$})              {|f, _| [f] }
-  at.add_mapping(%r{^lib/factory_girl/(.*)\.rb$})     {|_, m| ["test/#{m[1]}_test.rb",
-                                                               "test/integration_test.rb"] }
-  at.add_mapping(%r{^test/(test_helper|models)\.rb$}) { at.files_matching %r{^test/.*_test\.rb$} }
-  at.add_mapping(%r{^lib/.*\.rb$})                    { at.files_matching %r{^test/.*_test\.rb$} }
-end

data/.gitignore

@@ -1,10 +0,0 @@
-*.swp
-test.db
-factory_girl-*.gem
-factory_bot-*.gem
-doc
-.yardoc
-coverage
-.bundle
-tmp
-bin

data/.rspec

@@ -1,2 +0,0 @@
---format progress
---color

data/.simplecov

@@ -1,4 +0,0 @@
-SimpleCov.start do
-  add_filter "/spec/"
-  add_filter "/tmp/"
-end

data/.travis.yml

@@ -1,38 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - ruby-head
-  - rbx-2
-before_install:
-  - gem update --system
-  - gem update bundler
-  - gem cleanup bundler
-install: "bundle install --jobs 8"
-script: "bundle exec rake"
-gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/5.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/5.0.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/5.0.gemfile
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-2
-branches:
-  only:
-    - master
-
-sudo: false
-cache: bundler