Inline mime type lookup into blob helper

sheabunge · Aug 20, 2012 · b85aeaa · b85aeaa
1 parent 64f3509
commit b85aeaa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 67 deletions.
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
@@ -32,7 +32,10 @@ def extname
     #
     # Returns a mime type String.
     def mime_type
-      @mime_type ||= Mime.mime_for(extname.to_s)
+      @mime_type ||= begin
+        mime_type = Mime.lookup_mime_type_for(extname.to_s)
+        mime_type ? mime_type.to_s : 'text/plain'
+      end
     end
 
     # Public: Get the Content-Type header value

diff --git a/lib/linguist/mime.rb b/lib/linguist/mime.rb
@@ -3,24 +3,6 @@
 
 module Linguist
   module Mime
-    # Internal: Look up mime type for extension.
-    #
-    # ext - The extension String. May include leading "."
-    #
-    # Examples
-    #
-    #   Mime.mime_for('.html')
-    #   # => 'text/html'
-    #
-    #   Mime.mime_for('txt')
-    #   # => 'text/plain'
-    #
-    # Return mime type String otherwise falls back to 'text/plain'.
-    def self.mime_for(ext)
-      mime_type = lookup_mime_type_for(ext)
-      mime_type ? mime_type.to_s : 'text/plain'
-    end
-
     # Internal: Lookup mime type for extension or mime type
     #
     # ext_or_mime_type - A file extension ".txt" or mime type "text/plain".

diff --git a/test/test_mime.rb b/test/test_mime.rb