Permalink
Browse files

Merge pull request #829 from kir/master

Fix problem with incorrect content_type from `file` command
  • Loading branch information...
2 parents 05a2371 + 3e98fc2 commit 02d99ec3989408da7c4e98a2ea083747f9cb1b60 @sikachu sikachu committed Apr 15, 2012
Showing with 8 additions and 1 deletion.
  1. +1 −1 lib/paperclip/io_adapters/file_adapter.rb
  2. +7 −0 test/file_adapter_test.rb
@@ -69,7 +69,7 @@ def best_content_type_option(types)
def type_from_file_command
# On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
- mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;]\s+/)[0] rescue "application/x-#{type}")
+ mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;\s]+/)[0] rescue "application/x-#{type}")
mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
mime_type
end
@@ -20,6 +20,13 @@ class FileAdapterTest < Test::Unit::TestCase
assert_equal "image/png", @subject.content_type
end
+ should "provide correct mime-type for empty file" do
+ @subject = Paperclip.io_adapters.for(Tempfile.new("file_adapter_test"))
+
+ # Content type contained '\n' at the end, for an empty file, on my Mac
+ assert_equal "application/x-empty", @subject.content_type
+ end
+
should "get the file's size" do
assert_equal 4456, @subject.size
end

0 comments on commit 02d99ec

Please sign in to comment.