factory_bot 6.5.4 → 6.5.5

data/lib/factory_bot/attribute_assigner.rb

@@ -72,7 +72,7 @@ module FactoryBot
         non_ignored_attribute_names +
         override_names -
         ignored_attribute_names -
-        alias_names_to_ignore
+        aliased_attribute_names_to_ignore
     end
 
     def non_ignored_attribute_names
@@ -91,22 +91,39 @@ module FactoryBot
       @evaluator.__override_names__
     end
 
+    def attribute_names
+      @attribute_list.names
+    end
+
     def hash_instance_methods_to_respond_to
-      @attribute_list.names + override_names + @build_class.instance_methods
+      attribute_names + override_names + @build_class.instance_methods
     end
 
-    def alias_names_to_ignore
+    ##
+    # Creat a list of attribute names that will be
+    # overridden by an alias, so any defaults can
+    # ignored.
+    #
+    def aliased_attribute_names_to_ignore
       @attribute_list.non_ignored.flat_map { |attribute|
         override_names.map do |override|
-          attribute.name if ignorable_alias?(attribute, override)
+          attribute.name if aliased_attribute?(attribute, override)
         end
       }.compact
     end
 
-    def ignorable_alias?(attribute, override)
-      attribute.alias_for?(override) &&
-        attribute.name != override &&
-        !ignored_attribute_names.include?(override)
+    ##
+    # Is the override an alias for the attribute and not the
+    # actual name of another attribute?
+    #
+    # Note: Checking against the names of all attributes, resolves any
+    #       issues with having both <attribute> and <attribute>_id
+    #       in the same factory.
+    #
+    def aliased_attribute?(attribute, override)
+      return false if attribute_names.include?(override)
+
+      attribute.alias_for?(override)
     end
   end
 end

data/lib/factory_bot/callbacks_observer.rb

@@ -4,11 +4,15 @@ module FactoryBot
     def initialize(callbacks, evaluator)
       @callbacks = callbacks
       @evaluator = evaluator
+      @completed = []
     end
 
     def update(name, result_instance)
       callbacks_by_name(name).each do |callback|
-        callback.run(result_instance, @evaluator)
+        if !completed?(result_instance, callback)
+          callback.run(result_instance, @evaluator)
+          record_completion!(result_instance, callback)
+        end
       end
     end
 
@@ -17,5 +21,19 @@ module FactoryBot
     def callbacks_by_name(name)
       @callbacks.select { |callback| callback.name == name }
     end
+
+    def completed?(instance, callback)
+      key = completion_key_for(instance, callback)
+      @completed.include?(key)
+    end
+
+    def record_completion!(instance, callback)
+      key = completion_key_for(instance, callback)
+      @completed << key
+    end
+
+    def completion_key_for(instance, callback)
+      "#{instance.object_id}-#{callback.object_id}"
+    end
   end
 end

data/lib/factory_bot/evaluator.rb

@@ -1,4 +1,3 @@
-require "active_support/core_ext/hash/except"
 require "active_support/core_ext/class/attribute"
 
 module FactoryBot
@@ -51,8 +50,15 @@ module FactoryBot
       @overrides.keys
     end
 
-    def increment_sequence(sequence)
-      sequence.next(self)
+    def increment_sequence(sequence, scope: self)
+      value = sequence.next(scope)
+
+      raise if value.respond_to?(:start_with?) && value.start_with?("#<FactoryBot::Declaration")
+
+      value
+    rescue
+      raise ArgumentError, "Sequence '#{sequence.uri_manager.first}' failed to " \
+                          "return a value. Perhaps it needs a scope to operate? (scope: <object>)"
     end
 
     def self.attribute_list

data/lib/factory_bot/factory.rb

@@ -33,6 +33,7 @@ module FactoryBot
 
     def run(build_strategy, overrides, &block)
       block ||= ->(result) { result }
+
       compile
 
       strategy = StrategyCalculator.new(build_strategy).strategy.new
@@ -44,7 +45,11 @@ module FactoryBot
       evaluation =
         Evaluation.new(evaluator, attribute_assigner, compiled_to_create, observer)
 
