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          = '22.9'
+  s.version          = '22.10'
   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,15 @@ 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 22.10
+
+- Added 'CacheHeaderFooterShapes' property for PdfSaveOptionsData class.
+- FileReference structure has been added that allows to determine how the document will be accessed: from the remote storage, or loaded directly in the request.
+- The 'AppendDocument' and 'AppendDocumentOnline' methods takes a 'FileReference' instead of an 'href' property.
+- Added property 'StartingNumber' for 'PageNumbers' class.
+- Added property 'GlobalCultureName' for 'FieldOptions' class.
+
+
 ## Enhancements in Version 22.9
 
 - CompressDocument method now can handle images.
@@ -234,7 +243,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: "22.9"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "22.10"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -252,7 +261,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 => '22.9'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.10'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -88,6 +88,11 @@ public class ApiInvoker {
         public var access_token : String?;
     }
 
+    // Internal function for prepare files content list
+    public func prepareFilesContent(_ : inout [FileReference]) {
+        // Do nothing...
+    }
+
     // Invoke request to the API with the specified set of arguments and execute callback after the request is completed
     public func invoke(apiRequestData : WordsApiRequestData, callback: @escaping (_ response: Data?, _ headers: [String: String], _ error: Error?) -> ()
     ) {

Sources/AsposeWordsCloud/Api/Configuration.swift

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

Sources/AsposeWordsCloud/Api/RequestFormParam.swift

@@ -31,11 +31,20 @@ import Foundation
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public struct RequestFormParam {
     private let name : String?;
+    private let filename : String?;
     private let body : Data;
     private let contentType : String;
 
     public init(name : String?, body : Data, contentType : String) {
         self.name = name;
+        self.filename = nil;
+        self.body = body;
+        self.contentType = contentType;
+    }
+
+    public init(name : String?, filename : String?, body : Data, contentType : String) {
+        self.name = name;
+        self.filename = filename;
         self.body = body;
         self.contentType = contentType;
     }
@@ -44,6 +53,10 @@ public struct RequestFormParam {
         return self.name;
     }
 
+    public func getFilename() -> String? {
+        return self.filename;
+    }
+
     public func getBody() -> Data {
         return self.body;
     }

Sources/AsposeWordsCloud/Api/WordsApiModel.swift

@@ -30,5 +30,5 @@ import Foundation
 // General protocol for all models.
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public protocol WordsApiModel {
-
+    func collectFilesContent(_ resultFilesContent : inout [FileReference]);
 }

Sources/AsposeWordsCloud/Api/WordsApiRequestData.swift

@@ -82,6 +82,9 @@ public struct WordsApiRequestData {
                 if (formParam.getName() != nil) {
                     formBody.append("; name=\"\(formParam.getName()!)\"".data(using: .utf8)!);
                 }
+                if (formParam.getFilename() != nil) {
+                    formBody.append("; filename=\"\(formParam.getFilename()!)\"".data(using: .utf8)!);
+                }
                 formBody.append("\r\n\r\n".data(using: .utf8)!);
                 formBody.append(formParam.getBody());
             }

Sources/AsposeWordsCloud/Model/ApiError.swift

@@ -135,6 +135,9 @@ public class ApiError : Codable, WordsApiModel {
         }
     }
 
+    public func collectFilesContent(_ resultFilesContent : inout [FileReference]) {
+    }
+
     // Sets code. Gets or sets the API error code.
     public func setCode(code : String?) -> ApiError {
         self.code = code;

Sources/AsposeWordsCloud/Model/AvailableFontsResponse.swift

@@ -99,6 +99,9 @@ public class AvailableFontsResponse : WordsResponse {
         }
     }
 
+    public override func collectFilesContent(_ resultFilesContent : inout [FileReference]) {
+    }
+
     // Sets additionalFonts. Gets or sets the list of additional fonts, provided by Aspose team.
     public func setAdditionalFonts(additionalFonts : [FontInfo]?) -> AvailableFontsResponse {
         self.additionalFonts = additionalFonts;

Sources/AsposeWordsCloud/Model/BaseEntry.swift

@@ -27,49 +27,57 @@
 
 import Foundation
 
-// Represents a entry which will be appended to the original resource document.
+// Represents a base class for document which will be appended to the original resource document.
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public class BaseEntry : Codable, WordsApiModel {
-    // Field of href. Represents a entry which will be appended to the original resource document.
-    private var _href : String? = nil;
+    // Field of fileReference. Represents a base class for document which will be appended to the original resource document.
+    private var _fileReference : FileReference? = nil;
 
-    public var href : String? {
+    public var fileReference : FileReference? {
         get {
-            return self._href;
+            return self._fileReference;
         }
         set {
-            self._href = newValue;
+            self._fileReference = newValue;
         }
     }
 
     private enum CodingKeys: String, CodingKey {
-        case href = "Href";
+        case fileReference = "FileReference";
         case invalidCodingKey;
     }
 
-    public init() {
+    internal init() {
     }
 
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
-        self.href = try container.decodeIfPresent(String.self, forKey: .href);
+        self.fileReference = try container.decodeIfPresent(FileReference.self, forKey: .fileReference);
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self);
-        if (self.href != nil) {
-            try container.encode(self.href, forKey: .href);
+        if (self.fileReference != nil) {
+            try container.encode(self.fileReference, forKey: .fileReference);
         }
     }
 
-    // Sets href. Gets or sets the path to entry to append at the server.
-    public func setHref(href : String?) -> BaseEntry {
-        self.href = href;
+    public func collectFilesContent(_ resultFilesContent : inout [FileReference]) {
+        if (self.fileReference != nil)
+        {
+            self.fileReference!.collectFilesContent(&resultFilesContent);
+        }
+
+    }
+
+    // Sets fileReference. Gets or sets the file reference.
+    public func setFileReference(fileReference : FileReference?) -> BaseEntry {
+        self.fileReference = fileReference;
         return self;
     }
 
-    // Gets href. Gets or sets the path to entry to append at the server.
-    public func getHref() -> String? {
-        return self.href;
+    // Gets fileReference. Gets or sets the file reference.
+    public func getFileReference() -> FileReference? {
+        return self.fileReference;
     }
 }