state_machines 0.100.2 → 0.100.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b240916b3b1592fd9980f8dc7583dac5b9af93cf38c193ffb6e2427f3f15f6c0
-  data.tar.gz: ea38fc11bd6619335415d3a90b92f7f5909df03e5fd087aaf14716dca977d847
+  metadata.gz: 7b5d883e6f3259de8981a9855e50d6f2d859bbd7e9e10a4cc5b4d91ae3fec65f
+  data.tar.gz: 9185125133d36eeed7ae95875a825e0e9a2e4d73b7de286c65be589965d2613d
 SHA512:
-  metadata.gz: 80517f65fa434f346e552677e08cdd6b04e3d573eef756d058645a4d067bb1dd21331d86d657b0df429cfc3157d48cff3bfe594bb7bcb79f4a34b89cf880150c
-  data.tar.gz: '01874fcbb634ec7daf80bd3a5d87169644916ebb71e4bbfaaf1891ce53beac963261e2684df288b8aaedf057dae66e64f3167bdd6a676b095562096edbf25c42'
+  metadata.gz: 4786a92acf6011cc49c6e9f8daa0505d7bfcd26da0d244e351830aed0972ac12656ab39df4f9cf7b35fa4892c7afa02830b7ec0b33876a8624076e60fb273f21
+  data.tar.gz: e87573373f971cea02ebba3dcca45124f49d8ca6354c34756e55fd101deab5649ee349e62b05a3abb7d0fdde9ead78075984a089f7f3070fb4b4768c7af8fcc8

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.100.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines
 version: !ruby/object:Gem::Version
-  version: 0.100.2
+  version: 0.100.4
 platform: ruby
 authors:
 - Abdelkader Boudih