factory_bot 6.2.1 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bcbbd8bee01abdb25a5cfdbbbbca29396f587236f0c20f8300adbf6e32f783c
-  data.tar.gz: 94d8e73507ae61edba7fb3129ee74c4fe9998a8fb78614ecba9966199561c8e4
+  metadata.gz: 44611a193b219b270cd43b7a8587718ff190b3c63162c17f02288afc362a37e9
+  data.tar.gz: a1a3d3ce45776e1d8d228f113af1c101a64090fde8f19a46321d40bec3df0e48
 SHA512:
-  metadata.gz: e97d9530810f0de00f6e0129df37db52722ee8d430f7b118ffdcebdc0eecc1e1532356b7c8e01cc85265c04f18eb174d3d5ff09fe235c5f30ceb7b5e16432508
-  data.tar.gz: 71b77c30b16c89588d6946505be547374321597e8e16f89673766cda94b22188dc28070a34144ae126dad93042de0173e1d92173237ae1e929a3131e85569a51
+  metadata.gz: 2e65a906e197e8e9f268440ba3ffbc0a717b211420419f0ce0f9ff0a5b5e90413d4a76b829f45fe4746541aae91869afdee8975b3171841c4655d6627979aa2b
+  data.tar.gz: 400e0cb1dab0994f26a46674a5d7f0cb6dc89a95815faab5da8838f732c9e6ac92fac6af17270ce4aaba3f84cdcbfcf96361021a7671a37e33a9d27e77cb652b

data/CONTRIBUTING.md

@@ -94,12 +94,12 @@ Use [standard] to automatically format your code:
 bundle exec rake standard:fix
 ```
 
-[repo]: https://github.com/thoughtbot/factory_bot/tree/master
+[repo]: https://github.com/thoughtbot/factory_bot/tree/main
 [fork]: https://help.github.com/articles/fork-a-repo/
 [branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
 [pr]: https://help.github.com/articles/using-pull-requests/
 [standard]: https://github.com/testdouble/standard
 [appraisal]: https://github.com/thoughtbot/appraisal
-[reproduction script]: https://github.com/thoughtbot/factory_bot/blob/master/.github/REPRODUCTION_SCRIPT.rb
+[reproduction script]: https://github.com/thoughtbot/factory_bot/blob/main/.github/REPRODUCTION_SCRIPT.rb
 
 Inspired by https://github.com/middleman/middleman-heroku/blob/master/CONTRIBUTING.md

data/GETTING_STARTED.md

@@ -1,3 +1,19 @@
+**Deprecated**
+
+See our extensive reference, guides, and cookbook in [the factory_bot book][].
+
+For information on integrations with third party libraries, such as RSpec or
+Rails, see [the factory_bot wiki][].
+
+ We also have [a detailed introductory video][], available for free on Upcase.
+
+[a detailed introductory video]: https://upcase.com/videos/factory-bot?utm_source=github&utm_medium=open-source&utm_campaign=factory-girl
+[the factory_bot book]: https://thoughtbot.github.io/factory_bot
+[the factory_bot wiki]: https://github.com/thoughtbot/factory_bot/wiki
+
+This document is deprecated and preserved for historical use. It may disappear
+at any time.
+
 Getting Started
 ===============
 
@@ -269,6 +285,9 @@ user = create(:user)
 # Returns a hash of attributes that can be used to build a User instance
 attrs = attributes_for(:user)
 
+# Integrates with Ruby 3.0's support for pattern matching assignment
+attributes_for(:user) => {email:, name:, **attrs}
+
 # Returns an object with all defined attributes stubbed out
 stub = build_stubbed(:user)
 
@@ -281,7 +300,7 @@ end
 ### Attribute overrides
 
 No matter which strategy is used, it's possible to override the defined
-attributes by passing a hash:
+attributes by passing a Hash:
 
 ```ruby
 # Build a User instance and override the first_name property
