From dfbd3b94094d54483a47faa9d927370df476f572 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 25 Sep 2009 21:40:55 -0500
Subject: Extract "parse_config" into AD

---
 railties/lib/rails/application.rb     | 16 ----------------
 railties/lib/rails/commands/server.rb | 14 +-------------
 2 files changed, 1 insertion(+), 29 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 7b50d2622e..d762689794 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -2,22 +2,6 @@ require 'action_controller'
 
 module Rails
   class Application
-    def self.load(path, options = {})
-      config = options[:config] || 'config.ru'
-      config = File.join(path, config)
-
-      if config =~ /\.ru$/
-        cfgfile = File.read(config)
-        if cfgfile[/^#\\(.*)/]
-          opts.parse!($1.split(/\s+/))
-        end
-        inner_app = eval("::Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config)
-      else
-        require config
-        inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
-      end
-    end
-
     def initialize
       @app = ActionController::Dispatcher.new
     end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 743e5a0b07..25f5a8ada5 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -58,23 +58,11 @@ end
 ENV["RAILS_ENV"] = options[:environment]
 RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
 
-config = options[:config]
-if config =~ /\.ru$/
-  cfgfile = File.read(config)
-  if cfgfile[/^#\\(.*)/]
-    opts.parse!($1.split(/\s+/))
-  end
-  inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config)
-else
-  require config
-  inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
-end
-
 app = Rack::Builder.new {
   use Rails::Rack::LogTailer unless options[:detach]
   use Rails::Rack::Debugger if options[:debugger]
   use Rails::Rack::Static
-  run inner_app
+  run ActionDispatch::Utils.parse_config(options[:config])
 }.to_app
 
 puts "=> Call with -d to detach"
-- 
cgit v1.2.3