Simplify serve configuration path resolution.

Author: samuel-williams-shopify

lib/falcon/command/serve.rb

@@ -71,8 +71,7 @@ def name
 			# Create the environment for the serve command.
 			# @returns [Async::Service::Environment] The configured server environment.
 			def environment
-				Async::Service::Environment.new(Falcon::Environment::Server).with(
-					Falcon::Environment::Serve,
+				environment_options = {
 					root: Dir.pwd,
 
 					verbose: self.parent&.verbose?,
@@ -81,13 +80,21 @@ def environment
 					container_options: self.container_options,
 					endpoint_options: self.endpoint_options,
 
-					configuration_path: @options[:config],
 					preload: [@options[:preload]].compact,
 					url: @options[:bind],
 
 					name: self.name,
 
-					endpoint: ->{Endpoint.parse(url, **endpoint_options)}
+					endpoint: ->{Endpoint.parse(url, **endpoint_options)},
+				}
+				
+				if configuration_path = @options[:config]
+					environment_options[:configuration_path] = File.expand_path(configuration_path, Dir.pwd)
+				end
+				
+				return Async::Service::Environment.new(Falcon::Environment::Server).with(
+					Falcon::Environment::Serve,
+					**environment_options,
 				)
 			end
 

lib/falcon/environment/serve.rb

@@ -12,19 +12,9 @@ module Falcon
 	module Environment
 		# Provides configuration discovery and loading for `falcon serve`.
 		module Serve
-			# The explicitly specified application configuration path, if any.
-			# @returns [String | Nil]
-			def configuration_path
-				nil
-			end
-			
-			# Resolve the application configuration path.
+			# Discover the application configuration path.
 			# @returns [String] The absolute application configuration path.
-			def resolved_configuration_path
-				if configuration_path
-					return File.expand_path(configuration_path, root)
-				end
-				
+			def configuration_path
 				serve_path = File.expand_path("config/serve.rb", root)
 				if File.file?(serve_path)
 					return serve_path
@@ -41,7 +31,7 @@ def resolved_configuration_path
 			# Load and wrap the configured application.
 			# @returns [Protocol::HTTP::Middleware] The middleware stack.
 			def middleware
-				path = resolved_configuration_path
+				path = configuration_path
 
 				case File.extname(path)
 				when ".rb"

test/falcon/environment/serve.rb

@@ -26,7 +26,7 @@
 		File.write(File.join(root, "config.ru"), "run ->(env) {[200, {}, []]}\n")
 		File.write(File.join(root, "config/serve.rb"), "run Protocol::HTTP::Middleware::Okay\n")
 
-		expect(evaluator.resolved_configuration_path).to be == File.join(root, "config/serve.rb")
+		expect(evaluator.configuration_path).to be == File.join(root, "config/serve.rb")
 	end
 
 	it "loads config/serve.rb as protocol middleware" do
@@ -39,19 +39,21 @@
 	it "falls back to config.ru" do
 		File.write(File.join(root, "config.ru"), "run ->(env) {[200, {}, []]}\n")
 
-		expect(evaluator.resolved_configuration_path).to be == File.join(root, "config.ru")
+		expect(evaluator.configuration_path).to be == File.join(root, "config.ru")
 	end
 
 	it "uses an explicit configuration path" do
+		configuration_path = File.join(root, "application.rb")
+		
 		evaluator = Async::Service::Environment.build(
 			Falcon::Environment::Server,
 			subject,
 			root: root,
 			name: "localhost",
-			configuration_path: "application.rb",
+			configuration_path: configuration_path,
 		).evaluator
 
-		expect(evaluator.resolved_configuration_path).to be == File.join(root, "application.rb")
+		expect(evaluator.configuration_path).to be == configuration_path
 	end
 
 	it "rejects unsupported configuration extensions" do
@@ -70,7 +72,7 @@
 
 	it "fails when no configuration exists" do
 		expect do
-			evaluator.resolved_configuration_path
+			evaluator.configuration_path
 		end.to raise_exception(ArgumentError, message: be(:include?, "Could not find"))
 	end
 end