for Aspose.Cells.Cloud Swift SDK 19.10 release

Author: leoluo5

AsposeCellsCloud.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "AsposeCellsCloud"
-  s.version      = "19.9"
+  s.version      = "19.10"
   s.summary      = "Aspose.Cells Cloud SDK for Swift."
   s.swift_version = "4.1"
 
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   #   * Finally, don't worry about the indent, CocoaPods strips it!
   s.description  = "This repository contains Aspose.Cells Cloud SDK for swift source code. This SDK allows you to work with Aspose.Cells Cloud REST APIs in your swift applications quickly and easily."
 
-  s.homepage     = "https://products.aspose.cloud/cells/cloud"
+  s.homepage     = "https://products.aspose.cloud/cells"
   # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
 
 
@@ -132,6 +132,6 @@ Pod::Spec.new do |s|
   # s.requires_arc = true
 
   # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
-  s.dependency "Alamofire", "~> 4.8.2"
+  s.dependency "Alamofire", "~> 4.7.1"
 
 end

AsposeCellsCloud/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>19.9</string>
+	<string>19.10</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

AsposeCellsCloud/Swaggers/APIs/CellsAPI.swift

@@ -2241,13 +2241,13 @@ open class CellsAPI {
      - parameter name: (path)  
      - parameter sheetName: (path)  
      - parameter cellArea: (query)  
-     - parameter formatcondition: (body)  (optional)
+     - parameter formatCondition: (body)  (optional)
      - parameter folder: (query)  (optional)
      - parameter storage: (query) storage name. (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func cellsConditionalFormattingsPutWorksheetConditionalFormatting(name: String, sheetName: String, cellArea: String, formatcondition: FormatCondition? = nil, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellsCloudResponse?,_ error: Error?) -> Void)) {
-        cellsConditionalFormattingsPutWorksheetConditionalFormattingWithRequestBuilder(name: name, sheetName: sheetName, cellArea: cellArea, formatcondition: formatcondition, folder: folder, storage: storage).execute { (response, error) -> Void in
+    open class func cellsConditionalFormattingsPutWorksheetConditionalFormatting(name: String, sheetName: String, cellArea: String, formatCondition: FormatCondition? = nil, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellsCloudResponse?,_ error: Error?) -> Void)) {
+        cellsConditionalFormattingsPutWorksheetConditionalFormattingWithRequestBuilder(name: name, sheetName: sheetName, cellArea: cellArea, formatCondition: formatCondition, folder: folder, storage: storage).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -2264,13 +2264,13 @@ open class CellsAPI {
      - parameter name: (path)  
      - parameter sheetName: (path)  
      - parameter cellArea: (query)  
-     - parameter formatcondition: (body)  (optional)
+     - parameter formatCondition: (body)  (optional)
      - parameter folder: (query)  (optional)
      - parameter storage: (query) storage name. (optional)
 
      - returns: RequestBuilder<CellsCloudResponse> 
      */
-    open class func cellsConditionalFormattingsPutWorksheetConditionalFormattingWithRequestBuilder(name: String, sheetName: String, cellArea: String, formatcondition: FormatCondition? = nil, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
+    open class func cellsConditionalFormattingsPutWorksheetConditionalFormattingWithRequestBuilder(name: String, sheetName: String, cellArea: String, formatCondition: FormatCondition? = nil, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
         var path = "/cells/{name}/worksheets/{sheetName}/conditionalFormattings"
         let namePreEscape = "\(name)"
         let namePostEscape = namePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
@@ -2279,7 +2279,7 @@ open class CellsAPI {
         let sheetNamePostEscape = sheetNamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{sheetName}", with: sheetNamePostEscape, options: .literal, range: nil)
         let URLString = AsposeCellsCloudAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: formatcondition)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: formatCondition)
 
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
@@ -7579,12 +7579,13 @@ open class CellsAPI {
      - parameter name: (path) Workbook name. 
      - parameter sheetName: (path) Worksheet name. 
      - parameter cellName: (path) The cell name. 
+     - parameter htmlString: (body)  
      - parameter folder: (query) The workbook folder. (optional)
      - parameter storage: (query) storage name. (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func cellsPostSetCellHtmlString(name: String, sheetName: String, cellName: String, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellResponse?,_ error: Error?) -> Void)) {
-        cellsPostSetCellHtmlStringWithRequestBuilder(name: name, sheetName: sheetName, cellName: cellName, folder: folder, storage: storage).execute { (response, error) -> Void in
+    open class func cellsPostSetCellHtmlString(name: String, sheetName: String, cellName: String, htmlString: NSData, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellResponse?,_ error: Error?) -> Void)) {
+        cellsPostSetCellHtmlStringWithRequestBuilder(name: name, sheetName: sheetName, cellName: cellName, htmlString: htmlString, folder: folder, storage: storage).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -7598,12 +7599,13 @@ open class CellsAPI {
      - parameter name: (path) Workbook name. 
      - parameter sheetName: (path) Worksheet name. 
      - parameter cellName: (path) The cell name. 
+     - parameter htmlString: (body)  
      - parameter folder: (query) The workbook folder. (optional)
      - parameter storage: (query) storage name. (optional)
 
      - returns: RequestBuilder<CellResponse> 
      */
-    open class func cellsPostSetCellHtmlStringWithRequestBuilder(name: String, sheetName: String, cellName: String, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellResponse> {
+    open class func cellsPostSetCellHtmlStringWithRequestBuilder(name: String, sheetName: String, cellName: String, htmlString: NSData, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellResponse> {
         var path = "/cells/{name}/worksheets/{sheetName}/cells/{cellName}/htmlstring"
         let namePreEscape = "\(name)"
         let namePostEscape = namePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
@@ -7615,8 +7617,8 @@ open class CellsAPI {
         let cellNamePostEscape = cellNamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{cellName}", with: cellNamePostEscape, options: .literal, range: nil)
         let URLString = AsposeCellsCloudAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: htmlString)
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "folder": folder, 
@@ -7625,7 +7627,7 @@ open class CellsAPI {
 
         let requestBuilder: RequestBuilder<CellResponse>.Type = AsposeCellsCloudAPI.requestBuilderFactory.getBuilder()
 
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
     /**
@@ -10499,13 +10501,13 @@ open class CellsAPI {
     /**
 
      - parameter name: (path)  
-     - parameter importdata: (body)  
+     - parameter importData: (body)  
      - parameter folder: (query)  (optional)
      - parameter storage: (query) storage name. (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func cellsWorkbookPostImportData(name: String, importdata: ImportOption, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellsCloudResponse?,_ error: Error?) -> Void)) {
-        cellsWorkbookPostImportDataWithRequestBuilder(name: name, importdata: importdata, folder: folder, storage: storage).execute { (response, error) -> Void in
+    open class func cellsWorkbookPostImportData(name: String, importData: ImportOption, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellsCloudResponse?,_ error: Error?) -> Void)) {
+        cellsWorkbookPostImportDataWithRequestBuilder(name: name, importData: importData, folder: folder, storage: storage).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -10519,19 +10521,19 @@ open class CellsAPI {
 }}]
 
      - parameter name: (path)  
-     - parameter importdata: (body)  
+     - parameter importData: (body)  
      - parameter folder: (query)  (optional)
      - parameter storage: (query) storage name. (optional)
 
      - returns: RequestBuilder<CellsCloudResponse> 
      */
-    open class func cellsWorkbookPostImportDataWithRequestBuilder(name: String, importdata: ImportOption, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
+    open class func cellsWorkbookPostImportDataWithRequestBuilder(name: String, importData: ImportOption, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
         var path = "/cells/{name}/importdata"
         let namePreEscape = "\(name)"
         let namePostEscape = namePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{name}", with: namePostEscape, options: .literal, range: nil)
         let URLString = AsposeCellsCloudAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: importdata)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: importData)
 
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
@@ -11156,6 +11158,59 @@ open class CellsAPI {
         return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     Clear all validation in worksheet.
+     
+     - parameter name: (path) Document name. 
+     - parameter sheetName: (path) Worksheet name. 
+     - parameter folder: (query) Document&#39;s folder. (optional)
+     - parameter storage: (query) storage name. (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func cellsWorksheetValidationsDeleteWorksheetValidations(name: String, sheetName: String, folder: String? = nil, storage: String? = nil, completion: @escaping ((_ data: CellsCloudResponse?,_ error: Error?) -> Void)) {
+        cellsWorksheetValidationsDeleteWorksheetValidationsWithRequestBuilder(name: name, sheetName: sheetName, folder: folder, storage: storage).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+
+    /**
+     Clear all validation in worksheet.
+     - DELETE /cells/{name}/worksheets/{sheetName}/validations
+     - examples: [{contentType=application/json, example={
+  "Status" : "Status",
+  "Code" : 0
+}}]
+     
+     - parameter name: (path) Document name. 
+     - parameter sheetName: (path) Worksheet name. 
+     - parameter folder: (query) Document&#39;s folder. (optional)
+     - parameter storage: (query) storage name. (optional)
+
+     - returns: RequestBuilder<CellsCloudResponse> 
+     */
+    open class func cellsWorksheetValidationsDeleteWorksheetValidationsWithRequestBuilder(name: String, sheetName: String, folder: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
+        var path = "/cells/{name}/worksheets/{sheetName}/validations"
+        let namePreEscape = "\(name)"
+        let namePostEscape = namePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{name}", with: namePostEscape, options: .literal, range: nil)
+        let sheetNamePreEscape = "\(sheetName)"
+        let sheetNamePostEscape = sheetNamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{sheetName}", with: sheetNamePostEscape, options: .literal, range: nil)
+        let URLString = AsposeCellsCloudAPI.basePath + path
+        let parameters: [String:Any]? = nil
+        
+        var url = URLComponents(string: URLString)
+        url?.queryItems = APIHelper.mapValuesToQueryItems([
+            "folder": folder, 
+            "storage": storage
+        ])
+
+        let requestBuilder: RequestBuilder<CellsCloudResponse>.Type = AsposeCellsCloudAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
     /**
      Get worksheet validation by index.
 

AsposeCellsCloud/Swaggers/AlamofireImplementations.swift

@@ -70,21 +70,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
                                                            .map { $0.0 }
 
-        //modify by leo.luo, 2018-12
-        //if fileKeys.count > 0 {
-        if fileKeys.count == 1 {
-            
-            var imageData :Data?
-            do{
-                imageData = try Data(contentsOf: parameters![fileKeys[0]] as! URL, options: Data.ReadingOptions.mappedIfSafe)
-            } catch {
-                fatalError(error.localizedDescription)
-            }
-            
-            let upload = manager.upload(imageData!, to: URLString, method: xMethod!, headers: headers)
-            self.processRequest(request: upload, managerId, completion)
-            
-        } else if fileKeys.count > 1 {
+        if fileKeys.count > 0 {
             manager.upload(multipartFormData: { mpForm in
                 for (k, v) in self.parameters! {
                     switch v {

AsposeCellsCloudTests/AsposeCellsCloudTests.swift

@@ -147,73 +147,9 @@ class AsposeCellsCloudTests: XCTestCase {
     }
 
     internal func putCreate(path: String, file: URL, versionId: String? = nil, storage: String? = nil, completion: @escaping ((_ data: FilesUploadResult?,_ error: Error?) -> Void)) {
-        
-        //let filedata = NSData(contentsOfFile: file.path)
-        /*
-        Alamofire.upload(.POST, URL, multipartFormData: { (FormData) in
-            FormData.appendBodyPart(data: String(userInfo["id"] as! Int).dataUsingEncoding(NSUTF8StringEncoding)!, name: "userId")
-            FormData.appendBodyPart(data: nsData, name: "file", fileName: "fileName", mimeType: "image/png")
-        }, encodingCompletion: { (encodingResult) in
-            switch encodingResult {
-            case .Success(let upload, _, _):
-                upload.responseJSON(completionHandler: { (response) in
-                    print("\(response)")  //上传成功通过response返回json值
-                })
-            case .Failure(let error):
-                print(error)
-            }
-        })
-        */
-        
         CellsAPI.uploadFileWithRequestBuilder(path: path, file: file, storageName: storage).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
- 
-        /*
-        {
-            (response, error) in
-            guard error == nil else {
-                XCTFail("error uploading file \(path)")
-                return
-            }
-            if let response = response, response.errors == nil {
-                completion(response)
-            } else {
-                XCTFail("error uploading file \(path)")
-            }
-            
-        }
-        */
-        
-        /*
-            self.putCreateWithRequestBuilder(path: path, file: file, versionId: versionId, storage: storage).execute { (response, error) -> Void in
-                completion(response?.body, error);
-            }
- */
-    }
-    /*
-    internal func putCreateWithRequestBuilder(path: String, file: URL, versionId: String? = nil, storage: String? = nil) -> RequestBuilder<CellsCloudResponse> {
-        let pathUrl = "/storage/file/\(self.TEMPFOLDER)"
-        let URLString = AsposeCellsCloudAPI.basePath + pathUrl
-        let formParams: [String:Any?] = [
-            "File": file
-        ]
-        
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let urlObj = NSURLComponents(string: URLString)
-        urlObj?.queryItems = APIHelper.mapValuesToQueryItems([
-            "path": path,
-            "versionId": versionId,
-            "storage": storage
-            ])
-        
-        
-        let requestBuilder: RequestBuilder<CellsCloudResponse>.Type = AsposeCellsCloudAPI.requestBuilderFactory.getBuilder()
-        
-        return requestBuilder.init(method: "PUT", URLString: (urlObj?.string ?? URLString), parameters: parameters, isBody: false)
     }
-    */
 
 }

AsposeCellsCloudTests/CellsAPITests.swift

@@ -740,10 +740,12 @@ class CellsAPITests: AsposeCellsCloudTests {
         let sheetName:String = SHEET1
         let cellName:String = CellName
         let folder:String = TEMPFOLDER
+        let htmlString:String = "https://api.aspose.cloud/v3.0/cells";
+        let strData:NSData = htmlString.data(using: String.Encoding.utf8)! as NSData
         let storage:String? = nil
 
         uploadFile(name: name) {
-            CellsAPI.cellsPostSetCellHtmlString(name: name, sheetName: sheetName, cellName: cellName, folder: folder, storage: storage)
+            CellsAPI.cellsPostSetCellHtmlString(name: name, sheetName: sheetName, cellName: cellName, htmlString: strData, folder: folder, storage: storage)
             {
                 (response, error) in
                 guard error == nil else {

AsposeCellsCloudTests/CellsConditionalFormattingsAPITests.swift

@@ -181,7 +181,7 @@ class CellsConditionalFormattingsAPITests: AsposeCellsCloudTests {
 		let storage:String? = nil
 
 		uploadFile(name: name) {
-			CellsAPI.cellsConditionalFormattingsPutWorksheetConditionalFormatting(name: name, sheetName: sheetName, cellArea: cellArea, formatcondition: formatcondition, folder: folder, storage: storage)
+            CellsAPI.cellsConditionalFormattingsPutWorksheetConditionalFormatting(name: name, sheetName: sheetName, cellArea: cellArea, formatCondition: formatcondition, folder: folder, storage: storage)
 			{
 				(response, error) in
 				guard error == nil else {