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, 21 insertions, 24 deletions

diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb
index a8e0809ac6..727358c394 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/actionpack/lib/action_controller/new_base/layouts.rb
@@ -1,37 +1,34 @@
 module ActionController
   module Layouts
+    extend ActiveSupport::Concern
+
     depends_on ActionController::Renderer
     depends_on AbstractController::Layouts
-    
+
     module ClassMethods
       def _implied_layout_name
         controller_path
       end
     end
-    
-    def render_to_body(options)
-      # render :text => ..., :layout => ...
-      # or
-      # render :anything_else
-      if !options.key?(:text) || options.key?(:layout)
-        options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout
+
+    private
+      def _determine_template(options)
+        super
+        if (!options.key?(:text) && !options.key?(:inline) && !options.key?(:partial)) || options.key?(:layout)
+          options[:_layout] = _layout_for_option(options.key?(:layout) ? options[:layout] : :none, options[:_template].details)
+        end
       end
-      
-      super
-    end
-    
-  private
-  
-    def _layout_for_option(name)
-      case name
-      when String     then _layout_for_name(name)
-      when true       then _default_layout(true)
-      when false, nil then nil
-      else
-        raise ArgumentError, 
-          "String, true, or false, expected for `layout'; you passed #{name.inspect}"        
+
+      def _layout_for_option(name, details)
+        case name
+        when String     then _layout_for_name(name, details)
+        when true       then _default_layout(true, details)
+        when :none      then _default_layout(false, details)
+        when false, nil then nil
+        else
+          raise ArgumentError,
+            "String, true, or false, expected for `layout'; you passed #{name.inspect}"
+        end
       end
-    end
-    
   end
 end