提交 618d5317 编写于 作者: C Carlos Antonio da Silva

Move the null mime type to request.format

TLDR: always return an object that responds to the query methods from
request.format, and do not touch Mime::Type[] lookup to avoid bugs.

---

Long version:

The initial issue was about being able to do checks like
request.format.html? for request with an unknown format, where
request.format would be nil.

This is where the issue came from at first in #7837 and #8085
(merged in cba05887), but the
implementation went down the path of adding this to the mime type
lookup logic.

This unfortunately introduced subtle bugs, for instance in the merged
commit a test related to send_file had to be changed to accomodate the
introduction of the NullType.

Later another bug was found in #13064, related to the content-type being
shown as #<Mime::NullType:...> for templates with localized extensions
but no format included. This one was fixed in #13133, merged in
43962d6e.

Besides that, custom handlers were not receiving the proper template
formats anymore when passing through the rendering process, because of
the NullType addition. That was found while migrating an application
from 3.2 to 4.0 that uses the Markerb gem (a custom handler that
generates both text and html emails from a markdown template).

---

This changes the implementation moving away from returning this null
object from the mime lookup, and still fixes the initial issue where
request.format.zomg? would raise an exception for unknown formats due to
request.format being nil.
上级 ed334d9a
......@@ -82,14 +82,15 @@
*Łukasz Strzałkowski*
* Fix header `Content-Type: #<Mime::NullType:...>` in localized template.
* Fix render of localized templates without an explicit format using wrong
content header and not passing correct formats to template due to the
introduction of the `NullType` for mimes.
When localized template has no format in the template name,
the response now has the default and correct `content-type`.
Templates like `hello.it.erb` were subject to this issue.
Fixes #13064.
*Angelo Capilleri*
*Angelo Capilleri*, *Carlos Antonio da Silva*
* Try to escape each part of a url correctly when using a redirect route.
......
......@@ -22,7 +22,7 @@ module Rendering
def render(*args, &block)
options = _normalize_render(*args, &block)
self.response_body = render_to_body(options)
_process_format(rendered_format)
_process_format(rendered_format) if rendered_format
self.response_body
end
......
......@@ -34,8 +34,7 @@ def render_to_body(options = {})
def _process_format(format)
super
# format is a Mime::NullType instance here then this condition can't be changed to `if format`
self.content_type ||= format.to_s unless format.nil?
self.content_type ||= format.to_s
end
# Normalize arguments by catching blocks and setting them on :update.
......
......@@ -50,7 +50,7 @@ def accepts
# GET /posts/5 | request.format => Mime::HTML or MIME::JS, or request.accepts.first
#
def format(view_path = [])
formats.first
formats.first || Mime::NullType.instance
end
def formats
......
......@@ -28,7 +28,7 @@ def #{method}(*)
class << self
def [](type)
return type if type.is_a?(Type)
Type.lookup_by_extension(type) || NullType.instance
Type.lookup_by_extension(type)
end
def fetch(type)
......
......@@ -144,7 +144,7 @@ def test_send_file_headers_with_bad_symbol
}
@controller.headers = {}
assert !@controller.send(:send_file_headers!, options)
assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
end
def test_send_file_headers_guess_type_from_extension
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册