Renames HttpBodyConvertable to HttpBodyConvertible

freshOS · Jul 29, 2020 · 05f89f6 · 05f89f6
1 parent 99d8118
commit 05f89f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/...rking/Multipart/HttpBodyConvertable.swift → ...rking/Multipart/HttpBodyConvertible.swift b/...rking/Multipart/HttpBodyConvertable.swift → ...rking/Multipart/HttpBodyConvertible.swift
@@ -1,12 +1,12 @@
 //
-//  HttpBodyConvertable.swift
+//  HttpBodyConvertible.swift
 //  
 //
 //  Created by Jeff Barg on 07/22/2020.
 //
 
 import Foundation
 
-public protocol HttpBodyConvertable {
+public protocol HttpBodyConvertible {
     func buildHttpBodyPart(boundary: String) -> Data
 }
diff --git a/...t/MultipartData+HttpBodyConvertable.swift → ...t/MultipartData+HttpBodyConvertible.swift b/...t/MultipartData+HttpBodyConvertable.swift → ...t/MultipartData+HttpBodyConvertible.swift
@@ -1,13 +1,13 @@
 //
-//  MultipartData+HttpBody.swift
+//  MultipartData+HttpBodyConvertible.swift
 //  
 //
 //  Created by Sacha on 13/03/2020.
 //
 
 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/...ultipart/Params+HttpBodyConvertable.swift → ...ultipart/Params+HttpBodyConvertible.swift b/...ultipart/Params+HttpBodyConvertable.swift → ...ultipart/Params+HttpBodyConvertible.swift
@@ -1,23 +1,21 @@
 //
-//  Params+HttpBodyConvertable.swift
+//  Params+HttpBodyConvertible.swift
 //  
 //
 //  Created by Jeff Barg on 07/22/2020.
 //
 
 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
@@ -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(), +)