@@ -1,6 +1,6 @@ *2.3.0 [Edge]* -* Enhanced Rails.root to take parameters that'll be join with the root, like Rails.root('app', 'controllers') => File.join(Rails.root, 'app', 'controllers') #1482 [Damian Janowski] +* Changed Rails.root to return a Pathname object (allows for Rails.root.join('app', 'controllers') => "#{RAILS_ROOT}/app/controllers") #1482 [Damian Janowski/?] * Added view path support for engines [DHH] railties/CHANGELOG @@ -48,8 +48,8 @@ module Rails end end - def root(*args) - File.join(RAILS_ROOT, *args.compact) if defined?(RAILS_ROOT) + def root + Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT) end def env railties/lib/initializer.rb @@ -317,7 +317,7 @@ class RailsRootTest < Test::Unit::TestCase assert_equal RAILS_ROOT, Rails.root end - def test_rails_dot_root_accepts_arguments_for_file_dot_join - assert_equal File.join(RAILS_ROOT, 'app', 'controllers'), Rails.root('app', 'controllers') + def test_rails_dot_root_should_be_a_pathname + assert_equal File.join(RAILS_ROOT, 'app', 'controllers'), Rails.root.join('app', 'controllers') end end \ No newline at end of file railties/test/initializer_test.rb 668872efd85291895d3e68f3a5af312973a1be74 David Heinemeier Hansson david@loudthinking.com http://github.com/rails/rails/commit/be140e8c6be966349c6fa35a87f84d5a73995b9a be140e8c6be966349c6fa35a87f84d5a73995b9a 2008-11-30T13:59:30-08:00 2008-11-30T13:59:30-08:00 Changed Rails.root to return a Pathname object (allows for Rails.root.join("app", "controllers") => "#{RAILS_ROOT}/app/controllers") [#1482] 9c64dcd3e01e7c3e093eaa971217aad7c8e5ae2a David Heinemeier Hansson david@loudthinking.com