diff options
| author | Nick Sutterer <apotonick@gmail.com> | 2011-09-22 23:51:44 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-09-23 00:36:14 +0200 |
| commit | 2e3eb2560b7686a633d6de35c4cd9131504aee38 (patch) | |
| tree | d9d77ff6e83258279d8a2619257a9aa455aaa4b9 /actionpack/lib/action_view/renderer/abstract_renderer.rb | |
| parent | f8e6664d8647acf11c8f98e00ec5a23326be5d19 (diff) | |
| download | rails-2e3eb2560b7686a633d6de35c4cd9131504aee38.tar.gz rails-2e3eb2560b7686a633d6de35c4cd9131504aee38.tar.bz2 rails-2e3eb2560b7686a633d6de35c4cd9131504aee38.zip | |
Allow both sym and array for details options in #render. using LC#registered_details to extract options.
Diffstat (limited to 'actionpack/lib/action_view/renderer/abstract_renderer.rb')
| -rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 1656cf7ec7..03feeff16c 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -12,7 +12,18 @@ module ActionView end protected - + + def extract_details(options) + details = {} + @lookup_context.registered_details.each do |key| + next unless value = options[key] + details[key] = Array.wrap(value) + end + details + end + + + def extract_format(value, details) if value.is_a?(String) && value.sub!(formats_regexp, "") ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \ |