diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-21 12:04:02 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-21 12:04:12 -0700 |
commit | e4ba720c17cb141babfbffec60db34b745fd5637 (patch) | |
tree | 531f5f408d0547b872c330f2ea3824534efa3db0 /actionpack/lib/abstract_controller/collector.rb | |
parent | efc6dd550ee49e7e443f9d72785caa0f240def53 (diff) | |
download | rails-e4ba720c17cb141babfbffec60db34b745fd5637.tar.gz rails-e4ba720c17cb141babfbffec60db34b745fd5637.tar.bz2 rails-e4ba720c17cb141babfbffec60db34b745fd5637.zip |
stop calling deprecated methods
We should be asking the mime type method for the mime objects rather
than via const lookup
Diffstat (limited to 'actionpack/lib/abstract_controller/collector.rb')
-rw-r--r-- | actionpack/lib/abstract_controller/collector.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/collector.rb b/actionpack/lib/abstract_controller/collector.rb index ddd56b354a..3b5128cda5 100644 --- a/actionpack/lib/abstract_controller/collector.rb +++ b/actionpack/lib/abstract_controller/collector.rb @@ -7,7 +7,7 @@ module AbstractController const = sym.upcase class_eval <<-RUBY, __FILE__, __LINE__ + 1 def #{sym}(*args, &block) # def html(*args, &block) - custom(Mime::#{const}, *args, &block) # custom(Mime::HTML, *args, &block) + custom(Mime::Type[:#{const}], *args, &block) # custom(Mime::Type[:HTML], *args, &block) end # end RUBY end @@ -25,7 +25,7 @@ module AbstractController def method_missing(symbol, &block) const_name = symbol.upcase - unless Mime.const_defined?(const_name) + unless Mime::Type.registered?(const_name) raise NoMethodError, "To respond to a custom format, register it as a MIME type first: " \ "http://guides.rubyonrails.org/action_controller_overview.html#restful-downloads. " \ "If you meant to respond to a variant like :tablet or :phone, not a custom format, " \ @@ -33,7 +33,7 @@ module AbstractController "format.html { |html| html.tablet { ... } }" end - mime_constant = Mime.const_get(const_name) + mime_constant = Mime::Type[const_name] if Mime::SET.include?(mime_constant) AbstractController::Collector.generate_method_for_mime(mime_constant) |