state_machines 0.100.2 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b240916b3b1592fd9980f8dc7583dac5b9af93cf38c193ffb6e2427f3f15f6c0
-  data.tar.gz: ea38fc11bd6619335415d3a90b92f7f5909df03e5fd087aaf14716dca977d847
+  metadata.gz: 0b9c5ce3b64a05bfea23f266688b2dd1623124d030e4d4eaaa31d0c8b9c5f28c
+  data.tar.gz: 3126dccbc693deb8b3255408202400360fdffb14e439eda3923f4c3a320f452f
 SHA512:
-  metadata.gz: 80517f65fa434f346e552677e08cdd6b04e3d573eef756d058645a4d067bb1dd21331d86d657b0df429cfc3157d48cff3bfe594bb7bcb79f4a34b89cf880150c
-  data.tar.gz: '01874fcbb634ec7daf80bd3a5d87169644916ebb71e4bbfaaf1891ce53beac963261e2684df288b8aaedf057dae66e64f3167bdd6a676b095562096edbf25c42'
+  metadata.gz: d6982ddb9e837d4e7d7763b69045733f2751a74a867fa38789f58e7232a96583f7b2336ed8af7d5ebd0196ae58562aa8f19fb7d2f0f79425a1c5c22e6ddda966
+  data.tar.gz: 315a781c1daa8f85a6b9f20790245191f5540014fb35b1e2a2a41827828ab7748b33de43e016b088da3054f9ef60b541ba390d492d7aad23f95f546b9b9e933d

data/lib/state_machines/machine/configuration.rb

@@ -113,18 +113,10 @@ module StateMachines
         # Update all states to reflect the new initial state
         states.each { |state| state.initial = (state.name == @initial_state) }
 
-        # Output a warning if there are conflicting initial states for the machine's
-        # attribute
-        initial_state = states.detect(&:initial)
-        has_owner_default = !owner_class_attribute_default.nil?
-        has_conflicting_default = dynamic_initial_state? || !owner_class_attribute_default_matches?(initial_state)
-        return unless has_owner_default && has_conflicting_default
-
-        warn(
-          "Both #{owner_class.name} and its #{name.inspect} machine have defined " \
-          "a different default for \"#{attribute}\". Use only one or the other for " \
-          'defining defaults to avoid unexpected behaviors.'
-        )
+        # Warn if the owner class and the machine have conflicting defaults for
+        # the machine's attribute. May be deferred by integrations (e.g.
+        # ActiveRecord) to avoid touching the DB at class load time.
+        schedule_conflicting_attribute_default_check
       end
 
       # Gets the attribute name for the given machine scope.

data/lib/state_machines/machine/integration.rb

@@ -58,6 +58,28 @@ module StateMachines
         state.matches?(owner_class_attribute_default)
       end
 
+      # Warns if the owner class and the machine have defined conflicting
+      # defaults for the machine's attribute.
+      def check_conflicting_attribute_default
+        initial_state = states.detect(&:initial)
+        has_owner_default = !owner_class_attribute_default.nil?
+        has_conflicting_default = dynamic_initial_state? || !owner_class_attribute_default_matches?(initial_state)
+        return unless has_owner_default && has_conflicting_default
+
+        warn(
+          "Both #{owner_class.name} and its #{name.inspect} machine have defined " \
+          "a different default for \"#{attribute}\". Use only one or the other for " \
+          'defining defaults to avoid unexpected behaviors.'
+        )
+      end
+
+      # Schedules or immediately runs the conflicting attribute default check.
+      # Override in integrations to defer the check (e.g. until after the DB
+      # is ready) to avoid triggering a database connection at class load time.
+      def schedule_conflicting_attribute_default_check
+        check_conflicting_attribute_default
+      end
+
       private
 
       # Gets the default messages that can be used in the machine for invalid

data/lib/state_machines/syntax_validator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ripper'
-
 module StateMachines
   # Cross-platform syntax validation for eval strings
   # Supports CRuby, JRuby, TruffleRuby via pluggable backends
@@ -15,12 +13,12 @@ module StateMachines
     private
 
     # Lazily pick the best backend for this platform
-    # Prefer RubyVM for performance on CRuby, fallback to Ripper for compatibility
+    # Prefer RubyVM for performance on CRuby, fallback to eval for compatibility
     def backend
       @backend ||= if RubyVmBackend.available?
                      RubyVmBackend
                    else
-                     RipperBackend
+                     UniversalBackend
                    end
     end
     module_function :backend
@@ -40,16 +38,15 @@ module StateMachines
       module_function :validate!
     end
 
-    # Universal Ruby backend via Ripper
-    module RipperBackend
+    # Universal Ruby backend
+    module UniversalBackend
       def validate!(code, filename)
-        sexp = Ripper.sexp(code)
-        if sexp.nil?
-          # Ripper.sexp returns nil on a parse error, but no exception
-          raise SyntaxError, "syntax error in #{filename}"
-        end
-
-        true
+        code = code.b
+        code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
+          "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n"
+        }
+        code = code.force_encoding(Encoding::UTF_8)
+        catch { |tag| eval(code, binding, filename, __LINE__ - 1) } == :ok
       end
       module_function :validate!
     end