-      strategy.result(evaluation).tap(&block)
+      evaluation.notify(:before_all, nil)
+      instance = strategy.result(evaluation).tap(&block)
+      evaluation.notify(:after_all, instance)
+
+      instance
     end
 
     def human_names

data/lib/factory_bot/registry.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/hash/indifferent_access"
+require "active_support/hash_with_indifferent_access"
 
 module FactoryBot
   class Registry

data/lib/factory_bot/sequence.rb

@@ -150,25 +150,24 @@ module FactoryBot
     end
 
     class EnumeratorAdapter
-      def initialize(value)
-        @first_value = value
-        @value = value
+      def initialize(initial_value)
+        @initial_value = initial_value
       end
 
       def peek
-        @value
+        value
       end
 
       def next
-        @value = @value.next
+        @value = value.next
       end
 
       def rewind
-        @value = @first_value
+        @value = first_value
       end
 
       def set_value(new_value)
-        if new_value >= @first_value
+        if new_value >= first_value
           @value = new_value
         else
           fail ArgumentError, "Value cannot be less than: #{@first_value}"
@@ -176,7 +175,22 @@ module FactoryBot
       end
 
       def integer_value?
-        @first_value.is_a?(Integer)
+        first_value.is_a?(Integer)
+      end
+
+      private
+
+      def first_value
+        @first_value ||= initial_value
+      end
+
+      def value
+        @value ||= initial_value
+      end
+
+      def initial_value
+        @value = @initial_value.respond_to?(:call) ? @initial_value.call : @initial_value
+        @first_value = @value
       end
     end
   end

data/lib/factory_bot/strategy/build.rb

@@ -6,6 +6,8 @@ module FactoryBot
       end
 
       def result(evaluation)
+        evaluation.notify(:before_build, nil)
+
         evaluation.object.tap do |instance|
           evaluation.notify(:after_build, instance)
         end

data/lib/factory_bot/strategy/create.rb

@@ -6,6 +6,8 @@ module FactoryBot
       end
 
       def result(evaluation)
+        evaluation.notify(:before_build, nil)
+
         evaluation.object.tap do |instance|
           evaluation.notify(:after_build, instance)
           evaluation.notify(:before_create, instance)

data/lib/factory_bot/syntax/methods.rb

@@ -123,7 +123,7 @@ module FactoryBot
           raise(KeyError,
             "Sequence not registered: #{FactoryBot::UriManager.build_uri(uri_parts)}")
 
-        increment_sequence(uri, sequence, scope: scope)
+        increment_sequence(sequence, scope: scope)
       end
 
       # Generates and returns the list of values in a global or factory sequence.
@@ -147,7 +147,7 @@ module FactoryBot
           raise(KeyError, "Sequence not registered: '#{uri}'")
 
         (1..count).map do
-          increment_sequence(uri, sequence, scope: scope)
+          increment_sequence(sequence, scope: scope)
         end
       end
 
@@ -161,21 +161,19 @@ module FactoryBot
       # Increments the given sequence and returns the value.
       #
       # Arguments:
-      #   uri: (Symbol)
-      #     The URI for the sequence
       #   sequence:
       #     The sequence instance
       #   scope: (object)(optional)
       #     The object the sequence should be evaluated within
       #
-      def increment_sequence(uri, sequence, scope: nil)
+      def increment_sequence(sequence, scope: nil)
         value = sequence.next(scope)
 
         raise if value.respond_to?(:start_with?) && value.start_with?("#<FactoryBot::Declaration")
 
         value
       rescue
-        raise ArgumentError, "Sequence '#{uri}' failed to " \
+        raise ArgumentError, "Sequence '#{sequence.uri_manager.first}' failed to " \
                             "return a value. Perhaps it needs a scope to operate? (scope: <object>)"
       end
     end

data/lib/factory_bot/version.rb

@@ -1,3 +1,3 @@
 module FactoryBot
-  VERSION = "6.5.4".freeze
+  VERSION = "6.5.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot
 version: !ruby/object:Gem::Version
-  version: 6.5.4
+  version: 6.5.5
 platform: ruby
 authors:
 - Josh Clayton
 - Joe Ferris
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: factory_bot provides a framework and DSL for defining and using model instance
   factories.