From 05f89f6e8036154909059da6ff298f96a9b3a1df Mon Sep 17 00:00:00 2001 From: S4cha Date: Wed, 29 Jul 2020 15:44:47 +0200 Subject: [PATCH] Renames HttpBodyConvertable to HttpBodyConvertible --- ...ttpBodyConvertable.swift => HttpBodyConvertible.swift} | 4 ++-- ...able.swift => MultipartData+HttpBodyConvertible.swift} | 4 ++-- ...Convertable.swift => Params+HttpBodyConvertible.swift} | 8 +++----- Sources/Networking/NetworkingRequest.swift | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) rename Sources/Networking/Multipart/{HttpBodyConvertable.swift => HttpBodyConvertible.swift} (65%) rename Sources/Networking/Multipart/{MultipartData+HttpBodyConvertable.swift => MultipartData+HttpBodyConvertible.swift} (88%) rename Sources/Networking/Multipart/{Params+HttpBodyConvertable.swift => Params+HttpBodyConvertible.swift} (78%) diff --git a/Sources/Networking/Multipart/HttpBodyConvertable.swift b/Sources/Networking/Multipart/HttpBodyConvertible.swift similarity index 65% rename from Sources/Networking/Multipart/HttpBodyConvertable.swift rename to Sources/Networking/Multipart/HttpBodyConvertible.swift index 85035b9..9ba564d 100644 --- a/Sources/Networking/Multipart/HttpBodyConvertable.swift +++ b/Sources/Networking/Multipart/HttpBodyConvertible.swift @@ -1,5 +1,5 @@ // -// HttpBodyConvertable.swift +// HttpBodyConvertible.swift // // // Created by Jeff Barg on 07/22/2020. @@ -7,6 +7,6 @@ import Foundation -public protocol HttpBodyConvertable { +public protocol HttpBodyConvertible { func buildHttpBodyPart(boundary: String) -> Data } diff --git a/Sources/Networking/Multipart/MultipartData+HttpBodyConvertable.swift b/Sources/Networking/Multipart/MultipartData+HttpBodyConvertible.swift similarity index 88% rename from Sources/Networking/Multipart/MultipartData+HttpBodyConvertable.swift rename to Sources/Networking/Multipart/MultipartData+HttpBodyConvertible.swift index 374edf0..0c83540 100644 --- a/Sources/Networking/Multipart/MultipartData+HttpBodyConvertable.swift +++ b/Sources/Networking/Multipart/MultipartData+HttpBodyConvertible.swift @@ -1,5 +1,5 @@ // -// MultipartData+HttpBody.swift +// MultipartData+HttpBodyConvertible.swift // // // Created by Sacha on 13/03/2020. @@ -7,7 +7,7 @@ import Foundation -extension MultipartData: HttpBodyConvertable { +extension MultipartData: HttpBodyConvertible { public func buildHttpBodyPart(boundary: String) -> Data { let httpBody = NSMutableData() httpBody.appendString("--\(boundary)\r\n") diff --git a/Sources/Networking/Multipart/Params+HttpBodyConvertable.swift b/Sources/Networking/Multipart/Params+HttpBodyConvertible.swift similarity index 78% rename from Sources/Networking/Multipart/Params+HttpBodyConvertable.swift rename to Sources/Networking/Multipart/Params+HttpBodyConvertible.swift index 76dc652..4b84941 100644 --- a/Sources/Networking/Multipart/Params+HttpBodyConvertable.swift +++ b/Sources/Networking/Multipart/Params+HttpBodyConvertible.swift @@ -1,5 +1,5 @@ // -// Params+HttpBodyConvertable.swift +// Params+HttpBodyConvertible.swift // // // Created by Jeff Barg on 07/22/2020. @@ -7,17 +7,15 @@ import Foundation -extension Params: HttpBodyConvertable { +extension Params: HttpBodyConvertible { public func buildHttpBodyPart(boundary: String) -> Data { let httpBody = NSMutableData() - - self.forEach { (name, value) in + forEach { (name, value) in httpBody.appendString("--\(boundary)\r\n") httpBody.appendString("Content-Disposition: form-data; name=\"\(name)\"\r\n\r\n") httpBody.appendString(value.description) httpBody.appendString("\r\n") } - return httpBody as Data } } diff --git a/Sources/Networking/NetworkingRequest.swift b/Sources/Networking/NetworkingRequest.swift index ff6042f..459c7bc 100644 --- a/Sources/Networking/NetworkingRequest.swift +++ b/Sources/Networking/NetworkingRequest.swift @@ -157,12 +157,12 @@ public class NetworkingRequest: NSObject { private func buildMultipartHttpBody(params: Params, multiparts: [MultipartData], boundary: String) -> Data { // Combine all multiparts together - let allMultiparts: [HttpBodyConvertable] = [params] + multiparts; + let allMultiparts: [HttpBodyConvertible] = [params] + multiparts; let boundaryEnding = "--\(boundary)--".data(using: .utf8)! // Convert multiparts to boundary-seperated Data and combine them return allMultiparts - .map { (multipart: HttpBodyConvertable) -> Data in + .map { (multipart: HttpBodyConvertible) -> Data in return multipart.buildHttpBodyPart(boundary: boundary) } .reduce(Data.init(), +)