@@ -290,6 +309,29 @@ user.first_name
 # => "Joe"
 ```
 
+Overriding associations is also supported:
+
+```ruby
+account = build(:account, :deluxe)
+friends = build_list(:user, 2)
+
+user = build(:user, account: account, friends: friends)
+```
+
+Ruby 3.1's support for [omitting values][] from `Hash` literals dovetails with
+attribute overrides and provides an opportunity to limit the repetition of
+variable names:
+
+```ruby
+account = build(:account, :deluxe)
+friends = build_list(:user, 2)
+
+# The keyword arguments correspond to local variable names, so omit their values
+user = build(:user, account:, friends:)
+```
+
+[omitting values]: https://docs.ruby-lang.org/en/3.1/syntax/literals_rdoc.html#label-Hash+Literals
+
 ### `build_stubbed` and `Marshal.dump`
 
 Note that objects created with `build_stubbed` cannot be serialized with
@@ -424,7 +466,7 @@ end
 Method Name / Reserved Word Attributes
 -------------------------------
 
-If your attributes conflict with existing methods or reserved words (all methods in the [DefinitionProxy](https://github.com/thoughtbot/factory_bot/blob/master/lib/factory_bot/definition_proxy.rb) class) you can define them with `add_attribute`.
+If your attributes conflict with existing methods or reserved words (all methods in the [DefinitionProxy](https://github.com/thoughtbot/factory_bot/blob/main/lib/factory_bot/definition_proxy.rb) class) you can define them with `add_attribute`.
 
 ```ruby
 factory :dna do
@@ -929,7 +971,7 @@ end
 Note that this approach works with `build`, `build_stubbed`, and `create`, but
 the associations will return `nil` when using `attributes_for`.
 
-Also, note that if you assign any attributes inside a custom `initialize_with` 
+Also, note that if you assign any attributes inside a custom `initialize_with`
 (e.g. `initialize_with { new(**attributes) }`), those attributes should not refer to `instance`,
 since it will be `nil`.
 
@@ -992,6 +1034,17 @@ factory :user do
 end
 ```
 
+With Ruby 2.7's support for [numbered parameters][], inline definitions can be
+even more abbreviated:
+
+```ruby
+factory :user do
+  sequence(:email) { "person#{_1}@example.com" }
+end
+```
+
+[numbered parameters]: https://ruby-doc.org/core-2.7.1/Proc.html#class-Proc-label-Numbered+parameters
+
 ### Initial value
 
 You can override the initial value. Any value that responds to the `#next`
@@ -1206,11 +1259,11 @@ FactoryBot.define do
     created_at { 8.days.ago }
     updated_at { 4.days.ago }
   end
-  
+
   factory :user, traits: [:timestamps] do
     username { "john_doe" }
   end
-  
+
   factory :post do
     timestamps
     title { "Traits rock" }
@@ -1872,6 +1925,10 @@ class JsonStrategy
   def result(evaluation)
     @strategy.result(evaluation).to_json
   end
+
+  def to_sym
+    :json
+  end
 end
 ```
 
@@ -1912,6 +1969,10 @@ class JsonStrategy
       evaluation.notify(:make_json_awesome, json)
     end
   end
+
+  def to_sym
+    :json
+  end
 end
 
 FactoryBot.register_strategy(:json, JsonStrategy)
@@ -1966,7 +2027,7 @@ ActiveSupport Instrumentation
 
 In order to track what factories are created (and with what build strategy),
 `ActiveSupport::Notifications` are included to provide a way to subscribe to
-factories being run. One example would be to track factories based on a
+factories being compiled and run. One example would be to track factories based on a
 threshold of execution time.
 
 ```ruby
