Merge pull request #2447 from anthonypenner/master

Add mime type detection for MS Office files

lib/carrierwave/sanitized_file.rb

@@ -2,6 +2,7 @@
 require 'active_support/core_ext/string/multibyte'
 require 'mini_mime'
 require 'mimemagic'
+require 'mimemagic/overlay'
 
 module CarrierWave
 

spec/sanitized_file_spec.rb

@@ -195,6 +195,26 @@
       expect(sanitized_file.content_type).to eq("application/msword")
     end
 
+    it "handles Mime::Type of docx" do
+      file = File.open(file_path('resume.docx'))
+
+      sanitized_file = CarrierWave::SanitizedFile.new(file)
+      allow(sanitized_file).to receive(:file).and_return(file)
+
+      expect { sanitized_file.content_type }.not_to raise_error
+      expect(sanitized_file.content_type).to eq("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+    end
+
+    it "handles Mime::Type of pptx" do
+      file = File.open(file_path('slidedeck.pptx'))
+
+      sanitized_file = CarrierWave::SanitizedFile.new(file)
+      allow(sanitized_file).to receive(:file).and_return(file)
+
+      expect { sanitized_file.content_type }.not_to raise_error
+      expect(sanitized_file.content_type).to eq("application/vnd.openxmlformats-officedocument.presentationml.presentation")
+    end
+
     it "reads content type from path if missing" do
       sanitized_file = CarrierWave::SanitizedFile.new("llama.jpg")