Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions lib/courrier/email/providers/logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ def format_email_using(options)
<<~EMAIL
#{separator}
Timestamp: #{Time.now.strftime("%Y-%m-%d %H:%M:%S %z")}
From: #{@options.from}
To: #{@options.to}
Subject: #{@options.subject}
#{meta_fields(from: options)}

Text:
#{@options.text || "(empty)"}
Expand All @@ -35,6 +33,27 @@ def format_email_using(options)
end

def separator = "-" * 80

def meta_fields(from:)
fields = [
[:from, "From"],
[:to, "To"],
[:reply_to, "Reply-To"],
[:cc, "Cc"],
[:bcc, "Bcc"],
[:subject, "Subject"]
]

fields.map do |field, label|
value = from.send(field)

next if value.nil? || value.to_s.strip.empty?

"#{label}:".ljust(11) + value
rescue NoMatchingPatternError
nil
end.compact.join("\n")
end
end
end
end
Expand Down
20 changes: 19 additions & 1 deletion test/courrier/email/providers/logger_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ class LoggerTest < Minitest::Test
def test_formats_email_for_logging
email = TestEmail.new(
from: "devs@railsdesigner.com",
to: "recipient@railsdesigner.com"
to: "recipient@railsdesigner.com",
reply_to: "support@railsdesigner.com"
)
logger = Logger.new(options: email.options)

Expand All @@ -20,6 +21,23 @@ def test_formats_email_for_logging
assert_includes output, "HTML:\n<p>Test HTML Body</p>"
end

def test_formats_optional_meta_fields_for_logging
email = TestEmail.new(
from: "devs@chirpform.com",
to: "recipient@chirpform.com",
reply_to: "reply-to@chirpform.com",
cc: "cc@chirpform.com",
bcc: "bcc@chirpform.com"
)
logger = Logger.new(options: email.options)

output = capture_logger_output { logger.deliver }

assert_includes output, "Reply-To: reply-to@chirpform.com"
assert_includes output, "Cc: cc@chirpform.com"
assert_includes output, "Bcc: bcc@chirpform.com"
end

private

def capture_logger_output
Expand Down