From 630dca515a16b23ecf2e14b909f5491361b6f41d Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 20 Aug 2012 11:11:42 -0500 Subject: [PATCH] Trim down mime type overrides that are old or now pushed upstream Related #206 --- lib/linguist/mimes.yml | 26 +------------------------- test/test_blob.rb | 5 +++-- test/test_mime.rb | 11 ----------- 3 files changed, 4 insertions(+), 38 deletions(-) diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml index 1b2ce0a5..a410f4b2 100644 --- a/lib/linguist/mimes.yml +++ b/lib/linguist/mimes.yml @@ -23,40 +23,16 @@ # Any additions or modifications (even trivial) should have corresponding # test change in `test/test_mime.rb`. -# TODO: Lookup actual types -application/octet-stream @a,blend,gem,graffle,ipa,lib,mcz,nib,o,ogv,otf,pfx,pigx,plgx,psd,sib,spl,sqlite3,swc,ucode,xpi - # Please keep this list alphabetized application/java-archive @ear,war -application/netcdf :8bit -application/ogg @ogg -application/postscript :base64 -application/vnd.adobe.air-application-installer-package+zip @air -application/vnd.mozilla.xul+xml :8bit -application/vnd.oasis.opendocument.presentation @odp -application/vnd.oasis.opendocument.spreadsheet @ods -application/vnd.oasis.opendocument.text @odt -application/vnd.openofficeorg.extension @oxt -application/vnd.openxmlformats-officedocument.presentationml.presentation @pptx +application/octet-stream @o application/x-chrome-extension @crx -application/x-iwork-keynote-sffkey @key -application/x-iwork-numbers-sffnumbers @numbers -application/x-iwork-pages-sffpages @pages -application/x-ms-xbap @xbap :8bit -application/x-parrot-bytecode @pbc -application/x-shockwave-flash @swf -application/x-silverlight-app @xap application/x-supercollider @sc :8bit -application/x-troff-ms :8bit -application/x-wais-source :8bit -application/xaml+xml @xaml :8bit application/xslt+xml @xslt :8bit image/x-icns @icns text/cache-manifest @manifest text/plain @cu,cxx text/x-logtalk @lgt -text/x-nemerle @n text/x-nimrod @nim text/x-ocaml @ml,mli,mll,mly,sig,sml -text/x-rust @rs,rc text/x-scheme @rkt,scm,sls,sps,ss diff --git a/test/test_blob.rb b/test/test_blob.rb index c8f103ee..8dcce3d9 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -31,18 +31,18 @@ class TestBlob < Test::Unit::TestCase def test_mime_type assert_equal "application/octet-stream", blob("Binary/dog.o").mime_type - assert_equal "application/ogg", blob("Binary/foo.ogg").mime_type assert_equal "application/postscript", blob("Binary/octocat.ai").mime_type assert_equal "application/x-ruby", blob("Ruby/grit.rb").mime_type assert_equal "application/x-sh", blob("Shell/script.sh").mime_type assert_equal "application/xml", blob("XML/bar.xml").mime_type + assert_equal "audio/ogg", blob("Binary/foo.ogg").mime_type assert_equal "text/plain", blob("Text/README").mime_type end def test_content_type assert_equal "application/octet-stream", blob("Binary/dog.o").content_type - assert_equal "application/ogg", blob("Binary/foo.ogg").content_type assert_equal "application/pdf", blob("Binary/foo.pdf").content_type + assert_equal "audio/ogg", blob("Binary/foo.ogg").content_type assert_equal "image/png", blob("Binary/foo.png").content_type assert_equal "text/plain; charset=iso-8859-2", blob("Text/README").content_type end @@ -268,6 +268,7 @@ class TestBlob < Test::Unit::TestCase def test_language Samples.each do |sample| blob = blob(sample[:path]) + assert blob.language, "No language for #{sample[:path]}" assert_equal sample[:language], blob.language.name, blob.name end end diff --git a/test/test_mime.rb b/test/test_mime.rb index b18a6600..8c0f1d1d 100644 --- a/test/test_mime.rb +++ b/test/test_mime.rb @@ -18,7 +18,6 @@ class TestMime < Test::Unit::TestCase assert_equal 'application/octet-stream', Mime.mime_for('.dll') assert_equal 'application/octet-stream', Mime.mime_for('.dmg') assert_equal 'application/octet-stream', Mime.mime_for('.exe') - assert_equal 'application/ogg', Mime.mime_for('.ogg') assert_equal 'application/postscript', Mime.mime_for('.ai') assert_equal 'application/postscript', Mime.mime_for('.eps') assert_equal 'application/postscript', Mime.mime_for('.ps') @@ -26,27 +25,20 @@ class TestMime < Test::Unit::TestCase assert_equal 'application/vnd.oasis.opendocument.presentation', Mime.mime_for('.odp') assert_equal 'application/vnd.oasis.opendocument.spreadsheet', Mime.mime_for('.ods') assert_equal 'application/vnd.oasis.opendocument.text', Mime.mime_for('.odt') - assert_equal 'application/vnd.openofficeorg.extension', Mime.mime_for('.oxt') assert_equal 'application/vnd.openxmlformats-officedocument.presentationml.presentation', Mime.mime_for('.pptx') assert_equal 'application/x-chrome-extension', Mime.mime_for('.crx') assert_equal 'application/x-debian-package', Mime.mime_for('.deb') - assert_equal 'application/x-iwork-keynote-sffkey', Mime.mime_for('.key') - assert_equal 'application/x-iwork-numbers-sffnumbers', Mime.mime_for('.numbers') - assert_equal 'application/x-iwork-pages-sffpages', Mime.mime_for('.pages') assert_equal 'application/x-java-archive', Mime.mime_for('.ear') assert_equal 'application/x-java-archive', Mime.mime_for('.jar') assert_equal 'application/x-java-archive', Mime.mime_for('.war') assert_equal 'application/x-latex', Mime.mime_for('.latex') - assert_equal 'application/x-ms-xbap', Mime.mime_for('.xbap') assert_equal 'application/x-perl', Mime.mime_for('.pl') assert_equal 'application/x-perl', Mime.mime_for('.pm') assert_equal 'application/x-python', Mime.mime_for('.py') assert_equal 'application/x-ruby', Mime.mime_for('.rb') assert_equal 'application/x-sh', Mime.mime_for('.sh') assert_equal 'application/x-shockwave-flash', Mime.mime_for('.swf') - assert_equal 'application/x-silverlight-app', Mime.mime_for('.xap') assert_equal 'application/x-supercollider', Mime.mime_for('.sc') - assert_equal 'application/xaml+xml', Mime.mime_for('.xaml') assert_equal 'text/cache-manifest', Mime.mime_for('.manifest') assert_equal 'text/html', Mime.mime_for('.html') assert_equal 'text/plain', Mime.mime_for('.c') @@ -59,13 +51,10 @@ class TestMime < Test::Unit::TestCase assert_equal 'text/plain', Mime.mime_for('.hpp') assert_equal 'text/plain', Mime.mime_for('.kt') assert_equal 'text/x-logtalk', Mime.mime_for('.lgt') - assert_equal 'text/x-nemerle', Mime.mime_for('.n') assert_equal 'text/x-nimrod', Mime.mime_for('.nim') assert_equal 'text/x-ocaml', Mime.mime_for('.ml') assert_equal 'text/x-ocaml', Mime.mime_for('.sig') assert_equal 'text/x-ocaml', Mime.mime_for('.sml') - assert_equal 'text/x-rust', Mime.mime_for('.rc') - assert_equal 'text/x-rust', Mime.mime_for('.rs') assert_equal 'video/quicktime', Mime.mime_for('.mov') end end