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.2'
+  s.version          = '21.3'
   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' }

Examples/AcceptAllRevisions.swift

@@ -0,0 +1,14 @@
+import AsposeWordsCloud
+
+let currentDir = ...
+let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
+let api = WordsAPI(configuration: config);
+let fileName  = "test_doc.docx";
+
+// Upload original document to cloud storage.
+let uploadFileRequest = UploadFileRequest(fileContent: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!, path: fileName);
+_ = try api.uploadFile(request: uploadFileRequest);
+
+// Calls AcceptAllRevisions method for document in cloud.
+let request = AcceptAllRevisionsRequest(name: fileName);
+_ = try api.acceptAllRevisions(request: request);

Examples/AcceptAllRevisionsOnline.swift

@@ -0,0 +1,9 @@
+let currentDir = ...
+let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
+let api = WordsAPI(configuration: config);
+let fileName  = "test_doc.docx";
+
+// Calls AcceptAllRevisionsOnline method for document in cloud.
+let request = AcceptAllRevisionsOnlineRequest(document: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!);
+let acceptAllRevisionsOnlineResult = try api.acceptAllRevisionsOnline(request: request);
+try acceptAllRevisionsOnlineResult.getDocument()?.write(to: currentDir!.appendingPathComponent("test_result.docx", isDirectory: false));

ExamplesData/test_doc.docx

@@ -5,6 +5,7 @@ properties([
 			[$class: 'StringParameterDefinition', name: 'branch', defaultValue: 'master', description: 'the branch to build'],
 			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
             [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
+            [$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
 		]
 	]
 ])
