Remove Utopia context state

Assisted-By: devx/166ed168-1c4d-4c63-a5f6-8d0d9cbff13f

Author: samuel-williams-shopify

lib/utopia/application.rb

@@ -6,16 +6,15 @@
 require "protocol/http/middleware"
 require "protocol/http/middleware/builder"
 
-require_relative "context"
 require_relative "request"
 require_relative "response"
 
 module Utopia
 	# The protocol-facing entrypoint for a Utopia application.
 	#
-	# This object accepts {Protocol::HTTP::Request} instances, installs the
-	# request-scoped Utopia fiber state, dispatches to the Utopia application
-	# stack, and normalizes the result back to a {Protocol::HTTP::Response}.
+	# This object accepts {Protocol::HTTP::Request} instances, dispatches to the
+	# Utopia application stack, and normalizes the result back to a
+	# {Protocol::HTTP::Response}.
 	class Application < Protocol::HTTP::Middleware
 		CONFIGURATION_PATH = "config/application.rb".freeze
 
@@ -82,13 +81,7 @@ def initialize(delegate)
 		# @parameter http_request [Protocol::HTTP::Request] The incoming protocol request.
 		# @returns [Protocol::HTTP::Response] The normalized protocol response.
 		def call(http_request)
-			Context.clear
-			
-			Context.with(request: http_request, request_path: http_request.path_info) do
-				return Response.wrap(super(http_request))
-			end
-		ensure
-			Context.clear
+			return Response.wrap(super(http_request))
 		end
 	end
 end

lib/utopia/content/document.rb

@@ -7,7 +7,6 @@
 require_relative "response"
 require_relative "markup"
 require_relative "builder"
-require_relative "../context"
 
 module Utopia
 	module Content
@@ -42,7 +41,7 @@ def initialize(request, attributes = {})
 
 			# @returns [Path] The original request path, if known.
 			def request_path
-				Path[Context.request_path || request.path_info]
+				Path[request.request_path]
 			end
 
 			protected def current_base_uri_path

lib/utopia/content/middleware.rb

@@ -4,9 +4,9 @@
 # Copyright, 2025-2026, by Samuel Williams.
 
 require_relative "../middleware"
-require_relative "../context"
 require_relative "../localization"
 require_relative "../response"
+require_relative "../controller/variables"
 
 require_relative "links"
 require_relative "node"
@@ -94,7 +94,7 @@ def resolve_link(link)
 
 			def respond(link, request)
 				if node = resolve_link(link)
-					attributes = Context.variables&.to_hash || {}
+					attributes = Controller.current&.to_hash || {}
 
 					return node.process!(request, attributes)
 				elsif redirect_uri = link[:uri]
@@ -116,7 +116,7 @@ def call(request)
 					return Utopia::Response[307, {HTTP::LOCATION => path.dirname.join(index_path).to_s}, []]
 				end
 
-				locale = Context.current_locale
+				locale = Localization.current_locale
 				if link = @links.for(path, locale)
 					if response = self.respond(link, request)
 						return response

lib/utopia/context.rb

@@ -5,7 +5,6 @@
 
 require_relative "../path"
 require_relative "../middleware"
-require_relative "../context"
 
 require_relative "variables"
 require_relative "base"
@@ -92,7 +91,7 @@ def invoke_controllers(request)
 				controller_path = Path.new
 
 				# Controller instance variables which eventually get processed by the view:
-				variables = Context.variables
+				variables = Controller.current
 
 				while request_path.components.any?
 					# We copy one path component from the relative path to the controller path at a time. The controller, when invoked, can modify the relative path (by assigning to relative_path.components). This allows for controller-relative rewrites, but only the remaining path postfix can be modified.
@@ -119,13 +118,17 @@ def invoke_controllers(request)
 			end
 
 			def call(request)
-				Context.variables ||= Variables.new
+				previous_variables = Controller.current
+				
+				Controller.current ||= Variables.new
 
 				if result = invoke_controllers(request)
 					return result
 				end
 
 				return @app.call(request)
+			ensure
+				Controller.current = previous_variables
 			end
 		end
 	end

lib/utopia/controller/middleware.rb

@@ -4,10 +4,11 @@
 # Copyright, 2014-2025, by Samuel Williams.
 
 require_relative "../middleware"
-require_relative "../context"
 
 module Utopia
 	module Controller
