aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderer/abstract_renderer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/renderer/abstract_renderer.rb')
-rw-r--r--actionpack/lib/action_view/renderer/abstract_renderer.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index c0936441ac..a588abcee3 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -12,27 +12,15 @@ 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)
+ details[key] = Array(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. " \
- "Please pass render with :formats => [:#{$1}] instead.", caller
- details[:formats] ||= [$1.to_sym]
- end
- end
-
- def formats_regexp
- @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
- end
def instrument(name, options={})
ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }