Skip to content

Updated message to support sending leaf futures without unwrapping #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
twof wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated message to support sending leaf futures without unwrapping #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
132 changes: 127 additions & 5 deletions Sources/Mailgun/Models/Message.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import Vapor

extension Mailgun {
public enum HTMLView {
case raw(String)
case leaf(Future<View>)
}

public struct Message: Content {
public static var defaultContentType: MediaType = MediaType.formData

Expand All @@ -13,14 +18,43 @@ extension Mailgun {
public let bcc: String?
public let subject: String
public let text: String
public let html: String?
public let htmlString: String?
public let html: HTMLView?
public let attachment: [File]?

public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)

try container.encode(from, forKey: .from)
try container.encode(to, forKey: .to)
try container.encode(replyTo, forKey: .replyTo)
try container.encode(cc, forKey: .cc)
try container.encode(bcc, forKey: .bcc)
try container.encode(subject, forKey: .subject)
try container.encode(text, forKey: .from)
try container.encode(htmlString, forKey: .htmlString)
try container.encode(attachment, forKey: .attachment)
}

public init(from decoder: Decoder) throws {
fatalError()
}

private enum CodingKeys : String, CodingKey {
case from, to, replyTo = "h:Reply-To", cc, bcc, subject, text, html, attachment
case from, to, replyTo = "h:Reply-To", cc, bcc, subject, text, htmlString, attachment
}

public init(from: String, to: String, replyTo: String? = nil, cc: String? = nil, bcc: String? = nil, subject: String, text: String, html: String? = nil, attachments: [File]? = nil) {
public init(
from: String,
to: String,
replyTo: String? = nil,
cc: String? = nil,
bcc: String? = nil,
subject: String,
text: String,
html: HTMLView? = nil,
attachments: [File]? = nil
) {
self.from = from
self.to = to
self.replyTo = replyTo
Expand All @@ -29,10 +63,21 @@ extension Mailgun {
self.subject = subject
self.text = text
self.html = html
self.htmlString = nil
self.attachment = attachments
}

public init(from: String, to: [String], replyTo: String? = nil, cc: [String]? = nil, bcc: [String]? = nil, subject: String, text: String, html: String? = nil, attachments: [File]? = nil) {
public init(
from: String,
to: [String],
replyTo: String? = nil,
cc: [String]? = nil,
bcc: [String]? = nil,
subject: String,
text: String,
html: HTMLView? = nil,
attachments: [File]? = nil
) {
self.from = from
self.to = to.joined(separator: ",")
self.replyTo = replyTo
Expand All @@ -41,10 +86,21 @@ extension Mailgun {
self.subject = subject
self.text = text
self.html = html
self.htmlString = nil
self.attachment = attachments
}

public init(from: String, to: [FullEmail], replyTo: String? = nil, cc: [FullEmail]? = nil, bcc: [FullEmail]? = nil, subject: String, text: String, html: String? = nil, attachments: [File]? = nil) {
public init(
from: String,
to: [FullEmail],
replyTo: String? = nil,
cc: [FullEmail]? = nil,
bcc: [FullEmail]? = nil,
subject: String,
text: String,
html: HTMLView? = nil,
attachments: [File]? = nil
) {
self.from = from
self.to = to.stringArray.joined(separator: ",")
self.replyTo = replyTo
Expand All @@ -53,8 +109,74 @@ extension Mailgun {
self.subject = subject
self.text = text
self.html = html
self.htmlString = nil
self.attachment = attachments
}

fileprivate init(
from: String,
to: String,
replyTo: String? = nil,
cc: String? = nil,
bcc: String? = nil,
subject: String,
text: String,
htmlString: String? = nil,
attachments: [File]? = nil
) {
self.from = from
self.to = to
self.replyTo = replyTo
self.cc = cc
self.bcc = bcc
self.subject = subject
self.text = text
self.html = nil
self.htmlString = htmlString
self.attachment = attachments
}
}
}

extension Mailgun.Message: ResponseEncodable {
public func encode(for req: Request) throws -> EventLoopFuture<Response> {
if let html = self.html {
switch html {
case .raw(let htmlString):
let message = Mailgun.Message.init(
from: self.from,
to: self.to,
replyTo: self.replyTo,
cc: self.cc,
bcc: self.bcc,
subject: self.subject,
text: self.text,
htmlString: htmlString,
attachments: self.attachment
)

return try message.encode(for: req)
case .leaf(let htmlFuture):
return htmlFuture.flatMap { htmlData in
let htmlString = String(data: htmlData.data, encoding: .utf8)
let message = Mailgun.Message.init(
from: self.from,
to: self.to,
replyTo: self.replyTo,
cc: self.cc,
bcc: self.bcc,
subject: self.subject,
text: self.text,
htmlString: htmlString,
attachments: self.attachment
)

return try message.encode(for: req)
}
}
} else {
return try self.encode(for: req)
}
}
}

23 changes: 17 additions & 6 deletions Tests/MailgunTests/MailgunTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ import XCTest

final class MailgunTests: XCTestCase {
func testExample() {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct
// results.
XCTAssertEqual(Mailgun().text, "Hello, World!")
let mailgun = Mailgun(apiKey: "", domain: "")

let content = try req.view().render("Emails/my-email", [
"name": "Bob"
])

let message = Mailgun.Message(
from: "hello@mail.com",
to: "recipient@mail.com",
subject: "Hey There!",
text: "",
html: .leaf(content)
)

let mailgun = try req.make(Mailgun.self)
return try mailgun.send(message, on: req)
}



static var allTests = [
("testExample", testExample),
]
Expand Down