diff options
| author | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-21 20:03:55 +1100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-21 20:03:55 +1100 |
| commit | 3829f9ecfd6fcd54edbc15f624ee3b68f6dae135 (patch) | |
| tree | f85c4fb58b38209ddbffc76f8c8e7ad26c4c6945 /actionmailer/lib/action_mailer/deprecated_api.rb | |
| parent | fbdbac2b88218e5e3e6087c67dacf7e755aa4106 (diff) | |
| download | rails-3829f9ecfd6fcd54edbc15f624ee3b68f6dae135.tar.gz rails-3829f9ecfd6fcd54edbc15f624ee3b68f6dae135.tar.bz2 rails-3829f9ecfd6fcd54edbc15f624ee3b68f6dae135.zip | |
Adding tests for attachments['blah.rb'] = {} et al
Diffstat (limited to 'actionmailer/lib/action_mailer/deprecated_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/deprecated_api.rb | 12 |
1 files changed, 11 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) |