@@ -2000,6 +2061,29 @@ config.after(:suite) do
 end
 ```
 
+Another example could involve tracking the attributes and traits that factories are compiled with. If you're using RSpec, you could add `before(:suite)` and `after(:suite)` blocks that subscribe to `factory_bot.compile_factory` notifications:
+
+```ruby
+factory_bot_results = {}
+config.before(:suite) do
+  ActiveSupport::Notifications.subscribe("factory_bot.compile_factory") do |name, start, finish, id, payload|
+    factory_name = payload[:name]
+    factory_class = payload[:class]
+    attributes = payload[:attributes]
+    traits = payload[:traits]
+    factory_bot_results[factory_class] ||= {}
+    factory_bot_results[factory_class][factory_name] = {
+      attributes: attributes.map(&:name)
+      traits: traits.map(&:name)
+    }
+  end
+end
+
+config.after(:suite) do
+  puts factory_bot_results
+end
+```
+
 Rails Preloaders and RSpec
 --------------------------
 

data/NEWS.md

@@ -1,9 +1,92 @@
 # News
 
+## 6.5.0 (September 6, 2024)
+
+  * fix: issue 1621 broken links in ref/factory.md by @elasticspoon in https://github.com/thoughtbot/factory_bot/pull/1623
+  * Add standard settings by @ydah in https://github.com/thoughtbot/factory_bot/pull/1625
+  * Call dynamic-readme reusable workflow by @stefannibrasil in https://github.com/thoughtbot/factory_bot/pull/1628
+  * Update README again by @stefannibrasil in https://github.com/thoughtbot/factory_bot/pull/1630
+  * Only run this workflow if the README has been updated by @stefannibrasil in https://github.com/thoughtbot/factory_bot/pull/1635
+  * Automatically Generated: Update Dynamic Section in README by @github-actions in https://github.com/thoughtbot/factory_bot/pull/1637
+  * Added a case for build_class to handle class names with underscores passed as a string by @m-gizzi in https://github.com/thoughtbot/factory_bot/pull/1642
+  * Add Ruby 3.3 to CI by @berkos in https://github.com/thoughtbot/factory_bot/pull/1615
+  * Update Dependabot configuration by @smaboshe in https://github.com/thoughtbot/factory_bot/pull/1655
+  * Add new maintainers to CODEOWNERS by @sarahraqueld in https://github.com/thoughtbot/factory_bot/pull/1651
+  * Improve docs formatting and fix filename conflicts by @sarahraqueld in https://github.com/thoughtbot/factory_bot/pull/1666
+  * Add a dynamic security workflow and a SECURITY.md file by @sarahraqueld in https://github.com/thoughtbot/factory_bot/pull/1677
+  * Automatically Generated: Update Dynamic Section in SECURITY by @github-actions in https://github.com/thoughtbot/factory_bot/pull/1678
+  * Ensure rails 7.2 compatibility by @Earlopain in https://github.com/thoughtbot/factory_bot/pull/1686
+  * Fix the factory definition in traits documentation by @ddieulivol in https://github.com/thoughtbot/factory_bot/pull/1688
+
+## 6.4.6 (January 30, 2023)
+
+ * Fix: Bump minimum required Ruby in gemspec (Earlopain).
+ * Fix: Broken link in `FactoryBot.modify` docs (Matt Brictson).
+ * Fix: Broken link in `FactoryBot.lint` docs (Anton Dieterle).
+
+## 6.4.5 (December 29, 2023)
+
+  * Changed: Support Ruby 3.0+, Rails 6.1+ (Mike Burns).
+
+## 6.4.4 (December 27, 2023)
+
+  * Internal: Remove observer dependency (Earlopain).
+
+## 6.4.3 (December 26, 2023)
+
+  * Fix: Support models without ID setters in build_stubbed (Olivier Bellone).
+  * Fix: Explicit observer dependency (Oleg Antonyan).
+  * Internal: Add Rails 7.1 to CI (Olivier Bellone).
+  * Internal: Bump github actions/checkout to v4 (Lorenzo Zabot)
+  * Internal: Stop passing disable-error_highlight in CI (Mike Burns).
+  * Internal: Relax the exception message check (Mike Burns).
+
+## 6.4.2 (November 22, 2023)
+
+  * Fix: top-level traits pass their class to ActiveSupport::Notifications
+    (makicamel).
+
+## 6.4.1 (November 20, 2023)
+
+  * Fix: factories with traits pass their class to ActiveSupport::Notifications
+    (makicamel).
+
+## 6.4.0 (November 17, 2023)
+
+  * Added: if `build_stubbed` detects a UUID primary key, generate the correct
+    type (Peter Boling, Alexandre Ruban).
+  * Docs: show examples of Ruby 3 syntactic sugars (Sean Doyle).
+  * Internal: resolve test warning messages (Mike Burns).
+
+
+## 6.3.0 (September 1, 2023)
+
+  * Fix: link to changelog for RubyGems (Berkan Ünal).
+  * Fix: integrate with Ruby 3.2's `did_you_mean` library (Daniel Colson).
+  * Changed: explicitly define `#destroyed?` within the `Stub` strategy to return `false` to be consistent
+    with ActiveRecord (Benjamin Fleischer).
+  * Added: announce `factory_bot.compile_factory` notification (Sean Doyle).
+  * Docs: clarify that custom strategies need to define `#to_sym` (Edmund Korley, Jonas S).
+  * Docs: fix CI link in README (Mark Huk).
+  * Docs: fix GitHub links (Robert Fletcher).
+  * Docs: install this library with `bundle add` (Glauco Custódio).
+  * Docs: re-write into mdBook (Mike Burns, Sara Jackson, Stefanni Brasil)
+  * Docs: clarify that automatic trait definitions could introduce new linting errors (Lawrence Chou).
+  * Internal: skip TruffleRuby on Rails 5.0, 5.1, 5.2 (Andrii Konchyn).
+  * Internal: fix typoes throughout codebase (Yudai Takada).
+  * Internal: run CI on `actions/checkout` v3 (Yudai Takada).
+  * Internal: follow standardrb code style (Yudai Takada).
+  * Internal: stop using Hound (Daniel Nolan).
+  * Internal: only run simplecov on C Ruby (Daniel Colson).
+  * Internal: quieter Cucumber (Daniel Colson).
+  * Internal: Ruby 3.2 support (Daniel Colson).
+  * Internal: Mike Burns is the CODEOWNER (Stefanni Brasil).
+
 ## 6.2.1 (March 8, 2022)
   * Added: CI testing against truffleruby
   * Changed: Documentation improvements for sequences and traits
   * Fixed: ActiveSupport::Notifications reporting strategy through associations now report as symbols
