@@ -21,7 +21,7 @@ module Rack def self.for(name, options={}) case name.to_sym when :rails - Rails.new(options.merge(:root => options[:chdir])) + return Rails.new(options.merge(:root => options[:chdir])) when :ramaze require "#{options[:chdir]}/start" @@ -29,20 +29,26 @@ module Rack Ramaze.trait[:essentials].delete Ramaze::Adapter Ramaze.start :force => true - Ramaze::Adapter::Base + return Ramaze::Adapter::Base - # FIXME not working, halp! halp! - # when :merb - # require 'merb' - # require "#{options[:chdir]}/config/init.rb" - # Merb::BootLoader.run - # Merb::Rack::Application.new + when :merb + require 'merb-core' + + Merb::Config.setup(:merb_root => options[:chdir], + :environment => options[:environment]) + Merb.environment = Merb::Config[:environment] + Merb.root = Merb::Config[:merb_root] + Merb::BootLoader.run + + return Merb::Rack::Application.new when :halcyon require 'halcyon' + $:.unshift(Halcyon.root/'lib') Halcyon::Runner.load_config Halcyon.root/'config'/'config.yml' - Halcyon::Runner.new + + return Halcyon::Runner.new else raise AdapterNotFound, "Adapter not found: #{name}" lib/rack/adapter/loader.rb 1d1faea0401103e2d16cfb38b19d7fd133053cb5 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/0284f81987798e3c73b04a729e30b32592e6a49f 0284f81987798e3c73b04a729e30b32592e6a49f 2008-04-02T18:59:36-07:00 2008-04-02T18:59:36-07:00 Fix Merb adapter autoloading, closes #47 5741c10f66b15e005861f7ba7c43bf74587923af macournoyer macournoyer@gmail.com