@@ -26,7 +27,7 @@ node('words-linux') {
                     sh 'git clean -fdx'
 
                     if (needToBuild) {
-                        withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+                        withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                             sh 'mkdir -p Settings'
                             sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
                         }

Jenkinsfile

@@ -13,6 +13,12 @@ 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.3
+
+- Added 'UpdateCreatedTimeProperty' save option
+- Added Tables into HeaderFooter so it's possible to address paragraphs inside table which is located in headerfooter (sections/0/headersfooters/1/tables/0/rows/0/cells/0/paragraphs/0)
+
+
 ## Enhancements in Version 21.2
 
 - Added delete all comments method
@@ -115,7 +121,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.2"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.3"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -133,7 +139,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.2'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.3'
 ```
 
 ## Getting Started

README.md

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

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -57,6 +57,9 @@ public class SaveOptionsData : Codable, WordsApiModel {
     // Field of saveFormat. base container class for save options data.
     private var saveFormat : String?;
 
+    // Field of updateCreatedTimeProperty. base container class for save options data.
+    private var updateCreatedTimeProperty : Bool?;
+
     // Field of updateFields. base container class for save options data.
     private var updateFields : Bool?;
 
@@ -79,6 +82,7 @@ public class SaveOptionsData : Codable, WordsApiModel {
         case dmlRenderingMode = "DmlRenderingMode";
         case fileName = "FileName";
         case saveFormat = "SaveFormat";
+        case updateCreatedTimeProperty = "UpdateCreatedTimeProperty";
         case updateFields = "UpdateFields";
         case updateLastPrintedProperty = "UpdateLastPrintedProperty";
         case updateLastSavedTimeProperty = "UpdateLastSavedTimeProperty";
@@ -98,6 +102,7 @@ public class SaveOptionsData : Codable, WordsApiModel {
         self.dmlRenderingMode = try container.decodeIfPresent(String.self, forKey: .dmlRenderingMode);
         self.fileName = try container.decodeIfPresent(String.self, forKey: .fileName);
         self.saveFormat = try container.decodeIfPresent(String.self, forKey: .saveFormat);
+        self.updateCreatedTimeProperty = try container.decodeIfPresent(Bool.self, forKey: .updateCreatedTimeProperty);
         self.updateFields = try container.decodeIfPresent(Bool.self, forKey: .updateFields);
         self.updateLastPrintedProperty = try container.decodeIfPresent(Bool.self, forKey: .updateLastPrintedProperty);
         self.updateLastSavedTimeProperty = try container.decodeIfPresent(Bool.self, forKey: .updateLastSavedTimeProperty);
@@ -125,6 +130,9 @@ public class SaveOptionsData : Codable, WordsApiModel {
         if (self.saveFormat != nil) {
             try container.encode(self.saveFormat, forKey: .saveFormat);
         }
+        if (self.updateCreatedTimeProperty != nil) {
+            try container.encode(self.updateCreatedTimeProperty, forKey: .updateCreatedTimeProperty);
+        }
         if (self.updateFields != nil) {
             try container.encode(self.updateFields, forKey: .updateFields);
         }
@@ -202,6 +210,16 @@ public class SaveOptionsData : Codable, WordsApiModel {
         return self.saveFormat;
     }
 
+    // Sets updateCreatedTimeProperty. Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false.
+    public func setUpdateCreatedTimeProperty(updateCreatedTimeProperty : Bool?) {
+        self.updateCreatedTimeProperty = updateCreatedTimeProperty;
+    }
+
+    // Gets updateCreatedTimeProperty. Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false.
+    public func getUpdateCreatedTimeProperty() -> Bool? {
+        return self.updateCreatedTimeProperty;
+    }
+
     // Sets updateFields. Gets or sets a value indicating whether fields should be updated before saving the document to a fixed page format. The default value is true.
     public func setUpdateFields(updateFields : Bool?) {
         self.updateFields = updateFields;

Sources/AsposeWordsCloud/Model/SaveOptionsData.swift

@@ -0,0 +1,75 @@
+import AsposeWordsCloud
+
+import XCTest
+@testable import AsposeWordsCloud
+
+class ExamplesTests : XCTestCase
+{
+    static var allTests = [
+        ("testAcceptAllRevisions", testAcceptAllRevisions),
+        ("testAcceptAllRevisionsOnline", testAcceptAllRevisionsOnline)
+    ];
+
+    private var configuration : Configuration?;
+
+    private var currentDir : URL?;
+
+    override func setUp() {
+        if (self.configuration == nil) {
+            let baseFolder = URL(fileURLWithPath: #file)
+                .deletingLastPathComponent()
+                .deletingLastPathComponent()
+                .deletingLastPathComponent();
+
+            let credsUrl = baseFolder
+                .appendingPathComponent("Settings", isDirectory: true)
+                .appendingPathComponent("servercreds.json", isDirectory: false);
+
+            do {
+                let credsData = try Data(contentsOf: credsUrl);
+                self.configuration = try ObjectSerializer.deserialize(type: Configuration.self, from: credsData);
+            }
+            catch {
+                XCTFail("File servercreds.json not found in Settings folder of project root.");
+            }
+
+            currentDir = baseFolder
+                .appendingPathComponent("ExamplesData", isDirectory: true);
+
+            do {
+                let api = WordsAPI(configuration: configuration!);
+                _ = try api.uploadFile(request: UploadFileRequest(fileContent: InputStream(url: currentDir!.appendingPathComponent("test_doc.docx", isDirectory: false))!, path: "test_doc.docx"));
+            }
+            catch {
+                XCTFail("Failed to upload example documents.");
+            }
+        }
+    }
+
+    func testAcceptAllRevisions() throws
+    {
+        let config = configuration!;
+        let api = WordsAPI(configuration: config);
+        let fileName  = "test_doc.docx";
+
+        // Upload original document to cloud storage.
+        let uploadFileRequest = UploadFileRequest(fileContent: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!, path: fileName);
+        _ = try api.uploadFile(request: uploadFileRequest);
+
+        // Calls AcceptAllRevisions method for document in cloud.
+        let request = AcceptAllRevisionsRequest(name: fileName);
+        _ = try api.acceptAllRevisions(request: request);
+    }
+
+    func testAcceptAllRevisionsOnline() throws
+    {
+        let config = configuration!;
+        let api = WordsAPI(configuration: config);
+        let fileName  = "test_doc.docx";
+
+        // Calls AcceptAllRevisionsOnline method for document in cloud.
+        let request = AcceptAllRevisionsOnlineRequest(document: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!);
+        let acceptAllRevisionsOnlineResult = try api.acceptAllRevisionsOnline(request: request);
+        try acceptAllRevisionsOnlineResult.getDocument()?.write(to: currentDir!.appendingPathComponent("test_result.docx", isDirectory: false));
+    }
+}

Tests/AsposeWordsCloudTests/ExamplesTests.swift

@@ -72,6 +72,7 @@ public func allTests() -> [XCTestCaseEntry] {
         testCase(TableBorderTests.allTests),
         testCase(TextTests.allTests),
         testCase(WatermarkTests.allTests),
+        testCase(ExamplesTests.allTests),
     ]
 }
 #endif