Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

AsposeWordsCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AsposeWordsCloud'
-  s.version          = '21.5'
+  s.version          = '21.6'
   s.summary          = 'Aspose Words for Cloud.'
   s.homepage         = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

README.md

@@ -13,6 +13,13 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 21.6
+
+- Implemented beta version of CompareDocumentOnline feature with both document sending in request
+- CompareDocument method now can handle PDF files
+- AcceptAllRevisionsBeforeComparison option introduced which is used to specify if accept all revisions before comparison
+
+
 ## Enhancements in Version 21.5
 
 - Update dependencies in sdk
@@ -135,7 +142,7 @@ Add link to this repository as dependency to your Package.swift:
 
 dependencies: [
     // Dependencies declare other packages that this package depends on.
-    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.5"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.6"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -153,7 +160,7 @@ targets: [
 Add link to git repository as dependency to your Podfile:
 
 ```ruby
-pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.5'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.6'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -117,6 +117,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "21.5";
+        return "21.6";
     }
 }

Sources/AsposeWordsCloud/Model/CompareOptions.swift

@@ -39,6 +39,9 @@ public class CompareOptions : Codable, WordsApiModel {
         case new = "New"
     }
 
+    // Field of acceptAllRevisionsBeforeComparison. DTO container with compare documents options.
+    private var acceptAllRevisionsBeforeComparison : Bool?;
+
     // Field of ignoreCaseChanges. DTO container with compare documents options.
     private var ignoreCaseChanges : Bool?;
 
@@ -67,6 +70,7 @@ public class CompareOptions : Codable, WordsApiModel {
     private var target : Target?;
 
     private enum CodingKeys: String, CodingKey {
+        case acceptAllRevisionsBeforeComparison = "AcceptAllRevisionsBeforeComparison";
         case ignoreCaseChanges = "IgnoreCaseChanges";
         case ignoreComments = "IgnoreComments";
         case ignoreFields = "IgnoreFields";
@@ -84,6 +88,7 @@ public class CompareOptions : Codable, WordsApiModel {
 
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
+        self.acceptAllRevisionsBeforeComparison = try container.decodeIfPresent(Bool.self, forKey: .acceptAllRevisionsBeforeComparison);
         self.ignoreCaseChanges = try container.decodeIfPresent(Bool.self, forKey: .ignoreCaseChanges);
         self.ignoreComments = try container.decodeIfPresent(Bool.self, forKey: .ignoreComments);
         self.ignoreFields = try container.decodeIfPresent(Bool.self, forKey: .ignoreFields);
@@ -97,6 +102,9 @@ public class CompareOptions : Codable, WordsApiModel {
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self);
+        if (self.acceptAllRevisionsBeforeComparison != nil) {
+            try container.encode(self.acceptAllRevisionsBeforeComparison, forKey: .acceptAllRevisionsBeforeComparison);
+        }
         if (self.ignoreCaseChanges != nil) {
             try container.encode(self.ignoreCaseChanges, forKey: .ignoreCaseChanges);
         }
@@ -126,6 +134,16 @@ public class CompareOptions : Codable, WordsApiModel {
         }
     }
 
+    // Sets acceptAllRevisionsBeforeComparison. Gets or sets whether accept revisions before comparison or not.
+    public func setAcceptAllRevisionsBeforeComparison(acceptAllRevisionsBeforeComparison : Bool?) {
+        self.acceptAllRevisionsBeforeComparison = acceptAllRevisionsBeforeComparison;
+    }
+
+    // Gets acceptAllRevisionsBeforeComparison. Gets or sets whether accept revisions before comparison or not.
+    public func getAcceptAllRevisionsBeforeComparison() -> Bool? {
+        return self.acceptAllRevisionsBeforeComparison;
+    }
+
     // Sets ignoreCaseChanges. Gets or sets a value indicating whether documents comparison is case insensitive. By default comparison is case sensitive.
     public func setIgnoreCaseChanges(ignoreCaseChanges : Bool?) {
         self.ignoreCaseChanges = ignoreCaseChanges;

Sources/AsposeWordsCloud/Model/Requests/CompareDocumentOnlineRequest.swift

@@ -31,23 +31,26 @@ import Foundation
 public class CompareDocumentOnlineRequest : WordsApiRequest {
     private let document : InputStream;
     private let compareData : CompareData;
+    private let comparingDocument : InputStream?;
     private let loadEncoding : String?;
     private let password : String?;
     private let destFileName : String?;
 
     private enum CodingKeys: String, CodingKey {
         case document;
         case compareData;
+        case comparingDocument;
         case loadEncoding;
         case password;
         case destFileName;
         case invalidCodingKey;
     }
 
     // Initializes a new instance of the CompareDocumentOnlineRequest class.
-    public init(document : InputStream, compareData : CompareData, loadEncoding : String? = nil, password : String? = nil, destFileName : String? = nil) {
+    public init(document : InputStream, compareData : CompareData, comparingDocument : InputStream? = nil, loadEncoding : String? = nil, password : String? = nil, destFileName : String? = nil) {
         self.document = document;
         self.compareData = compareData;
+        self.comparingDocument = comparingDocument;
         self.loadEncoding = loadEncoding;
         self.password = password;
         self.destFileName = destFileName;
@@ -63,6 +66,11 @@ public class CompareDocumentOnlineRequest : WordsApiRequest {
         return self.compareData;
     }
 
+    // The comparing document.
+    public func getComparingDocument() -> InputStream? {
+        return self.comparingDocument;
+    }
+
     // Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
     public func getLoadEncoding() -> String? {
         return self.loadEncoding;
@@ -106,6 +114,10 @@ public class CompareDocumentOnlineRequest : WordsApiRequest {
 
          formParams.append(RequestFormParam(name: "compareData", body: try ObjectSerializer.serialize(value: self.getCompareData()), contentType: "application/json"));
 
+         if (self.getComparingDocument() != nil) {
+             formParams.append(RequestFormParam(name: "comparingDocument", body: try ObjectSerializer.serializeFile(value: self.getComparingDocument()!), contentType: "application/octet-stream"));
+         }
+
 
          var result = WordsApiRequestData(url: urlBuilder.url!, method: "PUT");
          result.setBody(formParams: formParams);

Tests/AsposeWordsCloudTests/CompareDocumentTests.swift

@@ -32,7 +32,8 @@ import XCTest
 class CompareDocumentTests: BaseTestContext {
     static var allTests = [
         ("testCompareDocument", testCompareDocument),
-        ("testCompareDocumentOnline", testCompareDocumentOnline)
+        ("testCompareDocumentOnline", testCompareDocumentOnline),
+        ("testCompareTwoDocumentOnline", testCompareTwoDocumentOnline)
     ];
 
     let remoteFolder = BaseTestContext.getRemoteTestDataFolder() + "/DocumentActions/CompareDocument";
@@ -77,4 +78,22 @@ class CompareDocumentTests: BaseTestContext {
       let request = CompareDocumentOnlineRequest(document: InputStream(url: self.getLocalTestDataFolder().appendingPathComponent(localFolder + "/" + localName1, isDirectory: false))!, compareData: requestCompareData, destFileName: BaseTestContext.getRemoteTestOut() + "/TestCompareDocumentOut.doc");
       _ = try super.getApi().compareDocumentOnline(request: request);
     }
+
+    // Test for document comparison online.
+    func testCompareTwoDocumentOnline() throws {
+      let localName1 = "compareTestDoc1.doc";
+      let localName2 = "compareTestDoc2.doc";
+      let remoteName2 = "TestCompareDocument2.doc";
+
+      try super.uploadFile(fileContent: getLocalTestDataFolder().appendingPathComponent(localFolder + "/" + localName2, isDirectory: false), path: remoteFolder + "/" + remoteName2);
+
+      let requestCompareData = CompareData();
+      requestCompareData.setAuthor(author: "author");
+      requestCompareData.setComparingWithDocument(comparingWithDocument: remoteFolder + "/" + remoteName2);
+      requestCompareData.setDateTime(dateTime: ObjectSerializer.customIso8601.date(from: "2015-10-26T00:00:00Z")!);
+
+
+      let request = CompareDocumentOnlineRequest(document: InputStream(url: self.getLocalTestDataFolder().appendingPathComponent(localFolder + "/" + localName1, isDirectory: false))!, compareData: requestCompareData, comparingDocument: InputStream(url: self.getLocalTestDataFolder().appendingPathComponent(localFolder + "/" + localName2, isDirectory: false))!, destFileName: BaseTestContext.getRemoteTestOut() + "/TestCompareDocumentOut.doc");
+      _ = try super.getApi().compareDocumentOnline(request: request);
+    }
 }