Allow to custom content type when setting mailer body by MQuy · Pull Request #27227 · rails/rails

MQuy · 2016-11-30T14:09:28Z

Summary

Allow to custom content-type in case of setting headers[:body] and attachments

attachments[:rails] = xxx
mail(
  body: "<html><body>Hello rails</body></html>",
  content_type: "text/html"
)
# => content_type is now text/hml

rails-bot · 2016-11-30T14:09:30Z

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @sgrif (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

sgrif · 2016-11-30T18:43:22Z

Thank you for the pull request. Can you add documentation and a changelog entry?

MQuy · 2016-12-01T02:29:17Z

@sgrif thank for your feedback, I added changelog and release note.
About document, I wonder where should I add because it is just the option which we miss to check in case of attachment and header body for mailer

benlovell · 2016-12-05T13:20:56Z

    assert_equal("multipart/mixed", email.mime_type)
  end

+  test "set mime type to text/html when attachment is inclued and body is set" do


You've a typo for 'included' here.

ty @benlovell :D

sgrif · 2016-12-05T19:13:06Z

I would document it on the mail method

MQuy · 2016-12-06T06:10:36Z

@sgrif thank for your feedback, I just add documentation for mail method :)

MQuy · 2016-12-06T07:05:55Z

+      def collect_responses_from_text(headers)
+        [{
+          body: headers.delete(:body),
+          content_type: headers[:content_type] || self.class.default[:content_type] || "text/plain"


@sgrif should we consider to use different name here like body_type instead of content_type, because there are some cases mailer will have many parts like mailer content_type, body content_type

MQuy · 2017-01-06T06:52:48Z

@sgrif i wonder is there anything lefts should i do?

rafaelfranca · 2016-12-06T15:21:26Z

+      def collect_responses_from_text(headers)
+        [{
+          body: headers.delete(:body),
+          content_type: headers[:content_type] || self.class.default[:content_type] || "text/plain"


I think that at this point headers[:content_type] already has the value of self.class.default[:content_type].

From what I try and debug, they are different value, because they comes from mail method and class default

This method is only called after the apply_defaults method is called and the headers passed to this method as argument is the result of apply_defaults, so unless apply_defaults is broken. self.class.default[:content_type] should be already applied on headers[:content_type].

I think apply_defaults only applies key into headers when headers doesn't have that key. In this case, we want to use the value from headers in mail method instead default from self.class.default[:content_type] 🤔

If :content_type is passed to mail, apply_defaults will not copy the default value to the headers and headers[:content_type] will be the same as the :content_type passed to mail.

If :content_type is not passed to mail, apply_defaults will copy the default value to the headers and headers[:content_type] will be the same as the self.class.default[:content_type.

So at this point headers[:content_type] behaves exactly as we want.

headers[:content_type] will be the same as the :content_type passed to mail

but self.class.default[:content_type] will get value from default method in actionmailer

Is there another case different of those two?

If :content_type is passed to mail, headers[:content_type] will be the value passed to mail. In this case no matter what self.class.default[:content_type] is.

In the case you show the conditional:

headers[:content_type] || self.class.default[:content_type] || "text/plain"

will return the value of :content_type passed to mail, that is the same as headers[:content_type], unless I'm missing something.

hum, so in this case the condition is just headers[:content_type] || "text/plain" because headers[:content_type] always contains the value of self.class.default[:content_type], right? 😄

will refactor it, thank you so much 🙇

MQuy · 2017-01-06T11:03:56Z

@rafaelfranca thank for your suggestion 🙇, please let's me know if is there anything else need to be improved :D

…-body Allow to custom content type when setting mailer body

rails-bot assigned sgrif Nov 30, 2016

maclover7 added the actionmailer label Nov 30, 2016

allow context type when set body mail

c4639b7

MQuy force-pushed the allow-custom-content-type-in-mail-body branch from 270ecea to c4639b7 Compare November 30, 2016 14:18

maclover7 added the needs work label Nov 30, 2016

MQuy force-pushed the allow-custom-content-type-in-mail-body branch 4 times, most recently from ad3ecfa to 97bd115 Compare December 1, 2016 02:07

Add changelog for custom content type

2263769

MQuy force-pushed the allow-custom-content-type-in-mail-body branch from 97bd115 to 2263769 Compare December 1, 2016 02:18

benlovell reviewed Dec 5, 2016

View reviewed changes

Fix wrong typo in test

36efba0

Add document in mailer

40b1f64

MQuy force-pushed the allow-custom-content-type-in-mail-body branch from 0311620 to 40b1f64 Compare December 6, 2016 05:48

MQuy commented Dec 6, 2016

View reviewed changes

rafaelfranca requested changes Jan 6, 2017

View reviewed changes

Remove unnecessary condition in content_type

f091bd6

rafaelfranca merged commit f091bd6 into rails:master Jan 6, 2017

rafaelfranca added a commit that referenced this pull request Jan 6, 2017

Merge pull request #27227 from MQuy/allow-custom-content-type-in-mail…

e482dce

…-body Allow to custom content type when setting mailer body

maclover7 removed the needs work label Jan 6, 2017

Conversation

MQuy commented Nov 30, 2016

Summary

Uh oh!

rails-bot commented Nov 30, 2016

Uh oh!

sgrif commented Nov 30, 2016

Uh oh!

MQuy commented Dec 1, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sgrif commented Dec 5, 2016

Uh oh!

MQuy commented Dec 6, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MQuy commented Jan 6, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MQuy Jan 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MQuy Jan 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MQuy commented Jan 6, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MQuy Jan 6, 2017 •

edited

Loading

MQuy Jan 6, 2017 •

edited

Loading