call willSendRequest for multipart requests.

Author: DenTelezhkin

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.4.1](https://github.com/MLSDev/TRON/releases/tag/0.4.1)
+
+### Fixed
+
+* Plugins are now correctly notified with "willSendRequest(_:)" method call for multipart requests.
+
 ## [0.4.0](https://github.com/MLSDev/TRON/releases/tag/0.4.0)
 
 ### Breaking

Source/Core/APIRequest.swift

@@ -182,26 +182,23 @@ public class APIRequest<Model: ResponseParseable, ErrorModel: ResponseParseable>
         guard let manager = tronDelegate?.manager else {
             fatalError("Manager cannot be nil while performing APIRequest")
         }
-        let alamofireRequest = manager.request(method, urlBuilder.urlForPath(path),
+        let request = manager.request(method, urlBuilder.urlForPath(path),
             parameters: parameters,
             encoding: encoding,
             headers:  headerBuilder.headersForAuthorization(authorizationRequirement, headers: headers))
 
         // Notify plugins about new network request
-        tronDelegate?.plugins.forEach {
-            $0.willSendRequest(alamofireRequest.request)
-        }
-        plugins.forEach {
-            $0.willSendRequest(alamofireRequest.request)
-        }
         let allPlugins = plugins + (tronDelegate?.plugins ?? [])
-        alamofireRequest.validate().handleResponse(success,
+        allPlugins.forEach {
+            $0.willSendRequest(request.request)
+        }
+        request.validate().handleResponse(success,
             failure: failure,
             dispatcher : dispatcher,
             responseBuilder: responseBuilder,
             errorBuilder: errorBuilder,
             plugins: allPlugins)
-        return alamofireRequest
+        return request
     }
 }
 

Source/Core/MultipartAPIRequest.swift

@@ -105,6 +105,9 @@ public class MultipartAPIRequest<Model: ResponseParseable, ErrorModel: ResponseP
                 failure?(apiError)
             } else if case .Success(let request, _, _) = completion {
                 let allPlugins = self.plugins + (self.tronDelegate?.plugins ?? [])
+                allPlugins.forEach {
+                    $0.willSendRequest(request.request)
+                }
                 request.progress(progress).validate().handleResponse(success, failure: failure, dispatcher: self.dispatcher, responseBuilder: self.responseBuilder, errorBuilder: self.errorBuilder, plugins: allPlugins)
                 cancellableCallback(request)
             }

Tests/PluginTestCase.swift

@@ -50,4 +50,21 @@ class PluginTestCase: XCTestCase {
 
     }
 
+    func testMultipartRequestsCallGlobalAndLocalPlugins() {
+        let globalPluginTester = PluginTester()
+        let localPluginTester = PluginTester()
+        
+        let tron = TRON(baseURL: "http://httpbin.org")
+        let request: MultipartAPIRequest<String,Int> = tron.multipartRequest(path: "status/200")
+        request.plugins.append(localPluginTester)
+        tron.plugins.append(globalPluginTester)
+        
+        request.performWithSuccess( { _ in }, failure: nil, progress: { (_) in }, cancellableCallback: { _ in })
+        
+        expect(localPluginTester.willSendCalled).toEventually(equal(true))
+        expect(globalPluginTester.willSendCalled).toEventually(equal(true))
+        expect(localPluginTester.didReceiveResponseCalled).toEventually(equal(true))
+        expect(globalPluginTester.didReceiveResponseCalled).toEventually(equal(true))
+    }
+    
 }