diff options
author | Carl Lerche <carllerche@mac.com> | 2009-10-16 12:49:39 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-10-16 12:51:02 -0700 |
commit | 2110a524a4913815d036786aa01319fd67db0ee2 (patch) | |
tree | f87858a81ac61642827c0617cad9eeceb44e8707 /railties/lib/rails/configuration.rb | |
parent | 6094e6516951444f8c3d6bb31f171af9fe96a02f (diff) | |
download | rails-2110a524a4913815d036786aa01319fd67db0ee2.tar.gz rails-2110a524a4913815d036786aa01319fd67db0ee2.tar.bz2 rails-2110a524a4913815d036786aa01319fd67db0ee2.zip |
Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the application's object root)
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r-- | railties/lib/rails/configuration.rb | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 3cb39245ff..ce9c899400 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -34,37 +34,25 @@ module Rails def root @root ||= begin - if defined?(RAILS_ROOT) - root = RAILS_ROOT - else - call_stack = caller.map { |p| p.split(':').first } - root_path = call_stack.detect { |p| p !~ %r[railties/lib/rails] } - root_path = File.dirname(root_path) - - while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/config.ru") - parent = File.dirname(root_path) - root_path = parent != root_path && parent - end - - Object.class_eval("RAILS_ROOT = ''") + call_stack = caller.map { |p| p.split(':').first } + root_path = call_stack.detect { |p| p !~ %r[railties/lib/rails] } + root_path = File.dirname(root_path) - root = File.exist?("#{root_path}/config.ru") ? root_path : Dir.pwd + while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/config.ru") + parent = File.dirname(root_path) + root_path = parent != root_path && parent end - root = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? - Pathname.new(root).expand_path.to_s : - Pathname.new(root).realpath.to_s + root = File.exist?("#{root_path}/config.ru") ? root_path : Dir.pwd - # TODO: Remove RAILS_ROOT - RAILS_ROOT.replace(root) - root + RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? + Pathname.new(root).expand_path : + Pathname.new(root).realpath end end def root=(root) - Object.class_eval("RAILS_ROOT = ''") unless defined?(RAILS_ROOT) - RAILS_ROOT.replace(root) - @root = root + @root = Pathname.new(root).expand_path end def paths |