From db4c497eeda17ceded39b971bf76c3be25d2b4ee Mon Sep 17 00:00:00 2001 From: Nando Vieira Date: Tue, 28 Sep 2010 15:45:01 -0300 Subject: [PATCH] Make sure Rails.public_path always return a Pathname instance. --- railties/lib/rails.rb | 2 +- railties/test/application/configuration_test.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 3663910..720cc3e 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -92,7 +92,7 @@ module Rails end def public_path - application && application.paths.public.to_a.first + application && Pathname.new(application.paths.public.to_a.first) end end end diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 7403d16..d9b96d5 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -184,7 +184,9 @@ module ApplicationTests RUBY require "#{app_path}/config/application" - assert_equal File.join(app_path, "somewhere"), Rails.public_path + + assert_kind_of Pathname, Rails.public_path + assert_equal File.join(app_path, "somewhere"), Rails.public_path.to_s end test "config.secret_token is sent in env" do -- 1.7.3