Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 62 insertions, 46 deletions

diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index ed34c46aed..e132d4fdbb 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -1,62 +1,78 @@
 module ActionController
   module Renderer
+    extend ActiveSupport::Concern
+
     depends_on AbstractController::Renderer
-    
-    def initialize(*)
-      self.formats = [:html]
+
+    def process_action(*)
+      self.formats = request.formats.map {|x| x.to_sym}
       super
     end
-    
-    def render(action, options = {})
-      # TODO: Move this into #render_to_body
-      if action.is_a?(Hash)
-        options, action = action, nil 
-      else
-        options.merge! :action => action
+
+    def render(options)
+      super
+      options[:_template] ||= _action_view._partial
+      self.content_type ||= begin
+        mime = options[:_template].mime_type
+        formats.include?(mime && mime.to_sym) || formats.include?(:all) ? mime : Mime::Type.lookup_by_extension(formats.first)
       end
-      
-      _process_options(options)
-      
-      self.response_body = render_to_body(options)
+      response_body
     end
 
     def render_to_body(options)
-      unless options.is_a?(Hash)
-        options = {:action => options}
-      end
+      _process_options(options)
 
-      if options.key?(:text)
-        options[:_template] = ActionView::TextTemplate.new(_text(options))
-        template = nil
-      elsif options.key?(:template)
-        options[:_template_name] = options[:template]
-      elsif options.key?(:action)
-        options[:_template_name] = options[:action].to_s
-        options[:_prefix] = _prefix 
+      if options.key?(:partial)
+        _render_partial(options[:partial], options)
       end
-      
-      super(options)
+
+      super
     end
-    
-  private
-  
-    def _prefix
-      controller_path
-    end  
-  
-    def _text(options)
-      text = options[:text]
-
-      case text
-      when nil then " "
-      else text.to_s
+
+    private
+      def _prefix
+        controller_path
       end
-    end
-  
-    def _process_options(options)
-      if status = options[:status]
-        response.status = status.to_i
+
+      def _determine_template(options)
+        if options.key?(:text)
+          options[:_template] = ActionView::TextTemplate.new(options[:text], formats.first)
+        elsif options.key?(:inline)
+          handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
+          template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
+          options[:_template] = template
+        elsif options.key?(:template)
+          options[:_template_name] = options[:template]
+        elsif options.key?(:file)
+          options[:_template_name] = options[:file]
+        elsif !options.key?(:partial)
+          options[:_template_name] = (options[:action] || action_name).to_s
+          options[:_prefix] = _prefix
+        end
+
+        super
+      end
+
+      def _render_partial(partial, options)
+        case partial
+        when true
+          options[:_prefix] = _prefix
+        when String
+          options[:_prefix] = _prefix unless partial.index('/')
+          options[:_template_name] = partial
+        else
+          options[:_partial_object] = true
+          return
+        end
+
+        options[:_partial] = options[:object] || true
+      end
+
+      def _process_options(options)
+        status, content_type, location = options.values_at(:status, :content_type, :location)
+        self.status = status if status
+        self.content_type = content_type if content_type
+        self.headers["Location"] = url_for(location) if location
       end
-    end
   end
 end