aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-21 20:41:25 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-21 20:41:25 -0600
commit1de95077dc3bfc7589ca85dc31d46a1ea6db7650 (patch)
tree1d59980c564e7f917bddc4d5768c1544e971c596 /railties/lib/rails/application.rb
parent426348b48403f664cc10e8ec545b640e56c1c090 (diff)
parent2e571e8f99e5e2712c0bc2558df8d62996204b03 (diff)
downloadrails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.gz
rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.bz2
rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.zip
Merge branch 'master' of github.com:rails/rails
Conflicts: railties/test/initializer/initialize_i18n_test.rb railties/test/initializer/path_test.rb
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb29
1 files changed, 11 insertions, 18 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4e21287496..e6f2d30429 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
@@ -64,6 +70,10 @@ module Rails
self.class.config
end
+ class << self
+ alias configure class_eval
+ end
+
def root
config.root
end
@@ -123,23 +133,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