From b0b4ae970c1cb586235bcfbc669d43475c7fe684 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Mon, 21 Dec 2009 16:03:20 -0800
Subject: test.rb, dev.rb, and production.rb just reopen the Application class;
 no more hax required

---
 railties/lib/rails/application.rb | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'railties/lib/rails/application.rb')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 498fd6a723..d83c65da8d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -9,7 +9,13 @@ module Rails
       end
 
       def new
-        @instance ||= super
+        @instance ||= begin
+          begin
+            require config.environment_path
+          rescue LoadError
+          end
+          super
+        end
       end
 
       def config
@@ -119,23 +125,6 @@ module Rails
       @app.call(env)
     end
 
-
-    # Loads the environment specified by Configuration#environment_path, which
-    # is typically one of development, test, or production.
-    initializer :load_environment do
-      next unless File.file?(config.environment_path)
-
-      config = self.config
-
-      Kernel.class_eval do
-        meth = instance_method(:config) if Object.respond_to?(:config)
-        define_method(:config) { config }
-        require config.environment_path
-        remove_method :config
-        define_method(:config, &meth) if meth
-      end
-    end
-
     # Set the <tt>$LOAD_PATH</tt> based on the value of
     # Configuration#load_paths. Duplicates are removed.
     initializer :set_load_path do
-- 
cgit v1.2.3


From d982fe2b2fcc4e197087901774e2f21467c3cec1 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Mon, 21 Dec 2009 16:35:54 -0800
Subject: Replace reopening the class with App.configure as an alias to
 class_eval

---
 railties/lib/rails/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/lib/rails/application.rb')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d83c65da8d..695a1d7c87 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -66,6 +66,10 @@ module Rails
       self.class.config
     end
 
+    class << self
+      alias configure class_eval
+    end
+
     def root
       config.root
     end
-- 
cgit v1.2.3