Add fiber isolation

phlex-ruby · Nov 26, 2024 · c21d941 · c21d941
1 parent 2484d5b
commit c21d941
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/phlex/kit.rb b/lib/phlex/kit.rb
@@ -60,7 +60,8 @@ def const_added(name)
 			end
 
 			define_singleton_method(name) do |*args, **kwargs, &block|
-				if (component = Thread.current[:__phlex_component__])
+				component, fiber_id = Thread.current[:__phlex_component__]
+				if (component && fiber_id == Fiber.current.object_id)
 					component.instance_exec do
 						constant = me.const_get(name)
 						render(constant.new(*args, **kwargs), &block)

diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
@@ -70,7 +70,7 @@ def call(buffer = +"", context: {}, view_context: nil, parent: nil, fragments: n
 
 		return "" unless render?
 
-		Thread.current[:__phlex_component__] = self
+		Thread.current[:__phlex_component__] = [self, Fiber.current.object_id]
 
 		phlex_context.around_render do
 			before_template(&block)
@@ -96,7 +96,7 @@ def call(buffer = +"", context: {}, view_context: nil, parent: nil, fragments: n
 			buffer << phlex_context.buffer
 		end
 	ensure
-		Thread.current[:__phlex_component__] = parent
+		Thread.current[:__phlex_component__] = [parent, Fiber.current.object_id]
 	end
 
 	protected def __context__ = @_context