diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-02 18:59:22 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-02 18:59:22 -0700 |
| commit | 6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9 (patch) | |
| tree | e12b9e1621ef050d069c77937051ee51d9fa0ff8 /railties | |
| parent | 0a507925cfc54246dc7d329936f60f8f410c38b6 (diff) | |
| parent | 26fe77b27dac099241f73e35d9dda896ca08dc1b (diff) | |
| download | rails-6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9.tar.gz rails-6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9.tar.bz2 rails-6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9.zip | |
Merge pull request #7825 from sikachu/master-rails-pathname
Make Rails.public_path return a Pathname
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/lib/rails.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 8c2b64d543..a422c5fe39 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* `Rails.public_path` now returns a Pathname object. *Prem Sichanugrist* + * Remove highly uncommon `config.assets.manifest` option for moving the manifest path. This option is now unsupported in sprockets-rails. diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index a15965a9da..d7e22cc839 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -127,7 +127,7 @@ module Rails end def public_path - application && application.paths["public"].first + application && Pathname.new(application.paths["public"].first) end end end diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index d8d022c265..ac41e01616 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -139,6 +139,14 @@ module ApplicationTests assert_instance_of Pathname, Rails.root end + test "Rails.public_path should be a Pathname" do + add_to_config <<-RUBY + config.paths["public"] = "somewhere" + RUBY + require "#{app_path}/config/environment" + assert_instance_of Pathname, Rails.public_path + end + test "initialize an eager loaded, cache classes app" do add_to_config <<-RUBY config.eager_load = true @@ -227,7 +235,7 @@ module ApplicationTests RUBY require "#{app_path}/config/application" - assert_equal File.join(app_path, "somewhere"), Rails.public_path + assert_equal Pathname.new(app_path).join("somewhere"), Rails.public_path end test "config.secret_token is sent in env" do |