Add form-data file container

Author: rogermolas

Example/Demo.xcodeproj/project.pbxproj

@@ -154,7 +154,7 @@
 				1D2CCCE220BD3F56002D0ACC /* Sources */,
 				1D2CCCE320BD3F56002D0ACC /* Frameworks */,
 				1D2CCCE420BD3F56002D0ACC /* Resources */,
-				B3E033231D1ABE0A13F32686 /* [CP] Embed Pods Frameworks */,
+				6A8E04F756F17B2B6C20B160 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -263,39 +263,39 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A7870D15C3A8DD987B733581 /* [CP] Check Pods Manifest.lock */ = {
+		6A8E04F756F17B2B6C20B160 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-DemoTests-checkManifestLockResult.txt",
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B3E033231D1ABE0A13F32686 /* [CP] Embed Pods Frameworks */ = {
+		A7870D15C3A8DD987B733581 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-DemoTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		BD48511BE9E153A767A947C2 /* [CP] Embed Pods Frameworks */ = {

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - RMHttp (1.5.0)
+  - RMHttp (1.6.0)
 
 DEPENDENCIES:
   - RMHttp (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  RMHttp: fce70e5558179acde55ccb99ef7e0eeb1e9b3314
+  RMHttp: 56238b4b0cf7348bc679b1783326ad01b2dda349
 
 PODFILE CHECKSUM: 823b377b5b04076a920183be778a664128b2ad2d
 

RMFormDataFile.swift RMHttp/Classes/RMFormDataFile.swiftRMFormDataFile.swift renamed to RMHttp/Classes/RMFormDataFile.swift

@@ -146,18 +146,28 @@ extension RMRequest {
 	}
 
 	// Form-Data from params
-	public func setFormData(fields: [String : Any]) {
+	public func setFormData(fields: [String : Any], _ files: [RMFormDataFile]? = nil) {
 		let boundary = UUID().uuidString
 		if urlRequest.value(forHTTPHeaderField: HeaderField.contentType.rawValue) == nil {
-			urlRequest.setValue("\(HeaderValue.FormData.rawValue)\(boundary)",
-				forHTTPHeaderField: HeaderField.contentType.rawValue)
+			urlRequest.setValue("\(HeaderValue.FormData.rawValue)\(boundary)", forHTTPHeaderField: HeaderField.contentType.rawValue)
 		}
 		var data = Data()
 		for (key, value) in fields {
 			data.append("\r\n--\(boundary)\r\n".data(using: .utf8)!)
 			data.append("Content-Disposition: form-data; name=\"\(key)\"\r\n\r\n".data(using: .utf8)!)
 			data.append("\(value)".data(using: .utf8)!)
 		}
+		
+		// Add File fields (optional)
+		if files != nil {
+			for file in files! {
+				data.append("\r\n--\(boundary)\r\n".data(using: .utf8)!)
+				data.append("Content-Disposition: form-data; name=\"\(file.fieldName)\"; filename=\"\(file.fileName)\"\r\n".data(using: .utf8)!)
+				data.append("Content-Type: \(file.mimeType)\r\n\r\n".data(using: .utf8)!)
+				data.append(file.file) // In data representation
+				data.append("\r\n--\(boundary)--\r\n".data(using: .utf8)!)
+			}
+		}
 		self.urlRequest.httpBody = data // One time set data body
 	}