Merge pull request #9 from Mikroservices/feature/application-send

Add possibility to use Request and Application

Author: mczachurski

README.md

@@ -69,7 +69,7 @@ let email = Email(from: EmailAddress(address: "[email protected]", name: "John
                   subject: "The subject (text)",
                   body: "This is email body.")
 
-request.send(email).map { result in
+request.smtp.send(email).map { result in
     switch result {
     case .success:
         print("Email has been sent")
@@ -79,12 +79,20 @@ request.send(email).map { result in
 }
 ```
 
+Also you can send emails directly via `application` class.
+
+```swift
+app.smtp.send(email).map { result in
+    ...
+}
+```
+
 ## Troubleshoots
 
 You can use `logHandler` to handle and print all messages send/retrieved from email server.
 
 ```swift
-request.send(email) { message in
+request.smtp.send(email) { message in
     print(message)
 }.map { result in
     ...

Sources/Smtp/Request+Smtp.swift renamed to Sources/Smtp/Application+Send.swift

@@ -97,20 +97,19 @@ import Vapor
 /// `StartTlsHandler` is responsible for establishing SSL encryption after `STARTTLS`
 /// command (this handler adds dynamically `OpenSSLClientHandler` to the pipeline if
 /// server supports that encryption.
-public extension Request {
-
+public extension Application.Smtp {
     /// Sending an email.
     ///
     /// - parameters:
     ///     - email: Email which will be send.
     ///     - logHandler: Callback which can be used for logging/printing of sending status messages.
     /// - returns: An `EventLoopFuture<Result<Bool, Error>>` with information about sent email.
     func send(_ email: Email, logHandler: ((String) -> Void)? = nil) -> EventLoopFuture<Result<Bool, Error>> {
-        let emailSentPromise: EventLoopPromise<Void> = self.eventLoop.makePromise()
+        let emailSentPromise: EventLoopPromise<Void> = self.application.eventLoopGroup.next().makePromise()
         let configuration = self.application.smtp.configuration
 
         // Client configuration
-        let bootstrap = ClientBootstrap(group: self.eventLoop)
+        let bootstrap = ClientBootstrap(group: self.application.eventLoopGroup.next())
             .connectTimeout(configuration.connectTimeout)
             .channelOption(ChannelOptions.socket(SocketOptionLevel(SOL_SOCKET), SO_REUSEADDR), value: 1)
             .channelInitializer { channel in
@@ -142,7 +141,7 @@ public extension Request {
             connection.whenSuccess { $0.close(promise: nil) }
             return Result.success(true)
         }.flatMapError { error -> EventLoopFuture<Result<Bool, Error>> in
-            return self.eventLoop.makeSucceededFuture(Result.failure(error))
+            return self.application.eventLoopGroup.future(Result.failure(error))
         }
     }
 }

Sources/Smtp/Request+Send.swift

@@ -0,0 +1,23 @@
+import Foundation
+import NIO
+import NIOSSL
+import Vapor
+
+public extension Request {
+    var smtp: Smtp {
+        .init(request: self)
+    }
+
+    struct Smtp {
+        let request: Request
+
+        func send(_ email: Email, logHandler: ((String) -> Void)? = nil) -> EventLoopFuture<Result<Bool, Error>> {
+            return self.request.application.smtp.send(email, logHandler: logHandler)
+        }
+    }
+    
+    @available(*, deprecated, message: "Function is depraceted and will be deleted in Smtp 3.0. Please use: request.smtp.send() instead.")
+    func send(_ email: Email, logHandler: ((String) -> Void)? = nil) -> EventLoopFuture<Result<Bool, Error>> {
+        return self.application.smtp.send(email, logHandler: logHandler)
+    }
+}

Tests/SmtpTests/SmtpTests.swift

@@ -38,15 +38,36 @@ final class SmtpTests: XCTestCase {
                           body: "This is email body.")
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
         }.wait()
-        
+
         sleep(3)
     }
 
+    func testSendTextMessageViaApplication() throws {
+        let application = Application()
+        defer {
+            application.shutdown()
+        }
+
+        application.smtp.configuration = smtpConfiguration
+        let email = Email(from: EmailAddress(address: "[email protected]", name: "John Doe"),
+                          to: [EmailAddress(address: "[email protected]", name: "Ben Doe")],
+                          subject: "The subject (text) - \(timestamp)",
+                          body: "This is email body.")
+        
+        try application.smtp.send(email) { message in
+            print(message)
+        }.flatMapThrowing { result in
+            XCTAssertTrue(try result.get())
+        }.wait()
+
+        sleep(3)
+    }
+    
     func testSendTextMessageWithoutNames() throws {
         let application = Application()
         defer {
@@ -60,7 +81,7 @@ final class SmtpTests: XCTestCase {
                           body: "This is email body.")
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -83,7 +104,7 @@ final class SmtpTests: XCTestCase {
                           isBodyHtml: true)
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -108,7 +129,7 @@ final class SmtpTests: XCTestCase {
         email.addAttachment(Attachment(name: "image.png", contentType: "image/png", data: Attachments.image()))
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -134,7 +155,7 @@ final class SmtpTests: XCTestCase {
         email.addAttachment(Attachment(name: "image.png", contentType: "image/png", data: Attachments.image()))
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -159,7 +180,7 @@ final class SmtpTests: XCTestCase {
                           body: "This is email body.")
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -188,7 +209,7 @@ final class SmtpTests: XCTestCase {
                           body: "This is email body.")
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -211,7 +232,7 @@ final class SmtpTests: XCTestCase {
                           replyTo: EmailAddress(address: "[email protected]"))
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -236,7 +257,7 @@ final class SmtpTests: XCTestCase {
         email.addAttachment(Attachment(name: "image.png", contentType: "image/png", data: Attachments.image()))
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())
@@ -259,7 +280,7 @@ final class SmtpTests: XCTestCase {
         email.addAttachment(Attachment(name: "image.png", contentType: "image/png", data: Attachments.image()))
 
         let request = Request(application: application, on: application.eventLoopGroup.next())
-        try request.send(email) { message in
+        try request.smtp.send(email) { message in
             print(message)
         }.flatMapThrowing { result in
             XCTAssertTrue(try result.get())