Finish cleaning up rendering stack from views and move assigns evaluation to controller (so plugins and/or controllers can overwrite just one method).

1 files changed, 6 insertions, 8 deletions

diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index df394b0fb0..269340514c 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,10 +1,12 @@
 module ActionView #:nodoc:
   class Template
     class Text < String #:nodoc:
-      def initialize(string, content_type = nil)
+      attr_accessor :mime_type
+
+      def initialize(string, mime_type = nil)
         super(string.to_s)
-        @content_type   = Mime[content_type] || content_type if content_type
-        @content_type ||= Mime::TEXT
+        @mime_type   = Mime[mime_type] || mime_type if mime_type
+        @mime_type ||= Mime::TEXT
       end
 
       def identifier
@@ -19,12 +21,8 @@ module ActionView #:nodoc:
         to_s
       end
 
-      def mime_type
-        @content_type
-      end
-
       def formats
-        [@content_type.to_sym]
+        [@mime_type.to_sym]
       end
 
       def partial?