kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Template paths with dot chars in them no longer mess up implicit template selection for multipart messages (closes #3332)

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3495 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2006-01-29 02:25:15 +00:00
parent 01b1a87729
commit 34df9be0e5
5 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionmailer/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN*
* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler]
* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body [Jamis Buck]
* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck]

2
actionmailer/Rakefile
View file

@ -25,7 +25,7 @@ Rake::TestTask.new { |t|
t.libs << "test"
t.pattern = 'test/*_test.rb'
t.verbose = true
t.warning = true
t.warning = false
}

2
actionmailer/lib/action_mailer/base.rb
View file

@ -305,7 +305,7 @@ module ActionMailer
# normal template exists (or if there were no implicit parts) we render
# it.
template_exists = @parts.empty?
template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| i.split(".").length == 2 }
template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| File.basename(i).split(".").length == 2 }
@body = render_message(@template, @body) if template_exists
# Finally, if there are other message parts and a textual body exists,

1
actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml vendored Normal file
View file

@ -0,0 +1 @@
Have a lovely picture, from me. Enjoy!

21
actionmailer/test/mail_service_test.rb
View file

@ -23,6 +23,20 @@ class Net::SMTP
end
end
class FunkyPathMailer < ActionMailer::Base
def multipart_with_template_path_with_dots(recipient)
recipients recipient
subject "Have a lovely picture"
from "Chad Fowler <chad@chadfowler.com>"
attachment :content_type => "image/jpeg",
:body => "not really a jpeg, we're only testing, after all"
end
def template_path
"#{File.dirname(__FILE__)}/fixtures/path.with.dots"
end
end
class TestMailer < ActionMailer::Base
def signed_up(recipient)
@ -748,9 +762,14 @@ EOF
end
def test_deliver_with_mail_object
mail = TestMailer::create_headers_with_nonalpha_chars(@recipient)
mail = TestMailer.create_headers_with_nonalpha_chars(@recipient)
assert_nothing_raised { TestMailer.deliver(mail) }
assert_equal 1, TestMailer.deliveries.length
end
def test_multipart_with_template_path_with_dots
mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
assert_equal 2, mail.parts.length
end
end