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

Author: dynabic-billing-team

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [21.6.0] - Aspose Words Cloud for Dart 21.6 Release Notes
+
+- 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
+
+
 ## [21.5.0] - Aspose Words Cloud for Dart 21.5 Release Notes
 
 - Update dependencies in sdk

Jenkinsfile

@@ -35,7 +35,7 @@ node('words-linux') {
                 }
 
                 if (needToBuild) {
-                    docker.image('google/dart:latest').inside {
+                    docker.image('google/dart:2.12.2').inside {
                         stage('prepare'){
                             sh "pub get"
                             sh "pub global activate junitreport"

JenkinsfileRelease

@@ -15,7 +15,7 @@ def runtests()
                         }
             }
 
-            docker.image('google/dart:latest').inside {
+            docker.image('google/dart:2.12.2').inside {
                 stage('prepare'){
                     sh "pub get"
                     sh "pub global activate junitreport"

README.md

@@ -27,7 +27,7 @@ Add this dependency to your *pubspec.yaml*:
 
 ```yaml
 dependencies:
-  aspose_words_cloud: 21.5.0
+  aspose_words_cloud: 21.6.0
 ```
 
 ## Getting Started

lib/src/api_client.dart

@@ -75,7 +75,7 @@ class ApiClient {
     final url = configuration.baseUrl + '/connect/token';
     final data = 'grant_type=client_credentials&client_id=${configuration.clientId}&client_secret=${configuration.clientSecret}';
     final headers = {'Content-Type' : 'application/x-www-form-urlencoded'};
-    final response = await http.post(url, headers: headers, body: data);
+    final response = await http.post(Uri.parse(url), headers: headers, body: data);
     if (response.statusCode == 400) {
       throw ApiException(response.statusCode, 'Invalid server credentials. Please check your ClientSecret and ClientId.');
     }
@@ -433,7 +433,7 @@ class ApiClient {
 
     var httpRequest = http.Request(requestData.method, Uri.parse(requestData.url));
     httpRequest.headers['x-aspose-client'] = 'dart sdk';
-    httpRequest.headers['x-aspose-client-version'] = '21.5';
+    httpRequest.headers['x-aspose-client-version'] = '21.6';
     httpRequest.headers['Authorization'] = await _getAuthToken();
     if (requestData.headers != null) {
       httpRequest.headers.addAll(requestData.headers);

lib/src/models/compare_options.dart

@@ -31,6 +31,9 @@ import '../../aspose_words_cloud.dart';
 
 /// DTO container with compare documents options.
 class CompareOptions implements ModelBase {
+  /// Gets or sets whether accept revisions before comparison or not.
+  bool acceptAllRevisionsBeforeComparison;
+
   /// Gets or sets a value indicating whether documents comparison is case insensitive. By default comparison is case sensitive.
   bool ignoreCaseChanges;
 
@@ -64,6 +67,12 @@ class CompareOptions implements ModelBase {
       throw ApiException(400, 'Failed to deserialize CompareOptions data model.');
     }
 
+    if (json.containsKey('AcceptAllRevisionsBeforeComparison')) {
+      acceptAllRevisionsBeforeComparison = json['AcceptAllRevisionsBeforeComparison'] as bool;
+    } else {
+      acceptAllRevisionsBeforeComparison = null;
+    }
+
     if (json.containsKey('IgnoreCaseChanges')) {
       ignoreCaseChanges = json['IgnoreCaseChanges'] as bool;
     } else {
@@ -126,6 +135,10 @@ class CompareOptions implements ModelBase {
   @override
   Map<String, dynamic> serialize() {
     var _result = <String, dynamic>{};
+    if (acceptAllRevisionsBeforeComparison != null) {
+      _result['AcceptAllRevisionsBeforeComparison'] = acceptAllRevisionsBeforeComparison;
+    }
+
     if (ignoreCaseChanges != null) {
       _result['IgnoreCaseChanges'] = ignoreCaseChanges;
     }

lib/src/requests/compare_document_online_request.dart

@@ -41,6 +41,9 @@ class CompareDocumentOnlineRequest implements RequestBase {
   /// Compare data.
   final CompareData compareData;
 
+  /// The comparing document.
+  final ByteData comparingDocument;
+
   /// Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
   final String loadEncoding;
 
@@ -50,7 +53,7 @@ class CompareDocumentOnlineRequest implements RequestBase {
   /// Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
   final String destFileName;
 
-  CompareDocumentOnlineRequest(final this.document, final this.compareData, {final this.loadEncoding, final this.password, final this.destFileName});
+  CompareDocumentOnlineRequest(final this.document, final this.compareData, {final this.comparingDocument, final this.loadEncoding, final this.password, final this.destFileName});
 
   @override
   ApiRequestData createRequestData(final ApiClient _apiClient) {
@@ -84,6 +87,10 @@ class CompareDocumentOnlineRequest implements RequestBase {
       throw ApiException(400, 'Parameter compareData is required.');
     }
 
+    if (comparingDocument != null) {
+      _bodyParts.add(ApiRequestPart(_apiClient.serializeBody(comparingDocument), 'application/octet-stream', name: 'ComparingDocument'));
+    }
+
     var _url = _apiClient.configuration.getApiRootUrl() + _apiClient.applyQueryParams(_path, _queryParams).replaceAll('//', '/');
     var _body = _apiClient.serializeBodyParts(_bodyParts, _headers);
     return ApiRequestData('PUT', _url, _headers, _body);