Merge remote-tracking branch 'upstream/master'

1 files changed, 16 insertions, 11 deletions

diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 60c527beeb..c0936441ac 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -11,15 +11,22 @@ module ActionView
       raise NotImplementedError
     end
 
-    # Checks if the given path contains a format and if so, change
-    # the lookup context to take this new format into account.
-    def wrap_formats(value)
-      return yield unless value.is_a?(String)
-
-      if value.sub!(formats_regexp, "")
-        update_details(:formats => [$1.to_sym]){ yield }
-      else
-        yield
+    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. " \
+          "Please pass render with :formats => [:#{$1}] instead.", caller
+        details[:formats] ||= [$1.to_sym]
       end
     end
 
@@ -27,8 +34,6 @@ module ActionView
       @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
     end
 
-    protected
-
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end