diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-12-22 00:38:56 -0800 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-12-22 00:38:56 -0800 |
commit | cba05887dc3b56a46a9fe2779b6b228880b49622 (patch) | |
tree | 3738f1782d020e8670c1d9a348593e5ae7cc796c /actionpack/lib/action_dispatch | |
parent | 8a39d8331114c73805d5ce989a72763d23bc55b1 (diff) | |
parent | c2267db383fb42e2e3c2abdbd58be6638908fb0f (diff) | |
download | rails-cba05887dc3b56a46a9fe2779b6b228880b49622.tar.gz rails-cba05887dc3b56a46a9fe2779b6b228880b49622.tar.bz2 rails-cba05887dc3b56a46a9fe2779b6b228880b49622.zip |
Merge pull request #8085 from acapilleri/format_never_nil
if format is unknown NullMimeTypeObject is returned
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index f56f09c5b3..912da741b7 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -27,7 +27,7 @@ module Mime class << self def [](type) return type if type.is_a?(Type) - Type.lookup_by_extension(type) + Type.lookup_by_extension(type) || NullType.new end def fetch(type) @@ -306,6 +306,17 @@ module Mime method.to_s.ends_with? '?' end end + + class NullType + def nil? + true + end + + private + def method_missing(method, *args) + false if method.to_s.ends_with? '?' + end + end end require 'action_dispatch/http/mime_types' |