Restore location of Utopia::Controller[].

Author: ioquatix

lib/utopia/controller/middleware.rb

@@ -21,10 +21,6 @@ class Middleware
 			# The controller filename.
 			CONTROLLER_RB = "controller.rb".freeze
 
-			def self.[] request
-				request.env[VARIABLES_KEY]
-			end
-			
 			# @param root [String] The content root where controllers will be loaded from.
 			# @param base [Class] The base class for controllers.
 			def initialize(app, root: Utopia::default_root, base: Controller::Base)

lib/utopia/controller/variables.rb

@@ -3,6 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2014-2025, by Samuel Williams.
 
+require_relative "../middleware"
+
 module Utopia
 	module Controller
 		# Provides a stack-based instance variable lookup mechanism. It can flatten a stack of controllers into a single hash.
@@ -61,5 +63,9 @@ def [] key
 				fetch("@#{key}".to_sym, nil)
 			end
 		end
+		
+		def self.[] request
+			request.env[VARIABLES_KEY]
+		end
 	end
 end

test/utopia/controller/variables.rb

@@ -4,6 +4,7 @@
 # Copyright, 2016-2025, by Samuel Williams.
 
 require "utopia/controller/variables"
+require "rack/request"
 
 class TestController
 	attr_accessor :x, :y, :z
@@ -40,4 +41,19 @@ def copy_instance_variables(from)
 
 		expect(variables.to_hash).to be == {x: 10, y: 20}
 	end
+	
+	describe Utopia::Controller do
+		it "returns variables from request env" do
+			variables = Utopia::Controller::Variables.new
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
+			
+			expect(Utopia::Controller[request]).to be == variables
+		end
+		
+		it "returns nil when variables are not set" do
+			request = Rack::Request.new({})
+			
+			expect(Utopia::Controller[request]).to be_nil
+		end
+	end
 end