+    * BREAKING CHANGE: Custom strategies now need to define a `to_sym` method to specify the strategy identifier
   * Fixed: `add_attribute` with reserved keywords assigns values correctly
 
 ## 6.2.0 (May 7, 2021)
@@ -27,7 +110,9 @@
   * Added: automatic definition of traits for Active Record enum attributes, enabled by default
     (Note that this required changing where factory_bot constantizes the build
      class, which may affect applications that were using abstract factories for
-     inheritance. See issue #1409.)
+     inheritance. See issue #1409.) (This may break `FactoryBot.lint` because
+     there may be previously non-existing factory+trait combinations being
+     defined and checked)
   * Added: `traits_for_enum` method to define traits for non-Active Record enums
   * Added: `build_stubbed_starting_id=` option to define the starting id for `build_stubbed`
   * Removed: deprecated methods on the top-level `FactoryBot` module meant only for internal use

data/README.md

@@ -16,24 +16,26 @@ Check out the [guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stabl
 Documentation
 -------------
 
-You should find the documentation for your version of factory_bot on [Rubygems](https://rubygems.org/gems/factory_bot).
+See our extensive reference, guides, and cookbook in [the factory_bot book][].
 
-See [GETTING_STARTED] for information on defining and using factories. We also
-have [a detailed introductory video][], available for free on Upcase.
+For information on integrations with third party libraries, such as RSpec or
+Rails, see [the factory_bot wiki][].
+
+ We also have [a detailed introductory video][], available for free on Upcase.
 
 [a detailed introductory video]: https://upcase.com/videos/factory-bot?utm_source=github&utm_medium=open-source&utm_campaign=factory-girl
+[the factory_bot book]: https://thoughtbot.github.io/factory_bot
+[the factory_bot wiki]: https://github.com/thoughtbot/factory_bot/wiki
 
 Install
 --------
 
-Add the following line to Gemfile:
+Run:
 
 ```ruby
-gem 'factory_bot'
+bundle add factory_bot
 ```
 
-and run `bundle install` from your shell.
-
 To install the gem manually from your shell, run:
 
 ```shell
@@ -43,7 +45,7 @@ gem install factory_bot
 Supported Ruby versions
 -----------------------
 
-Supported Ruby versions are listed in [`.github/workflows/build.yml`](https://github.com/thoughtbot/factory_bot/blob/master/.github/workflows/build.yml)
+Supported Ruby versions are listed in [`.github/workflows/build.yml`](https://github.com/thoughtbot/factory_bot/blob/main/.github/workflows/build.yml)
 
 More Information
 ----------------
@@ -53,8 +55,8 @@ More Information
 * [Issues](https://github.com/thoughtbot/factory_bot/issues)
 * [GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS](https://robots.thoughtbot.com/)
 
-[GETTING_STARTED]: https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md
-[NAME]: https://github.com/thoughtbot/factory_bot/blob/master/NAME.md
+[GETTING_STARTED]: https://github.com/thoughtbot/factory_bot/blob/main/GETTING_STARTED.md
+[NAME]: https://github.com/thoughtbot/factory_bot/blob/main/NAME.md
 
 Useful Tools
 ------------
@@ -64,7 +66,7 @@ Useful Tools
 Contributing
 ------------
 
-Please see [CONTRIBUTING.md](https://github.com/thoughtbot/factory_bot/blob/master/CONTRIBUTING.md).
+Please see [CONTRIBUTING.md](https://github.com/thoughtbot/factory_bot/blob/main/CONTRIBUTING.md).
 
 factory_bot was originally written by Joe Ferris and is maintained by thoughtbot.
 Many improvements and bugfixes were contributed by the [open source
@@ -73,29 +75,32 @@ community](https://github.com/thoughtbot/factory_bot/graphs/contributors).
 License
 -------
 
-factory_bot is Copyright © 2008-2020 Joe Ferris and thoughtbot. It is free
+factory_bot is Copyright © 2008 Joe Ferris and thoughtbot. It is free
 software, and may be redistributed under the terms specified in the
 [LICENSE] file.
 
-[LICENSE]: https://github.com/thoughtbot/factory_bot/blob/master/LICENSE
+[LICENSE]: https://github.com/thoughtbot/factory_bot/blob/main/LICENSE
 
+<!-- START /templates/footer.md -->
+## About thoughtbot
 
-About thoughtbot
-----------------
-
-![thoughtbot](https://thoughtbot.com/brand_assets/93:44.svg)
+![thoughtbot](https://thoughtbot.com/thoughtbot-logo-for-readmes.svg)
 
-factory_bot is maintained and funded by thoughtbot, inc.
+This repo is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 We love open source software!
-See [our other projects][community] or
-[hire us][hire] to design, develop, and grow your product.
+See [our other projects][community].
+We are [available for hire][hire].
 
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
-[ci-image]: https://github.com/thoughtbot/factory_bot/actions/workflows/build.yml/badge.svg
-[ci]: https://github.com/thoughtbot/factory_bot/actions?query=workflow%3A.github%2Fworkflows%2Fbuild.yml+branch%3Amaster++
+
+
+<!-- END /templates/footer.md -->
+
+[ci-image]: https://github.com/thoughtbot/factory_bot/actions/workflows/build.yml/badge.svg?branch=main
+[ci]: https://github.com/thoughtbot/factory_bot/actions?query=workflow%3ABuild+branch%3Amain
 [grade-image]: https://codeclimate.com/github/thoughtbot/factory_bot/badges/gpa.svg
 [grade]: https://codeclimate.com/github/thoughtbot/factory_bot
 [version-image]: https://badge.fury.io/rb/factory_bot.svg

data/lib/factory_bot/attribute/dynamic.rb

@@ -12,8 +12,8 @@ module FactoryBot
 
         -> {
           value = case block.arity
-                  when 1, -1, -2 then instance_exec(self, &block)
-                  else instance_exec(&block)
+          when 1, -1, -2 then instance_exec(self, &block)
+          else instance_exec(&block)
           end
           raise SequenceAbuseError if FactoryBot::Sequence === value
 

data/lib/factory_bot/attribute_assigner.rb

@@ -13,7 +13,7 @@ module FactoryBot
       @evaluator.instance = build_class_instance
       build_class_instance.tap do |instance|
         attributes_to_set_on_instance.each do |attribute|
-          instance.public_send("#{attribute}=", get(attribute))
+          instance.public_send(:"#{attribute}=", get(attribute))
           @attribute_names_assigned << attribute
         end
       end

data/lib/factory_bot/decorator.rb

@@ -6,24 +6,12 @@ module FactoryBot
       @component = component
     end
 
-    if ::Gem::Version.new(::RUBY_VERSION) >= ::Gem::Version.new("2.7")
-      class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-          def method_missing(...) # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
-          @component.send(...)
-        end
-
-        def send(...)
-          __send__(...)
-        end
-      RUBY
-    else
-      def method_missing(name, *args, &block) # rubocop:disable Style/MissingRespondToMissing
-        @component.send(name, *args, &block)
-      end
+    def method_missing(...) # rubocop:disable Style/MethodMissingSuper
+      @component.send(...)
+    end
 
-      def send(symbol, *args, &block)
-        __send__(symbol, *args, &block)
-      end
+    def send(...)
+      __send__(...)
     end
 
     def respond_to_missing?(name, include_private = false)

data/lib/factory_bot/definition.rb

@@ -2,6 +2,7 @@ module FactoryBot
   # @api private
   class Definition
     attr_reader :defined_traits, :declarations, :name, :registered_enums
+    attr_accessor :klass
 
     def initialize(name, base_traits = [])
       @name = name
@@ -51,12 +52,21 @@ module FactoryBot
 
         declarations.attributes
 
+        self.klass ||= klass
         defined_traits.each do |defined_trait|
+          defined_trait.klass ||= klass
           base_traits.each { |bt| bt.define_trait defined_trait }
           additional_traits.each { |at| at.define_trait defined_trait }
         end
 
         @compiled = true
+
+        ActiveSupport::Notifications.instrument "factory_bot.compile_factory", {
+          name: name,
+          attributes: declarations.attributes,
+          traits: defined_traits,
+          class: klass || self.klass
+        }
       end
     end
 
@@ -115,15 +125,26 @@ module FactoryBot
       raise error_with_definition_name(error)
     end
 
-    def error_with_definition_name(error)
-      message = error.message
-      message.insert(
-        message.index("\nDid you mean?") || message.length,
-        " referenced within \"#{name}\" definition"
-      )
+    # detailed_message introduced in Ruby 3.2 for cleaner integration with
+    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
+    if KeyError.method_defined?(:detailed_message)
+      def error_with_definition_name(error)
+        message = error.message + " referenced within \"#{name}\" definition"
 
-      error.class.new(message).tap do |new_error|
-        new_error.set_backtrace(error.backtrace)
+        error.class.new(message, key: error.key, receiver: error.receiver)
+          .tap { |new_error| new_error.set_backtrace(error.backtrace) }
+      end
+    else
+      def error_with_definition_name(error)
+        message = error.message
+        message.insert(
+          message.index("\nDid you mean?") || message.length,
+          " referenced within \"#{name}\" definition"
+        )
+
+        error.class.new(message).tap do |new_error|
+          new_error.set_backtrace(error.backtrace)
+        end
       end
     end
 
@@ -132,7 +153,7 @@ module FactoryBot
     end
 
     def trait_by_name(name)
-      trait_for(name) || Internal.trait_by_name(name)
+      trait_for(name) || Internal.trait_by_name(name, klass)
     end
 
     def trait_for(name)

data/lib/factory_bot/definition_proxy.rb

@@ -119,8 +119,8 @@ module FactoryBot
     #   end
     #
     # Except that no globally available sequence will be defined.
-    def sequence(name, *args, &block)
-      sequence = Sequence.new(name, *args, &block)
+    def sequence(name, ...)
+      sequence = Sequence.new(name, ...)
       FactoryBot::Internal.register_inline_sequence(sequence)
       add_attribute(name) { increment_sequence(sequence) }
     end
@@ -151,7 +151,7 @@ module FactoryBot
     def association(name, *options)
       if block_given?
         raise AssociationDefinitionError.new(
-          "Unexpected block passed to '#{name}' association "\
+          "Unexpected block passed to '#{name}' association " \
           "in '#{@definition.name}' factory"
         )
       else

data/lib/factory_bot/evaluation.rb

@@ -1,13 +1,10 @@
-require "observer"
-
 module FactoryBot
   class Evaluation
-    include Observable
-
-    def initialize(evaluator, attribute_assigner, to_create)
+    def initialize(evaluator, attribute_assigner, to_create, observer)
       @evaluator = evaluator
       @attribute_assigner = attribute_assigner
       @to_create = to_create
+      @observer = observer
     end
 
     delegate :object, :hash, to: :@attribute_assigner
@@ -20,8 +17,7 @@ module FactoryBot
     end
 
     def notify(name, result_instance)
-      changed
-      notify_observers(name, result_instance)
+      @observer.update(name, result_instance)
     end
   end
 end

data/lib/factory_bot/evaluator.rb

@@ -35,14 +35,13 @@ module FactoryBot
 
     attr_accessor :instance
 
-    def method_missing(method_name, *args, &block)
+    def method_missing(method_name, ...)
       if @instance.respond_to?(method_name)
-        @instance.send(method_name, *args, &block)
+        @instance.send(method_name, ...)
       else
-        SyntaxRunner.new.send(method_name, *args, &block)
+        SyntaxRunner.new.send(method_name, ...)
       end
     end
-    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 
     def respond_to_missing?(method_name, _include_private = false)
       @instance.respond_to?(method_name) || SyntaxRunner.new.respond_to?(method_name)

data/lib/factory_bot/factory.rb

@@ -22,6 +22,8 @@ module FactoryBot
     def build_class
       @build_class ||= if class_name.is_a? Class
         class_name
+      elsif class_name.to_s.safe_constantize
+        class_name.to_s.safe_constantize
       else
         class_name.to_s.camelize.constantize
       end
@@ -36,9 +38,9 @@ module FactoryBot
       evaluator = evaluator_class.new(strategy, overrides.symbolize_keys)
       attribute_assigner = AttributeAssigner.new(evaluator, build_class, &compiled_constructor)
 
+      observer = CallbacksObserver.new(callbacks, evaluator)
       evaluation =
-        Evaluation.new(evaluator, attribute_assigner, compiled_to_create)
-      evaluation.add_observer(CallbacksObserver.new(callbacks, evaluator))
+        Evaluation.new(evaluator, attribute_assigner, compiled_to_create, observer)
 
       strategy.result(evaluation).tap(&block)
     end

data/lib/factory_bot/internal.rb

@@ -39,8 +39,8 @@ module FactoryBot
         trait
       end
 
-      def trait_by_name(name)
-        traits.find(name)
+      def trait_by_name(name, klass)
+        traits.find(name).tap { |t| t.klass = klass }
       end
 
       def register_sequence(sequence)

data/lib/factory_bot/registry.rb

@@ -39,9 +39,21 @@ module FactoryBot
 
     def key_error_with_custom_message(key_error)
       message = key_error.message.sub("key not found", "#{@name} not registered")
-      error = KeyError.new(message)
-      error.set_backtrace(key_error.backtrace)
-      error
+      new_key_error(message, key_error).tap do |error|
+        error.set_backtrace(key_error.backtrace)
+      end
+    end
+
+    # detailed_message introduced in Ruby 3.2 for cleaner integration with
+    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
+    if KeyError.method_defined?(:detailed_message)
+      def new_key_error(message, key_error)
+        KeyError.new(message, key: key_error.key, receiver: key_error.receiver)
+      end
+    else
+      def new_key_error(message, _)
+        KeyError.new(message)
+      end
     end
   end
 end

data/lib/factory_bot/strategy/stub.rb

@@ -47,13 +47,17 @@ module FactoryBot
 
       private
 
-      def next_id
-        @@next_id += 1
+      def next_id(result_instance)
+        if uuid_primary_key?(result_instance)
+          SecureRandom.uuid
+        else
+          @@next_id += 1
+        end
       end
 
       def stub_database_interaction_on_result(result_instance)
         if has_settable_id?(result_instance)
-          result_instance.id ||= next_id
+          result_instance.id ||= next_id(result_instance)
         end
 
         result_instance.instance_eval do
@@ -66,12 +70,12 @@ module FactoryBot
           end
 
           def destroyed?
-            nil
+            false
           end
 
           DISABLED_PERSISTENCE_METHODS.each do |write_method|
             define_singleton_method(write_method) do |*args|
-              raise "stubbed models are not allowed to access the database - "\
+              raise "stubbed models are not allowed to access the database - " \
                     "#{self.class}##{write_method}(#{args.join(",")})"
             end
           end
@@ -79,8 +83,16 @@ module FactoryBot
       end
 
       def has_settable_id?(result_instance)
-        !result_instance.class.respond_to?(:primary_key) ||
-          result_instance.class.primary_key
+        result_instance.respond_to?(:id=) &&
+          (!result_instance.class.respond_to?(:primary_key) ||
+          result_instance.class.primary_key)
+      end
+
+      def uuid_primary_key?(result_instance)
+        result_instance.respond_to?(:column_for_attribute) &&
+          (column = result_instance.column_for_attribute(result_instance.class.primary_key)) &&
+          column.respond_to?(:sql_type) &&
+          column.sql_type == "uuid"
       end
 
       def clear_changes_information(result_instance)

data/lib/factory_bot/syntax/default.rb

@@ -25,8 +25,8 @@ module FactoryBot
           end
         end
 
-        def sequence(name, *args, &block)
-          Internal.register_sequence(Sequence.new(name, *args, &block))
+        def sequence(name, ...)
+          Internal.register_sequence(Sequence.new(name, ...))
         end
 
         def trait(name, &block)

data/lib/factory_bot/trait.rb

@@ -15,7 +15,7 @@ module FactoryBot
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait, :constructor,
-      :callbacks, :attributes, to: :@definition
+      :callbacks, :attributes, :klass, :klass=, to: :@definition
 
     def names
       [@name]

data/lib/factory_bot/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "6.2.1".freeze
+  VERSION = "6.5.0".freeze
 end

data/lib/factory_bot.rb

@@ -1,4 +1,5 @@
 require "set"
+require "active_support"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/deprecation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,8 @@ files:
 homepage: https://github.com/thoughtbot/factory_bot
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/thoughtbot/factory_bot/blob/main/NEWS.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -245,14 +246,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance