feat: add some options for mail

contracts/mail/mail.go

@@ -10,7 +10,7 @@ type Mail interface {
 	// Content set the content of Mail.
 	Content(content Content) Mail
 	// From set the sender of Mail.
-	From(address From) Mail
+	From(address Address) Mail
 	// Queue a given Mail
 	Queue(mailable ...Mailable) error
 	// Send the Mail
@@ -41,15 +41,15 @@ type Queue struct {
 	Queue      string
 }
 
-type From struct {
+type Address struct {
 	Address string
 	Name    string
 }
 
 type Envelope struct {
 	Bcc     []string
 	Cc      []string
-	From    From
+	From    Address
 	Subject string
 	To      []string
 }

mail/application.go

@@ -11,16 +11,16 @@
 )
 
 type Application struct {
-	attaches []string
-	bcc      []string
-	cc       []string
-	clone    int
-	config   config.Config
-	from     mail.From
-	html     string
-	queue    queuecontract.Queue
-	subject  string
-	to       []string
+	attachments []string
+	bcc         []string
+	cc          []string
+	clone       int
+	config      config.Config
+	from        mail.Address
+	html        string
+	queue       queuecontract.Queue
+	subject     string
+	to          []string
 }
 
 func NewApplication(config config.Config, queue queuecontract.Queue) *Application {
@@ -30,9 +30,9 @@
 	}
 }
 
-func (r *Application) Attach(files []string) mail.Mail {
+func (r *Application) Attach(attachments []string) mail.Mail {
 	instance := r.instance()
-	instance.attaches = files
+	instance.attachments = attachments
 
 	return instance
 }
@@ -58,15 +58,14 @@
 	return instance
 }
 
