Add reply_to

i7an · i7an · commit e60ef7bdbb12 · 2024-12-26T12:51:53.000+01:00
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ mail = Mailtrap::Mail::Base.new(
   to: [
     { email: 'your@email.com' }
   ],
+  reply_to: { email: 'support@example.com', name: 'Mailtrap Reply-To' },
   subject: 'You are awesome!',
   text: "Congrats for sending test email with Mailtrap!"
 )
diff --git a/examples/action_mailer.rb b/examples/action_mailer.rb
@@ -18,6 +18,7 @@
 # To add `category` and `custom_variables`, add them to the mail generation:
 mail(
   to: 'your@email.com',
+  reply_to: 'Mailtrap Reply-To <support@example.com>',
   subject: 'You are awesome!',
   category: 'Test category',
   custom_variables: { test_variable: 'abc' }
diff --git a/examples/email_template.rb b/examples/email_template.rb
@@ -6,6 +6,7 @@
   to: [
     { email: 'your@email.com' }
   ],
+  reply_to: { email: 'support@example.com', name: 'Mailtrap Reply-To' },
   template_uuid: '2f45b0aa-bbed-432f-95e4-e145e1965ba2',
   template_variables: {
     'user_name' => 'John Doe'
diff --git a/examples/full.rb b/examples/full.rb
@@ -6,6 +6,7 @@
   to: [
     { email: 'your@email.com', name: 'Your name' }
   ],
+  reply_to: { email: 'support@example.com', name: 'Mailtrap Reply-To' },
   cc: [
     { email: 'cc@email.com', name: 'Copy To' }
   ],
diff --git a/lib/mailtrap/mail/base.rb b/lib/mailtrap/mail/base.rb
@@ -5,12 +5,13 @@
 module Mailtrap
   module Mail
     class Base
-      attr_accessor :from, :to, :cc, :bcc, :headers, :custom_variables, :subject, :text, :html, :category
+      attr_accessor :from, :to, :reply_to, :cc, :bcc, :headers, :custom_variables, :subject, :text, :html, :category
       attr_reader :attachments
 
       def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
         from: nil,
         to: [],
+        reply_to: nil,
         cc: [],
         bcc: [],
         subject: nil,
@@ -23,6 +24,7 @@ def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
       )
         @from = from
         @to = to
+        @reply_to = reply_to
         @cc = cc
         @bcc = bcc
         @subject = subject
@@ -38,6 +40,7 @@ def as_json # rubocop:disable Metrics/MethodLength
         {
           'from' => from,
           'to' => to,
+          'reply_to' => reply_to,
           'cc' => cc,
           'bcc' => bcc,
           'subject' => subject,
diff --git a/lib/mailtrap/mail/from_template.rb b/lib/mailtrap/mail/from_template.rb
@@ -8,6 +8,7 @@ class FromTemplate < Base
       def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
         from: nil,
         to: [],
+        reply_to: nil,
         cc: [],
         bcc: [],
         attachments: [],
@@ -19,6 +20,7 @@ def initialize( # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
         super(
           from: from,
           to: to,
+          reply_to: reply_to,
           cc: cc,
           bcc: bcc,
           attachments: attachments,
diff --git a/spec/mailtrap/mail/base_spec.rb b/spec/mailtrap/mail/base_spec.rb
@@ -8,6 +8,7 @@
     described_class.new(
       from: from,
       to: to,
+      reply_to: reply_to,
       cc: cc,
       bcc: bcc,
       subject: mail_subject,
@@ -22,6 +23,7 @@
 
   let(:from) { nil }
   let(:to) { [] }
+  let(:reply_to) { nil }
   let(:cc) { [] }
   let(:bcc) { [] }
   let(:mail_subject) { nil }
@@ -80,6 +82,7 @@
     end
 
     context 'when all values set' do
+      let(:reply_to) { { email: 'reply-to@railsware.com' } }
       let(:cc) { [{ email: 'cc@example.com' }] }
       let(:bcc) { [{ email: 'bcc@example.com' }] }
       let(:html) { '<div>Test HTML</div>' }
@@ -91,6 +94,7 @@
         {
           'from' => { email: 'test@example.com', name: 'Mailtrap User' },
           'to' => [{ email: 'to@example.com' }, { email: 'to2@example.com', name: 'To Two' }],
+          'reply_to' => { email: 'reply-to@railsware.com' },
           'cc' => [{ email: 'cc@example.com' }],
           'bcc' => [{ email: 'bcc@example.com' }],
           'subject' => 'This is subject',
@@ -114,6 +118,7 @@
 
     let(:from) { { email: 'test@example.com', name: 'Mailtrap User' } }
     let(:to) { [{ email: 'to@example.com' }, { email: 'to2@example.com', name: 'To Two' }] }
+    let(:reply_to) { { email: 'reply-to@railsware.com', name: 'Reply To' } }
     let(:mail_subject) { 'This is subject' }
     let(:text) { 'This is text' }
     let(:cc) { [{ email: 'cc@example.com' }] }
@@ -126,6 +131,7 @@
       '{' \
         '"from":{"email":"test@example.com","name":"Mailtrap User"},' \
         '"to":[{"email":"to@example.com"},{"email":"to2@example.com","name":"To Two"}],' \
+        '"reply_to":{"email":"reply-to@railsware.com","name":"Reply To"},' \
         '"cc":[{"email":"cc@example.com"}],' \
         '"bcc":[{"email":"bcc@example.com"}],' \
         '"subject":"This is subject",' \
diff --git a/spec/mailtrap/mail/from_template_spec.rb b/spec/mailtrap/mail/from_template_spec.rb
@@ -8,6 +8,7 @@
     described_class.new(
       from: from,
       to: to,
+      reply_to: reply_to,
       cc: cc,
       bcc: bcc,
       attachments: attachments,
@@ -20,6 +21,7 @@
 
   let(:from) { nil }
   let(:to) { [] }
+  let(:reply_to) { nil }
   let(:cc) { [] }
   let(:bcc) { [] }
   let(:attachments) { [] }
@@ -43,6 +45,7 @@
   context 'when all values set' do
     let(:from) { { email: 'test@example.com', name: 'Mailtrap User' } }
     let(:to) { [{ email: 'to@example.com' }, { email: 'to2@example.com', name: 'To Two' }] }
+    let(:reply_to) { { email: 'reply-to@railsware.com' } }
     let(:cc) { [{ email: 'cc@example.com' }] }
     let(:bcc) { [{ email: 'bcc@example.com' }] }
     let(:html) { '<div>Test HTML</div>' }
@@ -64,6 +67,7 @@
         {
           'from' => { email: 'test@example.com', name: 'Mailtrap User' },
           'to' => [{ email: 'to@example.com' }, { email: 'to2@example.com', name: 'To Two' }],
+          'reply_to' => { email: 'reply-to@railsware.com' },
           'cc' => [{ email: 'cc@example.com' }],
           'bcc' => [{ email: 'bcc@example.com' }],
           'headers' => { 'Category-Header' => 'some_category' },
@@ -113,6 +117,7 @@
 
     let(:from) { { email: 'test@example.com', name: 'Mailtrap User' } }
     let(:to) { [{ email: 'to@example.com' }, { email: 'to2@example.com', name: 'To Two' }] }
+    let(:reply_to) { { email: 'reply-to@railsware.com', name: 'Reply To' } }
     let(:cc) { [{ email: 'cc@example.com' }] }
     let(:bcc) { [{ email: 'bcc@example.com' }] }
     let(:attachments) { [{ content: StringIO.new('hello world'), filename: 'attachment.txt' }] }
@@ -123,6 +128,7 @@
       '{' \
         '"from":{"email":"test@example.com","name":"Mailtrap User"},' \
         '"to":[{"email":"to@example.com"},{"email":"to2@example.com","name":"To Two"}],' \
+        '"reply_to":{"email":"reply-to@railsware.com","name":"Reply To"},' \
         '"cc":[{"email":"cc@example.com"}],' \
         '"bcc":[{"email":"bcc@example.com"}],' \
         '"attachments":[{"content":"aGVsbG8gd29ybGQ=","filename":"attachment.txt"}],' \

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ mail = Mailtrap::Mail::Base.new(`
`52`	`52`	`to: [`
`53`	`53`	`{ email: '[email protected]' }`
`54`	`54`	`],`
	`55`	`+ reply_to: { email: '[email protected]', name: 'Mailtrap Reply-To' },`
`55`	`56`	`subject: 'You are awesome!',`
`56`	`57`	`text: "Congrats for sending test email with Mailtrap!"`
`57`	`58`	`)`
-Original file line number
+Diff line change
   to: [
     { email: '[email protected]' }
   ],
 +  reply_to: { email: '[email protected]', name: 'Mailtrap Reply-To' },
   template_uuid: '2f45b0aa-bbed-432f-95e4-e145e1965ba2',
   template_variables: {
     'user_name' => 'John Doe'
-Original file line number
+Diff line change
     described_class.new(
       from: from,
       to: to,
 +      reply_to: reply_to,
       cc: cc,
       bcc: bcc,
       attachments: attachments,
   let(:from) { nil }
   let(:to) { [] }
 +  let(:reply_to) { nil }
   let(:cc) { [] }
   let(:bcc) { [] }
   let(:attachments) { [] }
   context 'when all values set' do
     let(:from) { { email: '[email protected]', name: 'Mailtrap User' } }
     let(:to) { [{ email: '[email protected]' }, { email: '[email protected]', name: 'To Two' }] }
 +    let(:reply_to) { { email: '[email protected]' } }
     let(:cc) { [{ email: '[email protected]' }] }
     let(:bcc) { [{ email: '[email protected]' }] }
     let(:html) { '<div>Test HTML</div>' }
+        {
           'from' => { email: '[email protected]', name: 'Mailtrap User' },
           'to' => [{ email: '[email protected]' }, { email: '[email protected]', name: 'To Two' }],
 +          'reply_to' => { email: '[email protected]' },
           'cc' => [{ email: '[email protected]' }],
           'bcc' => [{ email: '[email protected]' }],
           'headers' => { 'Category-Header' => 'some_category' },
     let(:from) { { email: '[email protected]', name: 'Mailtrap User' } }
     let(:to) { [{ email: '[email protected]' }, { email: '[email protected]', name: 'To Two' }] }
 +    let(:reply_to) { { email: '[email protected]', name: 'Reply To' } }
     let(:cc) { [{ email: '[email protected]' }] }
     let(:bcc) { [{ email: '[email protected]' }] }
     let(:attachments) { [{ content: StringIO.new('hello world'), filename: 'attachment.txt' }] }
       '{' \
         '"from":{"email":"[email protected]","name":"Mailtrap User"},' \
         '"to":[{"email":"[email protected]"},{"email":"[email protected]","name":"To Two"}],' \
 +        '"reply_to":{"email":"[email protected]","name":"Reply To"},' \
         '"cc":[{"email":"[email protected]"}],' \
         '"bcc":[{"email":"[email protected]"}],' \
         '"attachments":[{"content":"aGVsbG8gd29ybGQ=","filename":"attachment.txt"}],' \