lib/multi_mime/adapters/mimemagic.rb in multi_mime-0.0.2 vs lib/multi_mime/adapters/mimemagic.rb in multi_mime-0.0.3

- old
+ new

@@ -1,35 +1,25 @@ -require "mimemagic" unless defined?(::Mimemagic) -require "multi_mime/adapter" -require "multi_mime/null_type" +require 'multi_mime/adapter' module MultiMime module Adapters - # Use the Mimemagic library class Mimemagic < Adapter - - # - def type_for(mime_type, opts={}) + def type_for(mime_type, opts = {}) type = ::MimeMagic::EXTENSIONS.key(mime_type) # Mimemagic actually doesnt allow you to simply verify that a mime type exists type ? mime_type : MultiMime::NullType.new end - # - def type_for_extension(extension, opts={}) + def type_for_extension(extension, opts = {}) ::MimeMagic.by_extension(extension) || MultiMime::NullType.new end - # - def type_for_path(path, opts={}) + def type_for_path(path, opts = {}) type_for_extension(File.extname(path)) end - # - def type_for_file(file, opts={}) + def type_for_file(file, opts = {}) type_for_extension(File.extname(file)) end - end - end -end \ No newline at end of file +end