aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/text.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-06-15 17:17:21 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-08-28 10:51:04 +0200
commitf21a528f5508430bf9281dffe938bda6c9fbd84b (patch)
tree97bc6a92f13eb04b3eb4bb4f91264137f271cbdc /actionpack/lib/action_view/template/text.rb
parent7abc0c73bdaa004948f89336b0c4dfeb1f357269 (diff)
downloadrails-f21a528f5508430bf9281dffe938bda6c9fbd84b.tar.gz
rails-f21a528f5508430bf9281dffe938bda6c9fbd84b.tar.bz2
rails-f21a528f5508430bf9281dffe938bda6c9fbd84b.zip
Remove Mime::Type translations from Action View
Action View should not be responsible for translating mime types. Any translation that's needed should be handled at controller level.
Diffstat (limited to 'actionpack/lib/action_view/template/text.rb')
-rw-r--r--actionpack/lib/action_view/template/text.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 3af76dfcdb..b629faaa9a 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -2,12 +2,11 @@ module ActionView #:nodoc:
# = Action View Text Template
class Template
class Text #:nodoc:
- attr_accessor :mime_type
+ attr_accessor :type
- def initialize(string, mime_type = nil)
- @string = string.to_s
- @mime_type = Mime[mime_type] || mime_type if mime_type
- @mime_type ||= Mime::TEXT
+ def initialize(string, type = nil)
+ @string = string.to_s
+ @type = type || :text
end
def identifier
@@ -27,7 +26,7 @@ module ActionView #:nodoc:
end
def formats
- [@mime_type.to_sym]
+ [@type.to_sym]
end
end
end