Map attribute aliases to column names when initializing

state-machines · Apr 26, 2021 · 626d575 · 626d575
1 parent 94662c6
commit 626d575
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/state_machines/integrations/active_record.rb b/lib/state_machines/integrations/active_record.rb
@@ -445,7 +445,8 @@ def define_state_initializer
         define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
           def initialize(attributes = nil, *)
             super(attributes) do |*args|
-              scoped_attributes = (attributes || {}).merge(self.class.scope_attributes)
+              attributes = (attributes || {}).transform_keys { |key| self.class.attribute_aliases[key.to_s] || key }
+              scoped_attributes = attributes.merge(self.class.scope_attributes)
 
               self.class.state_machines.initialize_states(self, {}, scoped_attributes)
               yield(*args) if block_given?

diff --git a/test/machine_with_aliased_attribute_test.rb b/test/machine_with_aliased_attribute_test.rb
@@ -19,5 +19,11 @@ def test_should_check_custom_attribute_for_predicate
     @record.vehicle_status = 'parked'
     assert @record.status?(:parked)
   end
+
+  def test_should_initialize_with_original_attribute_names
+    record = @model.new(:vehicle_status => 'bogus')
+    refute record.status?(:parked)
+    assert record.status?(:bogus)
+  end
 end