+		CURRENT_KEY = :utopia_variables
+		
 		# Provides a stack-based instance variable lookup mechanism. It can flatten a stack of controllers into a single hash.
 		class Variables
 			def initialize
@@ -66,7 +67,11 @@ def [] key
 		end
 
 		def self.current
-			Context.variables
+			Fiber[CURRENT_KEY]
+		end
+		
+		def self.current= variables
+			Fiber[CURRENT_KEY] = variables
 		end
 
 		def self.[] request = nil

lib/utopia/controller/variables.rb

@@ -6,12 +6,23 @@
 
 require "console"
 
-require_relative "../context"
 require_relative "../middleware"
 require_relative "../response"
 
 module Utopia
 	module Exceptions
+		CURRENT_KEY = :utopia_exception
+		
+		# The exception currently being handled.
+		def self.current
+			Fiber[CURRENT_KEY]
+		end
+		
+		# Assign the exception currently being handled.
+		def self.current= exception
+			Fiber[CURRENT_KEY] = exception
+		end
+		
 		# A middleware which catches exceptions and performs an internal redirect.
 		class Handler
 			# @param location [String] Peform an internal redirect to this location when an exception is raised.
@@ -42,8 +53,14 @@ def call(request)
 							path_info: @location
 						)
 
-						error_response = Context.with(request: error_request, exception: exception) do
-							Response.wrap(@app.call(error_request))
+						previous_exception = Exceptions.current
+						
+						begin
+							Exceptions.current = exception
+							
+							error_response = Response.wrap(@app.call(error_request))
+						ensure
+							Exceptions.current = previous_exception
 						end
 						error_response.status = 500
 

lib/utopia/exceptions/handler.rb

@@ -6,8 +6,11 @@
 require "net/smtp"
 require "mail"
 
-require_relative "../context"
 require_relative "../middleware"
+require_relative "../session"
+require_relative "../controller/variables"
+require_relative "../localization"
+require_relative "handler"
 
 module Utopia
 	module Exceptions
@@ -130,8 +133,8 @@ def generate_body(exception, request)
 					io.puts "header[#{key.inspect}]: #{value.inspect}"
 				end
 
-				Context.to_hash.each do |key, value|
-					io.puts "context.#{key}: #{value.inspect}"
+				self.current_state.each do |key, value|
+					io.puts "state.#{key}: #{value.inspect}"
 				end
 
 				io.puts
@@ -164,7 +167,7 @@ def generate_mail(exception, request)
 				end
 
 				if @dump_environment
-					mail.attachments["context.yaml"] = YAML.dump(Context.to_hash)
+					mail.attachments["state.yaml"] = YAML.dump(self.current_state)
 				end
 
 				return mail
@@ -181,6 +184,16 @@ def send_notification(exception, request)
 				$stderr.puts mail_exception.backtrace
 			end
 
+			def current_state
+				{
+					session: Session.current,
+					variables: Controller.current,
+					localization: Localization.current,
+					current_locale: Localization.current_locale,
+					exception: Exceptions.current,
+				}
+			end
+			
 			def extract_body(request)
 				request.body&.read
 			end

lib/utopia/exceptions/mailer.rb

@@ -4,7 +4,6 @@
 # Copyright, 2025-2026, by Samuel Williams.
 
 require_relative "wrapper"
-require_relative "../context"
 require_relative "../middleware"
 require_relative "../response"
 
@@ -143,7 +142,7 @@ def vary(request, response)
 				headers.add("vary", "Accept-Language")
 
 				# Althought this header is generally not supported, we supply it anyway as it is useful for debugging:
-				if locale = Context.current_locale
+				if locale = Localization.current_locale
 					# Set the Content-Location to point to the localized URI as requested:
 					headers["content-location"] = "/#{locale}" + request.path_info
 				end
@@ -161,8 +160,17 @@ def call(request)
 				preferred_locales(request) do |localized_request, locale|
 					# puts "Trying locale: #{locale}: #{localized_request.path_info}..."
 
-					response = Context.with(request: localized_request, localization: self, current_locale: locale) do
-						Response.wrap(@app.call(localized_request))
+					previous_localization = Localization.current
+					previous_locale = Localization.current_locale
+					
+					begin
+						Localization.current = self
+						Localization.current_locale = locale
+						
+						response = Response.wrap(@app.call(localized_request))
+					ensure
+						Localization.current = previous_localization
+						Localization.current_locale = previous_locale
 					end
 
 					break unless response.status >= 400