data/lib/state_machines/transition.rb

@@ -44,6 +44,7 @@ module StateMachines
       @paused_fiber = nil
       @resuming = false
       @continuation_block = nil
+      @fiber_thread_storage = nil
 
       @event = machine.events.fetch(event)
       @from_state = machine.states.fetch(from_name)
@@ -201,7 +202,8 @@ module StateMachines
       # this is an idempotent call on an already-paused transition. Just return true.
       return true if @paused_fiber&.alive? && !options[:after]
 
-      # Extract pausable options
+      # Always use fibers for compatibility with existing pause/resume functionality
+      # The fiber argument can still be used to explicitly control fiber usage
       pausable_options = options.key?(:fiber) ? { fiber: options[:fiber] } : {}
 
       # Check if we're resuming from a pause
@@ -288,6 +290,7 @@ module StateMachines
       @paused_fiber = nil
       @resuming = false
       @continuation_block = nil
+      @fiber_thread_storage = nil
     end
 
     # Determines equality of transitions by testing whether the object, states,
@@ -380,27 +383,43 @@ module StateMachines
         # Handle different result types
         case result
         when Array
-          # Exception occurred inside the fiber
           if result[0] == :error
-            # Clean up state before re-raising
+            # Exception occurred inside the fiber
             @paused_fiber = nil
             raise result[1]
-          end
-        else
-          # Normal flow
-          # Check if fiber is still alive after resume
-          if @paused_fiber.alive?
-            # Still paused, keep the fiber
-            true
           else
-            # Fiber completed
-            @paused_fiber = nil
-            result == :halted
+            # Normal completion with thread storage export
+            @fiber_thread_storage = result[1] if result.length == 2 && result[1].is_a?(Hash)
+            result_value = result[0]
           end
+        else
+          # Direct result value (paused or simple completion)
+          result_value = result
+        end
+
+        # Check if fiber is still alive after resume
+        if @paused_fiber.alive?
+          # Still paused, keep the fiber
+          true
+        else
+          # Fiber completed
+          @paused_fiber = nil
+          result_value == :halted
         end
       else
+        # Capture current fiber's Thread.current storage to preserve object identity
+        # This is needed for compatibility but has limitations with dynamic assignments
+        parent_fiber_locals = Thread.current.keys.each_with_object({}) do |key, storage|
+          storage[key] = Thread.current[key]
+        end
+
         # Create a new fiber to run the block
         fiber = Fiber.new do
+          # Restore parent's Thread.current storage with exact same object references
+          parent_fiber_locals.each do |key, value|
+            Thread.current[key] = value
+          end
+
           # Mark that we're inside a pausable fiber
           Fiber.current.extend(StateMachines::PausableFiber)
           Fiber.current.state_machine_fiber_pausable = true
@@ -409,7 +428,13 @@ module StateMachines
               yield
               true
             end
-            halted ? :halted : :completed
+
+            # Export the final thread storage state along with the result
+            thread_storage = Thread.current.keys.each_with_object({}) do |key, storage|
+              storage[key] = Thread.current[key]
+            end
+
+            [halted ? :halted : :completed, thread_storage]
           rescue StandardError => e
             # Store the exception for re-raising
             [:error, e]
@@ -425,23 +450,28 @@ module StateMachines
         # Handle different result types
         case result
         when Array
-          # Exception occurred
           if result[0] == :error
-            # Clean up state before re-raising
+            # Exception occurred
             @paused_fiber = nil
             raise result[1]
-          end
-        else
-          # Normal flow
-          # Save if paused
-          if fiber.alive?
-            @paused_fiber = fiber
-            # Return true to indicate paused (treated as halted for flow control)
-            true
           else
-            # Fiber completed, return whether it was halted
-            result == :halted
+            # Normal completion - check if we have thread storage
+            @fiber_thread_storage = result[1] if result.length == 2 && result[1].is_a?(Hash)
+            result_value = result[0]
           end
+        else
+          # Direct result value (shouldn't happen with our new code)
+          result_value = result
+        end
+
+        # Save if paused
+        if fiber.alive?
+          @paused_fiber = fiber
+          # Return true to indicate paused (treated as halted for flow control)
+          true
+        else
+          # Fiber completed, return whether it was halted
+          result_value == :halted
         end
       end
     end
@@ -539,6 +569,10 @@ module StateMachines
     def after
       return if @after_run
 
+      # Restore the fiber's thread storage to ensure consistency
+      # This preserves Thread.current state from before/around callbacks to after callbacks
+      @fiber_thread_storage.each { |key, value| Thread.current[key] = value } if @fiber_thread_storage
+
       catch(:halt) do
         type = @success ? :after : :failure
         machine.callbacks[type].each { |callback| callback.call(object, context, self) }

data/lib/state_machines/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StateMachines
-  VERSION = '0.100.2'
+  VERSION = '0.101.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines
 version: !ruby/object:Gem::Version
-  version: 0.100.2
+  version: 0.101.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -28,16 +28,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.27.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: State machines for attributes
 test_files: []