Rename media_type to mime_type for symmetry with Rack::Mime.mime_type
This commit is contained in:
parent
df210273d4
commit
31bf026087
|
@ -109,20 +109,20 @@ module Sinatra
|
||||||
end
|
end
|
||||||
|
|
||||||
# Look up a media type by file extension in Rack's mime registry.
|
# Look up a media type by file extension in Rack's mime registry.
|
||||||
def media_type(type)
|
def mime_type(type)
|
||||||
Base.media_type(type)
|
Base.mime_type(type)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Set the Content-Type of the response body given a media type or file
|
# Set the Content-Type of the response body given a media type or file
|
||||||
# extension.
|
# extension.
|
||||||
def content_type(type, params={})
|
def content_type(type, params={})
|
||||||
media_type = self.media_type(type)
|
mime_type = self.mime_type(type)
|
||||||
fail "Unknown media type: %p" % type if media_type.nil?
|
fail "Unknown media type: %p" % type if mime_type.nil?
|
||||||
if params.any?
|
if params.any?
|
||||||
params = params.collect { |kv| "%s=%s" % kv }.join(', ')
|
params = params.collect { |kv| "%s=%s" % kv }.join(', ')
|
||||||
response['Content-Type'] = [media_type, params].join(";")
|
response['Content-Type'] = [mime_type, params].join(";")
|
||||||
else
|
else
|
||||||
response['Content-Type'] = media_type
|
response['Content-Type'] = mime_type
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -141,8 +141,8 @@ module Sinatra
|
||||||
stat = File.stat(path)
|
stat = File.stat(path)
|
||||||
last_modified stat.mtime
|
last_modified stat.mtime
|
||||||
|
|
||||||
content_type media_type(opts[:type]) ||
|
content_type mime_type(opts[:type]) ||
|
||||||
media_type(File.extname(path)) ||
|
mime_type(File.extname(path)) ||
|
||||||
response['Content-Type'] ||
|
response['Content-Type'] ||
|
||||||
'application/octet-stream'
|
'application/octet-stream'
|
||||||
|
|
||||||
|
@ -731,7 +731,7 @@ module Sinatra
|
||||||
end
|
end
|
||||||
|
|
||||||
# Look up a media type by file extension in Rack's mime registry.
|
# Look up a media type by file extension in Rack's mime registry.
|
||||||
def media_type(type)
|
def mime_type(type)
|
||||||
return type if type.nil? || type.to_s.include?('/')
|
return type if type.nil? || type.to_s.include?('/')
|
||||||
type = ".#{type}" unless type.to_s[0] == ?.
|
type = ".#{type}" unless type.to_s[0] == ?.
|
||||||
Rack::Mime.mime_type(type, nil)
|
Rack::Mime.mime_type(type, nil)
|
||||||
|
@ -769,7 +769,7 @@ module Sinatra
|
||||||
|
|
||||||
def provides(*types)
|
def provides(*types)
|
||||||
types = [types] unless types.kind_of? Array
|
types = [types] unless types.kind_of? Array
|
||||||
types.map!{|t| media_type(t)}
|
types.map!{|t| mime_type(t)}
|
||||||
|
|
||||||
condition {
|
condition {
|
||||||
matching_types = (request.accept & types)
|
matching_types = (request.accept & types)
|
||||||
|
|
|
@ -207,26 +207,26 @@ class HelpersTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'media_type' do
|
describe 'mime_type' do
|
||||||
include Sinatra::Helpers
|
include Sinatra::Helpers
|
||||||
|
|
||||||
it "looks up media types in Rack's MIME registry" do
|
it "looks up mime types in Rack's MIME registry" do
|
||||||
Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
|
Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
|
||||||
assert_equal 'application/foo', media_type('foo')
|
assert_equal 'application/foo', mime_type('foo')
|
||||||
assert_equal 'application/foo', media_type('.foo')
|
assert_equal 'application/foo', mime_type('.foo')
|
||||||
assert_equal 'application/foo', media_type(:foo)
|
assert_equal 'application/foo', mime_type(:foo)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nil when given nil' do
|
it 'returns nil when given nil' do
|
||||||
assert media_type(nil).nil?
|
assert mime_type(nil).nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nil when media type not registered' do
|
it 'returns nil when media type not registered' do
|
||||||
assert media_type(:bizzle).nil?
|
assert mime_type(:bizzle).nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns the argument when given a media type string' do
|
it 'returns the argument when given a media type string' do
|
||||||
assert_equal 'text/plain', media_type('text/plain')
|
assert_equal 'text/plain', mime_type('text/plain')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue