lib/carrierwave/base64/base64_string_io.rb in carrierwave-base64-2.3.2 vs lib/carrierwave/base64/base64_string_io.rb in carrierwave-base64-2.3.3

@@ -3,17 +3,17 @@
     class Base64StringIO < StringIO
       class ArgumentError < StandardError; end
 
       attr_accessor :file_format, :file_name
 
-      def initialize(encoded_file, file_name)
+      def initialize(encoded_file, file_name_method_or_string)
         description, encoded_bytes = encoded_file.split(',')
 
         raise ArgumentError unless encoded_bytes
         raise ArgumentError if encoded_bytes.eql?('(null)')
 
-        @file_name = file_name
+        @file_name = extract_file_name(file_name_method_or_string)
         @file_format = get_file_format description
         bytes = ::Base64.decode64 encoded_bytes
 
         super bytes
       end
@@ -25,9 +25,17 @@
       private
 
       def get_file_format(description)
         regex = /([a-z0-9]+);base64\z/
         regex.match(description).try(:[], 1)
+      end
+
+      def extract_file_name(method_or_string)
+        if method_or_string.is_a?(Proc)
+          method_or_string.call
+        else
+          method_or_string
+        end
       end
     end
   end
 end