@@ -536,9 +536,7 @@ Run `rake gems:install` to install the missing gems. end def initialize_metal - Dir["#{configuration.root_path}/app/metal/*.rb"].each do |file| - configuration.middleware.use(File.basename(file, '.rb').camelize) - end + configuration.middleware.use Rails::Rack::Metal end # Initializes framework-specific settings for each of the loaded frameworks railties/lib/initializer.rb @@ -1,21 +1,17 @@ module Rails module Rack class Metal + def self.new(app) + apps = Dir["#{Rails.root}/app/metal/*.rb"].map do |file| + File.basename(file, '.rb').camelize.constantize + end + apps << app + ::Rack::Cascade.new(apps) + end + NotFound = lambda { |env| [404, {"Content-Type" => "text/html"}, "Not Found"] } - - def self.call(env) - new(NotFound).call(env) - end - - def initialize(app) - @app = app - end - - def call(env) - @app.call(env) - end end end end railties/lib/rails/rack/metal.rb @@ -1,12 +1,12 @@ # Allow the metal piece to run in isolation require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails) -class <%= class_name %> < Rails::Rack::Metal - def call(env) +class <%= class_name %> + def self.call(env) if env["PATH_INFO"] =~ /^\/<%= file_name %>/ - [200, {"Content-Type" => "text/html"}, "Hello, World!"] + [200, {"Content-Type" => "text/html"}, ["Hello, World!"]] else - super + [404, {"Content-Type" => "text/html"}, ["Not Found"]] end end end railties/lib/rails_generator/generators/components/metal/templates/metal.rb 97a178bfa4d5101dca73ae931cc9c77385d8c97e Joshua Peek josh josh@joshpeek.com http://github.com/rails/rails/commit/61a41154f7d50099da371e0d2f22fd25ab9113c2 61a41154f7d50099da371e0d2f22fd25ab9113c2 2008-12-17T07:53:56-08:00 2008-12-17T07:53:56-08:00 Make generated Metal bits a pure rack endpoint application (not middleware) Instead of calling super to pass the request on, return a 404. The modified app looks like this: # app/metal/poller.rb class Poller def self.call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "text/html"}, "Hello, World!"] else [404, {"Content-Type" => "text/html"}, "Not Found"] end end end But you aren't locked in to just Rails: # app/metal/api.rb require 'sinatra' Sinatra::Application.default_options.merge!(:run => false, :env => :production) Api = Sinatra.application unless defined? Api get '/interesting/new/ideas' do 'Hello Sinatra!' end 257314af12fd4b66473752159b14e288af9864ee Joshua Peek josh josh@joshpeek.com