lib/wand.rb in wand-0.2.1 vs lib/wand.rb in wand-0.3

- old
+ new

@@ -1,24 +1,22 @@ require 'mime/types' module Wand - Version = '0.2.1' - - def self.wave(path) - type = MIME::Types.type_for(path)[0].to_s + def self.wave(path, options={}) + type = MIME::Types.type_for(options[:original_filename] || path)[0].to_s type = execute_file_cmd(path).split(';')[0].strip if type.nil? || type == '' - type = nil if type =~ /cannot\sopen/ + type = nil if type =~ /^cannot/i type end def self.executable @executable ||= `which file`.chomp end def self.executable=(path) @executable = path end - + def self.execute_file_cmd(path) `#{executable} --mime --brief #{path}` end -end \ No newline at end of file +end