remove abstract class check and restore old behavior of v4.1.1 but keep the optional no_direct_assignment functiuonality

This commit is contained in:
Denny Mueller 2019-04-23 18:35:08 +02:00 committed by Anil Kumar Maurya
parent 05a0f37e0f
commit d185921d90
1 changed files with 6 additions and 15 deletions

View File

@ -54,25 +54,16 @@ module AASM
# make sure to raise an error if no_direct_assignment is enabled
# and attribute is directly assigned though
aasm_name = @name
return true if should_not_define_method(klass) && !@state_machine.config.no_direct_assignment
klass.send :define_method, "#{@state_machine.config.column}=", ->(state_name) do
if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
raise AASM::NoDirectAssignmentError.new(
'direct assignment of AASM column has been disabled (see AASM configuration for this class)'
)
else
super(state_name)
if @state_machine.config.no_direct_assignment
@klass.send(:define_method, "#{@state_machine.config.column}=") do |state_name|
if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
raise AASM::NoDirectAssignmentError.new('direct assignment of AASM column has been disabled (see AASM configuration for this class)')
end
end
end
end
def should_not_define_method(klass)
(klass.methods.include?(:abstract_class) &&
klass.abstract_class) ||
(klass.superclass.methods.include?(:abstract_class) &&
klass.superclass.abstract_class)
end
# This method is both a getter and a setter
def attribute_name(column_name=nil)
if column_name