Adding tests for attachments['blah.rb'] = {} et al

2 files changed, 16 insertions, 1 deletions

diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb
index e11dd4c46a..d096ea6180 100644
--- a/actionmailer/lib/action_mailer/deprecated_api.rb
+++ b/actionmailer/lib/action_mailer/deprecated_api.rb
@@ -19,6 +19,7 @@ module ActionMailer
       end
 
       part = Mail::Part.new(params)
+
       yield part if block_given?
       @parts << part
     end
@@ -29,7 +30,16 @@ module ActionMailer
       super # Run deprecation hooks
 
       params = { :content_type => params } if String === params
-      params = { :content_disposition => "attachment",
+      
+      if filename = params.delete(:filename)
+        content_disposition = "attachment; filename=\"#{File.basename(filename)}\""
+      else
+        content_disposition = "attachment"
+      end
+      
+      params[:content] = params.delete(:data) if params[:data]
+      
+      params = { :content_disposition => content_disposition,
                  :content_transfer_encoding => "base64" }.merge(params)
 
       part(params, &block)
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb
index 2fd25ff145..94f21c7cf3 100644
--- a/actionmailer/lib/action_mailer/tmail_compat.rb
+++ b/actionmailer/lib/action_mailer/tmail_compat.rb
@@ -16,5 +16,10 @@ module Mail
       end
     end
     
+    def original_filename
+      STDERR.puts("Message#original_filename is deprecated, please call Message#filename.\n#{caller}")
+      filename
+    end
+    
   end
 end
\ No newline at end of file