lib/carrierwave/base64/base64_string_io.rb in carrierwave-base64-2.3.5 vs lib/carrierwave/base64/base64_string_io.rb in carrierwave-base64-2.4.0

@@ -1,40 +1,49 @@
 module Carrierwave
   module Base64
     class Base64StringIO < StringIO
       class ArgumentError < StandardError; end
 
-      attr_accessor :file_format, :file_name
+      attr_accessor :file_extension, :file_name
 
-      def initialize(encoded_file, file_name_method_or_string)
+      def initialize(encoded_file, file_name_proc_or_string)
         description, encoded_bytes = encoded_file.split(',')
 
         raise ArgumentError unless encoded_bytes
         raise ArgumentError if encoded_bytes.eql?('(null)')
 
-        @file_name = extract_file_name(file_name_method_or_string)
-        @file_format = get_file_format description
+        @file_name = extract_file_name(file_name_proc_or_string)
+        @file_extension = get_file_extension description
         bytes = ::Base64.decode64 encoded_bytes
 
         super bytes
       end
 
       def original_filename
-        File.basename("#{@file_name}.#{@file_format}")
+        File.basename("#{@file_name}.#{@file_extension}")
       end
 
       private
 
-      def get_file_format(description)
-        regex = /([a-z0-9]+);base64\z/
-        regex.match(description).try(:[], 1)
+      def get_file_extension(description)
+        content_type = description.split(';base64').first
+        mime_type = MIME::Types[content_type].first
+        unless mime_type
+          raise ArgumentError, "Unknown MIME type: #{content_type}"
+        end
+        mime_type.preferred_extension
       end
 
-      def extract_file_name(method_or_string)
-        if method_or_string.is_a?(Proc)
-          method_or_string.call
+      def extract_file_name(proc_or_string)
+        if proc_or_string.is_a?(Proc)
+          proc_or_string.call
         else
-          method_or_string
+          warn(
+            '[Deprecation warning] Setting `file_name` option to a string is '\
+            'deprecated and will be removed in 2.5.0. If you want to keep the '\
+            'existing behaviour, wrap the string in a Proc'
+          )
+          proc_or_string
         end
       end
     end
   end
 end