-func (r *Application) From(from mail.From) mail.Mail {
+func (r *Application) From(address mail.Address) mail.Mail {
 	instance := r.instance()
-	instance.from = from
+	instance.from = address
 
 	return instance
 }
 
 func (r *Application) Queue(mailable ...mail.Mailable) error {
-
 	if len(mailable) > 0 {
 		r.setUsingMailable(mailable[0])
 	}
@@ -79,7 +78,7 @@
 		{Value: r.to, Type: "[]string"},
 		{Value: r.cc, Type: "[]string"},
 		{Value: r.bcc, Type: "[]string"},
-		{Value: r.attaches, Type: "[]string"},
+		{Value: r.attachments, Type: "[]string"},
 	})
 
 	if len(mailable) > 0 {
@@ -100,7 +99,7 @@
 	if len(mailable) > 0 {
 		r.setUsingMailable(mailable[0])
 	}
-	return SendMail(r.config, r.subject, r.html, r.from.Address, r.from.Name, r.to, r.cc, r.bcc, r.attaches)
+	return SendMail(r.config, r.subject, r.html, r.from.Address, r.from.Name, r.to, r.cc, r.bcc, r.attachments)
 }
 
 func (r *Application) Subject(subject string) mail.Mail {
@@ -130,33 +129,25 @@
 }
 
 func (r *Application) setUsingMailable(mailable mail.Mailable) {
-	content := mailable.Content()
-	if content != nil && content.Html != "" {
+	if content := mailable.Content(); content != nil && content.Html != "" {
 		r.html = content.Html
 	}
-
-	envelope := mailable.Envelope()
-	if envelope != nil {
+	if len(mailable.Attachments()) > 0 {
+		r.attachments = mailable.Attachments()
+	}
+	if envelope := mailable.Envelope(); envelope != nil {
 		if envelope.From.Address != "" {
 			r.from = envelope.From
 		}
-
 		if len(envelope.To) > 0 {
 			r.to = envelope.To
 		}
-
 		if len(envelope.Cc) > 0 {
 			r.cc = envelope.Cc
 		}
-
 		if len(envelope.Bcc) > 0 {
 			r.bcc = envelope.Bcc
 		}
-
-		if len(mailable.Attachments()) > 0 {
-			r.attaches = mailable.Attachments()
-		}
-
 		if envelope.Subject != "" {
 			r.subject = envelope.Subject
 		}

mail/application_test.go

@@ -58,7 +58,7 @@ func (s *ApplicationTestSuite) TestSendMailBy465Port() {
 		Bcc([]string{testBcc}).
 		Attach([]string{"../logo.png"}).
 		Subject("Goravel Test 465").
-		Content(mail.Content{Html: "<h1>Hello Goravel</h1>"}).
+		Content(Html("<h1>Hello Goravel</h1>")).
 		Send())
 }
 
@@ -70,20 +70,20 @@ func (s *ApplicationTestSuite) TestSendMailBy587Port() {
 		Bcc([]string{testBcc}).
 		Attach([]string{"../logo.png"}).
 		Subject("Goravel Test 587").
-		Content(mail.Content{Html: "<h1>Hello Goravel</h1>"}).
+		Content(Html("<h1>Hello Goravel</h1>")).
 		Send())
 }
 
 func (s *ApplicationTestSuite) TestSendMailWithFrom() {
 	mockConfig := mockConfig(587, s.redisPort)
 	app := NewApplication(mockConfig, nil)
-	s.Nil(app.From(mail.From{Address: testFromAddress, Name: testFromName}).
+	s.Nil(app.From(Address(testFromAddress, testFromName)).
 		To([]string{testTo}).
 		Cc([]string{testCc}).
 		Bcc([]string{testBcc}).
 		Attach([]string{"../logo.png"}).
 		Subject("Goravel Test 587 With From").
-		Content(mail.Content{Html: "<h1>Hello Goravel</h1>"}).
+		Content(Html("<h1>Hello Goravel</h1>")).
 		Send())
 }
 
@@ -104,7 +104,7 @@ func (s *ApplicationTestSuite) TestQueueMail() {
 
 	app := NewApplication(mockConfig, queueFacade)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
 	go func(ctx context.Context) {
 		s.Nil(queueFacade.Worker(nil).Run())
@@ -119,11 +119,45 @@ func (s *ApplicationTestSuite) TestQueueMail() {
 		Bcc([]string{testBcc}).
 		Attach([]string{"../logo.png"}).
 		Subject("Goravel Test Queue").
-		Content(mail.Content{Html: "<h1>Hello Goravel</h1>"}).
+		Content(Html("<h1>Hello Goravel</h1>")).
 		Queue())
 	time.Sleep(3 * time.Second)
 }
 
+func (s *ApplicationTestSuite) TestQueueMailWithConnection() {
+	mockConfig := mockConfig(587, s.redisPort)
+	mockLog := &logmock.Log{}
+
+	queueFacade := queue.NewApplication(mockConfig, mockLog)
+	queueFacade.Register([]queuecontract.Job{
+		NewSendMailJob(mockConfig),
+	})
+
+	app := NewApplication(mockConfig, queueFacade)
+
+	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+	defer cancel()
+	go func(ctx context.Context) {
+		s.Nil(queueFacade.Worker(&queuecontract.Args{
+			Connection: "redis",
+			Queue:      "test",
+		}).Run())
+
+		for range ctx.Done() {
+			return
+		}
+	}(ctx)
+	time.Sleep(3 * time.Second)
+	s.Nil(app.To([]string{testTo}).
+		Cc([]string{testCc}).
+		Bcc([]string{testBcc}).
+		Attach([]string{"../logo.png"}).
+		Subject("Goravel Test Queue with connection").
+		Content(Html("<h1>Hello Goravel</h1>")).
+		Queue(Queue().OnConnection("redis").OnQueue("test")))
+	time.Sleep(3 * time.Second)
+}
+
 func (s *ApplicationTestSuite) TestQueueMailWithMailable() {
 	mockConfig := mockConfig(587, s.redisPort)
 	mockLog := &logmock.Log{}
@@ -135,7 +169,7 @@ func (s *ApplicationTestSuite) TestQueueMailWithMailable() {
 
 	app := NewApplication(mockConfig, queueFacade)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
 	go func(ctx context.Context) {
 		s.Nil(queueFacade.Worker(nil).Run())
@@ -219,14 +253,16 @@ func (m *TestMailable) Attachments() []string {
 }
 
 func (m *TestMailable) Content() *mail.Content {
-	return &mail.Content{Html: "<h1>Hello Goravel</h1>"}
+	html := Html("<h1>Hello Goravel</h1>")
+
+	return &html
 }
 
 func (m *TestMailable) Envelope() *mail.Envelope {
 	return &mail.Envelope{
 		Bcc:     []string{testBcc},
 		Cc:      []string{testCc},
-		From:    mail.From{Address: testFromAddress, Name: testFromName},
+		From:    Address(testFromAddress, testFromName),
 		Subject: "Goravel Test 587 With Mailable",
 		To:      []string{testTo},
 	}

mail/options.go

@@ -0,0 +1,60 @@
+package mail
+
+import (
+	"github.com/goravel/framework/contracts/mail"
+)
+
+func Address(address, name string) mail.Address {
+	return mail.Address{
+		Address: address,
+		Name:    name,
+	}
+}
+
+func Html(html string) mail.Content {
+	return mail.Content{
+		Html: html,
+	}
+}
+
+type QueueMail struct {
+	queue *mail.Queue
+}
+
+func Queue() *QueueMail {
+	return &QueueMail{
+		queue: &mail.Queue{},
+	}
+}
+
+// Attachments attach files to the mail
+func (receiver *QueueMail) Attachments() []string {
+	return []string{}
+}
+
+// Content set the content of the mail
+func (receiver *QueueMail) Content() *mail.Content {
+	return &mail.Content{}
+}
+
+// Envelope set the envelope of the mail
+func (receiver *QueueMail) Envelope() *mail.Envelope {
+	return &mail.Envelope{}
+}
+
+// Queue set the queue of the mail
+func (receiver *QueueMail) Queue() *mail.Queue {
+	return receiver.queue
+}
+
+func (receiver *QueueMail) OnConnection(connection string) *QueueMail {
+	receiver.queue.Connection = connection
+
+	return receiver
+}
+
+func (receiver *QueueMail) OnQueue(queue string) *QueueMail {
+	receiver.queue.Queue = queue
+
+	return receiver
+}