Move Utopia::Responder into Utopia::Controller layer.

Author: ioquatix

lib/utopia/controller/respond.rb

@@ -4,7 +4,7 @@
 # Copyright, 2016-2025, by Samuel Williams.
 
 require_relative "../http"
-require_relative "../responder"
+require_relative "responder"
 
 module Utopia
 	module Controller
@@ -14,50 +14,6 @@ def self.prepended(base)
 				base.extend(ClassMethods)
 			end
 
-			module Handlers
-				module JSON
-					APPLICATION_JSON = HTTP::Accept::ContentType.new("application", "json").freeze
-					
-					def self.split(*arguments)
-						APPLICATION_JSON.split(*arguments)
-					end
-					
-					def self.call(context, request, media_range, object, **options)
-						if version = media_range.parameters["version"]
-							options[:version] = version.to_s
-						end
-						
-						context.succeed! content: object.to_json(options), type: APPLICATION_JSON
-					end
-				end
-				
-				module Passthrough
-					WILDCARD = HTTP::Accept::MediaTypes::MediaRange.new("*", "*").freeze
-					
-					def self.split(*arguments)
-						WILDCARD.split(*arguments)
-					end
-					
-					def self.call(context, request, media_range, object, **options)
-						# Do nothing.
-					end
-				end
-			end
-			
-			class Responder < Utopia::Responder
-				def with_json
-					@handlers << Handlers::JSON
-				end
-				
-				def with_passthrough
-					@handlers << Handlers::Passthrough
-				end
-				
-				def with(content_type, &block)
-					handle(content_type, &block)
-				end
-			end
-			
 			module ClassMethods
 				def responds
 					@responder ||= Responder.new

lib/utopia/controller/responder.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2020-2025, by Samuel Williams.
+
+require_relative "middleware"
+
+module Utopia
+	module Controller
+		module Handlers
+			module JSON
+				APPLICATION_JSON = HTTP::Accept::ContentType.new("application", "json").freeze
+				
+				def self.split(*arguments)
+					APPLICATION_JSON.split(*arguments)
+				end
+				
+				def self.call(context, request, media_range, object, **options)
+					if version = media_range.parameters["version"]
+						options[:version] = version.to_s
+					end
+					
+					context.succeed! content: object.to_json(options), type: APPLICATION_JSON
+				end
+			end
+			
+			module Passthrough
+				WILDCARD = HTTP::Accept::MediaTypes::MediaRange.new("*", "*").freeze
+				
+				def self.split(*arguments)
+					WILDCARD.split(*arguments)
+				end
+				
+				def self.call(context, request, media_range, object, **options)
+					# Do nothing.
+				end
+			end
+		end
+		
+		class Responder
+			Handler = Struct.new(:content_type, :block) do
+				def split(*arguments)
+					self.content_type.split(*arguments)
+				end
+				
+				def call(context, request, media_range, *arguments, **options)
+					context.instance_exec(media_range, *arguments, **options, &self.block)
+				end
+			end
+			
+			Responds = Struct.new(:responder, :context, :request) do
+				# @todo Refactor `object` -> `*arguments`...
+				def with(object, **options)
+					responder.call(context, request, object, **options)
+				end
+			end
+			
+			def initialize
+				@handlers = HTTP::Accept::MediaTypes::Map.new
+			end
+			
+			attr :handlers
+			
+			def freeze
+				@handlers.freeze
+				
+				super
+			end
+			
+			def call(context, request, *arguments, **options)
+				# Parse the list of browser preferred content types and return ordered by priority:
+				media_types = HTTP::Accept::MediaTypes.browser_preferred_media_types(request.env)
+				
+				handler, media_range = @handlers.for(media_types)
+				
+				if handler
+					handler.call(context, request, media_range, *arguments, **options)
+				end
+			end
+			
+			# Add a converter for the specified content type. Call the block with the response content if the request accepts the specified content_type.
+			def handle(content_type, &block)
+				@handlers << Handler.new(content_type, block)
+			end
+			
+			def respond_to(context, request)
+				Responds.new(self, context, request)
+			end
+			
+			def with_json
+				@handlers << Handlers::JSON
+			end
+			
+			def with_passthrough
+				@handlers << Handlers::Passthrough
+			end
+			
+			def with(content_type, &block)
+				handle(content_type, &block)
+			end
+		end
+	end
+end

lib/utopia/responder.rb

@@ -5,6 +5,7 @@
   - Add agent context.
   - Better simplification of relative paths, e.g. `../../foo` is not modified to `foo`.
   - Move top level classes into `class Middleware` in their respective namespaces.
+  - Move `Utopia::Responder` into `Utopia::Controller` layer.
 
 ## v2.30.1