Merge pull request #43 from state-machines/moderniz

feat: modernize ActiveModel integration with Ruby 3+ patterns

release-as: 0.31.0

Author: seuros

Gemfile

@@ -9,4 +9,3 @@ platforms :mri do
   gem 'debug'
 end
 
-gem 'mutex_m'

lib/state_machines/integrations/active_model.rb

@@ -324,13 +324,13 @@ def self.matching_ancestors
 
       # Adds a validation error to the given object
       def invalidate(object, attribute, message, values = [])
-        if supports_validations?
-          attribute = self.attribute(attribute)
-          options = values.to_h { |key, value| [key, value] }
+        return unless supports_validations?
 
-          default_options = default_error_message_options(object, attribute, message)
-          object.errors.add(attribute, message, **options, **default_options)
-        end
+        attribute = self.attribute(attribute)
+        options = values.to_h
+
+        default_options = default_error_message_options(object, attribute, message)
+        object.errors.add(attribute, message, **options, **default_options)
       end
 
       # Describes the current validation errors on the given object.  If none
@@ -353,7 +353,7 @@ def around_validation(object)
 
       def define_state_initializer
         define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
-          def initialize(params = {})
+          def initialize(**params)
             params.transform_keys! do |key|
               self.class.attribute_aliases[key.to_s] || key.to_s
             end if self.class.respond_to?(:attribute_aliases)

lib/state_machines/integrations/active_model/locale.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+# Use lazy evaluation to avoid circular dependencies with frozen default_messages
+# This ensures messages can be updated after gem loading while maintaining thread safety
 { en: {
   activemodel: {
     errors: {
       messages: {
-        invalid: StateMachines::Machine.default_messages[:invalid],
-        invalid_event: StateMachines::Machine.default_messages[:invalid_event] % ['%{state}'],
-        invalid_transition: StateMachines::Machine.default_messages[:invalid_transition] % ['%{event}']
+        invalid: lambda { |*| StateMachines::Machine.default_messages[:invalid] },
+        invalid_event: lambda { |*| StateMachines::Machine.default_messages[:invalid_event] % ['%{state}'] },
+        invalid_transition: lambda { |*| StateMachines::Machine.default_messages[:invalid_transition] % ['%{event}'] }
       }
     }
   }

state_machines-activemodel.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('test/**/{*_test,test_*}.rb')
   spec.require_paths = ['lib']
   spec.required_ruby_version     = '>= 3.1.0' # jruby is still outdated
-  spec.add_dependency 'state_machines', '>= 0.10.0'
+  spec.add_dependency 'state_machines', '>= 0.31.0'
   spec.add_dependency 'activemodel', '>= 7.1'
 
   spec.add_development_dependency 'bundler', '>= 1.6'