kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove default argument, and extract internal convenience method

Browse source
This commit is contained in:
Jon Moss 2016-08-29 17:57:40 -04:00
parent bed91f8421
commit 92f8b99ff7
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
actionpack/lib/action_dispatch/http/response.rb
View file

@ -226,7 +226,7 @@ module ActionDispatch # :nodoc:
def content_type=(content_type)
return unless content_type
new_header_info = parse_content_type(content_type.to_s)
prev_header_info = parse_content_type(get_header(CONTENT_TYPE))
prev_header_info = parsed_content_type_header
set_content_type new_header_info.mime_type, new_header_info.charset || prev_header_info.charset || self.class.default_charset
end
@ -240,7 +240,7 @@ module ActionDispatch # :nodoc:
# information.
def content_type
parse_content_type.mime_type
parsed_content_type_header.mime_type
end
def sending_file=(v)
@ -255,7 +255,7 @@ module ActionDispatch # :nodoc:
# response.charset = 'utf-16' # => 'utf-16'
# response.charset = nil # => 'utf-8'
def charset=(charset)
header_info = parse_content_type
header_info = parsed_content_type_header
if false == charset
set_header CONTENT_TYPE, header_info.mime_type
else
@ -267,7 +267,7 @@ module ActionDispatch # :nodoc:
# The charset of the response. HTML wants to know the encoding of the
# content you're giving them, so we need to send that along.
def charset
header_info = parse_content_type
header_info = parsed_content_type_header
header_info.charset || self.class.default_charset
end
@ -405,7 +405,7 @@ module ActionDispatch # :nodoc:
ContentTypeHeader = Struct.new :mime_type, :charset
NullContentTypeHeader = ContentTypeHeader.new nil, nil
def parse_content_type(content_type = get_header(CONTENT_TYPE))
def parse_content_type(content_type)
if content_type
type, charset = content_type.split(/;\s*charset=/)
type = nil if type.empty?
@ -415,6 +415,12 @@ module ActionDispatch # :nodoc:
end
end
# Small internal convenience method to get the parsed version of the current
# content type header.
def parsed_content_type_header
parse_content_type(get_header(CONTENT_TYPE))
end
def set_content_type(content_type, charset)
type = (content_type || "").dup
type << "; charset=#{charset}" if charset
@ -451,7 +457,7 @@ module ActionDispatch # :nodoc:
def assign_default_content_type_and_charset!
return if content_type
ct = parse_content_type
ct = parsed_content_type_header
set_content_type(ct.mime_type || Mime[:html].to_s,
ct.charset || self.class.default_charset)
end