diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-03-30 13:33:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-30 13:33:52 -0700 |
commit | 2bf55179813190f2a79509383e21c2b43e72f4c2 (patch) | |
tree | 220eca9ebaa2e54df78eb1d4430ab8fbc39dcddc /actionview/lib/action_view/renderer/template_renderer.rb | |
parent | 197fe2222e553354823fd7685e9d174281e33c3c (diff) | |
parent | c7820d8124c854760a4d288334f185de2fb99446 (diff) | |
download | rails-2bf55179813190f2a79509383e21c2b43e72f4c2.tar.gz rails-2bf55179813190f2a79509383e21c2b43e72f4c2.tar.bz2 rails-2bf55179813190f2a79509383e21c2b43e72f4c2.zip |
Merge pull request #35688 from jhawthorn/render_file_rfc
RFC: Introduce Template::File
Diffstat (limited to 'actionview/lib/action_view/renderer/template_renderer.rb')
-rw-r--r-- | actionview/lib/action_view/renderer/template_renderer.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index 9548fe12c4..60cb2ceafa 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -26,7 +26,12 @@ module ActionView elsif options.key?(:html) Template::HTML.new(options[:html], formats.first) elsif options.key?(:file) - @lookup_context.with_fallbacks.find_file(options[:file], nil, false, keys, @details) + if File.exist?(options[:file]) + Template::File.new(options[:file]) + else + ActiveSupport::Deprecation.warn "render file: should be given the absolute path to a file" + @lookup_context.with_fallbacks.find_file(options[:file], nil, false, keys, @details) + end elsif options.key?(:inline) handler = Template.handler_for_extension(options[:type] || "erb") format = if handler.respond_to?(:default_format) |