Assume utf8 when serving raw text blobs

This commit is contained in:
Joshua Peek
2011-06-23 16:51:03 -05:00
parent bb7722d43a
commit 6f03cfc67c
3 changed files with 11 additions and 11 deletions

View File

@@ -87,7 +87,7 @@ module Linguist
#
# Returns a content type String.
def content_type
@content_type ||= binary? ? mime_type : 'text/plain'
@content_type ||= binary? ? mime_type : 'text/plain; charset=utf8'
end
# Public: Is the path binary?

View File

@@ -35,14 +35,14 @@ class TestBlob < Test::Unit::TestCase
assert_equal "application/octet-stream", blob("dog.o").content_type
assert_equal "application/pdf", blob("foo.pdf").content_type
assert_equal "image/png", blob("foo.png").content_type
assert_equal "text/plain", blob("README").content_type
assert_equal "text/plain", blob("foo.html").content_type
assert_equal "text/plain", blob("foo.pl").content_type
assert_equal "text/plain", blob("foo.py").content_type
assert_equal "text/plain", blob("foo.rb").content_type
assert_equal "text/plain", blob("foo.sh").content_type
assert_equal "text/plain", blob("foo.xhtml").content_type
assert_equal "text/plain", blob("foo.xml").content_type
assert_equal "text/plain; charset=utf8", blob("README").content_type
assert_equal "text/plain; charset=utf8", blob("foo.html").content_type
assert_equal "text/plain; charset=utf8", blob("foo.pl").content_type
assert_equal "text/plain; charset=utf8", blob("foo.py").content_type
assert_equal "text/plain; charset=utf8", blob("foo.rb").content_type
assert_equal "text/plain; charset=utf8", blob("foo.sh").content_type
assert_equal "text/plain; charset=utf8", blob("foo.xhtml").content_type
assert_equal "text/plain; charset=utf8", blob("foo.xml").content_type
end
def test_disposition

View File

@@ -58,8 +58,8 @@ class TestPathname < Test::Unit::TestCase
end
def test_content_type
assert_equal 'text/plain', Pathname.new("file.txt").content_type
assert_equal 'text/plain', Pathname.new("file.rb").content_type
assert_equal 'text/plain; charset=utf8', Pathname.new("file.txt").content_type
assert_equal 'text/plain; charset=utf8', Pathname.new("file.rb").content_type
assert_equal 'image/png', Pathname.new("octocat.png").content_type
end
end