From 28e36b279d326a28dc0b0dedb9d564d9d6ceee9b Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 13 May 2011 13:33:04 -0500 Subject: [PATCH] Don't need to support mime fallback --- lib/linguist/blob.rb | 2 +- lib/linguist/mime.rb | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/linguist/blob.rb b/lib/linguist/blob.rb index 755c1352..df1f7429 100644 --- a/lib/linguist/blob.rb +++ b/lib/linguist/blob.rb @@ -15,7 +15,7 @@ module Linguist end def mime_type - Mime.lookup(name.extname, @blob.mime_type) + Mime.lookup(name.extname) end def size diff --git a/lib/linguist/mime.rb b/lib/linguist/mime.rb index 4d028fd8..26bf2cb1 100644 --- a/lib/linguist/mime.rb +++ b/lib/linguist/mime.rb @@ -10,13 +10,11 @@ module Linguist module Mime Special = YAML.load_file(File.expand_path("../special_mime_types.yml", __FILE__)) - def self.lookup(ext, orginal_type = nil) + def self.lookup(ext) ext ||= '' - if orginal_type.nil? - guesses = ::MIME::Types.type_for(ext) - orginal_type = guesses.first ? guesses.first.simplified : 'text/plain' - end + guesses = ::MIME::Types.type_for(ext) + orginal_type = guesses.first ? guesses.first.simplified : 'text/plain' type = Special[orginal_type] || Special[ext.sub(/^\./, '')] ||