Skip to content

refactor: make EvaluatorClassDefiner functional #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: make EvaluatorClassDefiner functional #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions lib/factory_bot/evaluator_class_definer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
module FactoryBot
# @api private
class EvaluatorClassDefiner
def initialize(attributes, parent_class)
@parent_class = parent_class
@attributes = attributes

attributes.each do |attribute|
evaluator_class.define_attribute(attribute.name, &attribute.to_proc)
end
end

def evaluator_class
@evaluator_class ||= Class.new(@parent_class).tap do |klass|
module EvaluatorClassDefiner
def self.define_evaluator_class(attributes, parent_class)
Class.new(parent_class).tap do |klass|
klass.attribute_lists ||= []
klass.attribute_lists += [@attributes]
klass.attribute_lists += [attributes]
attributes.each do |attribute|
klass.define_attribute(attribute.name, &attribute.to_proc)
end
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/factory_bot/factory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def class_name
end

def evaluator_class
@evaluator_class ||= EvaluatorClassDefiner.new(attributes, parent.evaluator_class).evaluator_class
@evaluator_class ||= EvaluatorClassDefiner.define_evaluator_class(attributes, parent.evaluator_class)
end

def attributes
Expand Down
3 changes: 1 addition & 2 deletions spec/factory_bot/evaluator_class_definer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@ def define_evaluator(arguments = {})
end

def define_evaluator_class(arguments = {})
evaluator_class_definer = FactoryBot::EvaluatorClassDefiner.new(
FactoryBot::EvaluatorClassDefiner.define_evaluator_class(
arguments[:attributes] || [],
arguments[:parent_class] || FactoryBot::Evaluator
)
evaluator_class_definer.evaluator_class
end

def stub_attribute(name = :attribute, &value)
Expand Down