lib/lockbox/carrier_wave_extensions.rb in lockbox-0.6.2 vs lib/lockbox/carrier_wave_extensions.rb in lockbox-0.6.3

@@ -31,10 +31,13 @@
         def size
           read.bytesize
         end
 
         def content_type
-          if CarrierWave::VERSION.to_i >= 2
+          if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new("2.2.1")
+            # based on CarrierWave::SanitizedFile#marcel_magic_content_type
+            Marcel::Magic.by_magic(read).try(:type) || "invalid/invalid"
+          elsif CarrierWave::VERSION.to_i >= 2
             # based on CarrierWave::SanitizedFile#mime_magic_content_type
             MimeMagic.by_magic(read).try(:type) || "invalid/invalid"
           else
             # uses filename
             super