Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,6 +16,13 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
 - [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
 - Convert an encrypted PDF document into Word document format.
 
+## 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

asposewordscloud/api_client.py

@@ -81,12 +81,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.5.1'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.6'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 21.5.1'
+        self.user_agent = 'python sdk 21.6'
 
     def __del__(self):
         if not self.pool is None:

asposewordscloud/apis/words_api.py

@@ -985,6 +985,7 @@ def compare_document_online(self, request, **kwargs):  # noqa: E501
         :param is_async bool
         :param document file : The document. (required)
         :param compare_data CompareData : Compare data. (required)
+        :param comparing_document file : The comparing document.
         :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
         :param password str : Password for opening an encrypted document.
         :param dest_file_name str : 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.

asposewordscloud/configuration.py

@@ -258,6 +258,6 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 21.5.1\n"\
-               "SDK Package Version: 21.5.1".\
+               "Version of the API: 21.6\n"\
+               "SDK Package Version: 21.6".\
                format(env=sys.platform, pyversion=sys.version)

asposewordscloud/models/compare_options.py

@@ -43,6 +43,7 @@ class CompareOptions(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'accept_all_revisions_before_comparison': 'bool',
         'ignore_case_changes': 'bool',
         'ignore_comments': 'bool',
         'ignore_fields': 'bool',
@@ -55,6 +56,7 @@ class CompareOptions(object):
     }
 
     attribute_map = {
+        'accept_all_revisions_before_comparison': 'AcceptAllRevisionsBeforeComparison',
         'ignore_case_changes': 'IgnoreCaseChanges',
         'ignore_comments': 'IgnoreComments',
         'ignore_fields': 'IgnoreFields',
@@ -66,9 +68,10 @@ class CompareOptions(object):
         'target': 'Target'
     }
 
-    def __init__(self, ignore_case_changes=None, ignore_comments=None, ignore_fields=None, ignore_footnotes=None, ignore_formatting=None, ignore_headers_and_footers=None, ignore_tables=None, ignore_textboxes=None, target=None):  # noqa: E501
+    def __init__(self, accept_all_revisions_before_comparison=None, ignore_case_changes=None, ignore_comments=None, ignore_fields=None, ignore_footnotes=None, ignore_formatting=None, ignore_headers_and_footers=None, ignore_tables=None, ignore_textboxes=None, target=None):  # noqa: E501
         """CompareOptions - a model defined in Swagger"""  # noqa: E501
 
+        self._accept_all_revisions_before_comparison = None
         self._ignore_case_changes = None
         self._ignore_comments = None
         self._ignore_fields = None
@@ -80,6 +83,8 @@ def __init__(self, ignore_case_changes=None, ignore_comments=None, ignore_fields
         self._target = None
         self.discriminator = None
 
+        if accept_all_revisions_before_comparison is not None:
+            self.accept_all_revisions_before_comparison = accept_all_revisions_before_comparison
         if ignore_case_changes is not None:
             self.ignore_case_changes = ignore_case_changes
         if ignore_comments is not None:
@@ -99,6 +104,28 @@ def __init__(self, ignore_case_changes=None, ignore_comments=None, ignore_fields
         if target is not None:
             self.target = target
 
+    @property
+    def accept_all_revisions_before_comparison(self):
+        """Gets the accept_all_revisions_before_comparison of this CompareOptions.  # noqa: E501
+
+        Gets or sets whether accept revisions before comparison or not.  # noqa: E501
+
+        :return: The accept_all_revisions_before_comparison of this CompareOptions.  # noqa: E501
+        :rtype: bool
+        """
+        return self._accept_all_revisions_before_comparison
+
+    @accept_all_revisions_before_comparison.setter
+    def accept_all_revisions_before_comparison(self, accept_all_revisions_before_comparison):
+        """Sets the accept_all_revisions_before_comparison of this CompareOptions.
+
+        Gets or sets whether accept revisions before comparison or not.  # noqa: E501
+
+        :param accept_all_revisions_before_comparison: The accept_all_revisions_before_comparison of this CompareOptions.  # noqa: E501
+        :type: bool
+        """
+        self._accept_all_revisions_before_comparison = accept_all_revisions_before_comparison
+
     @property
     def ignore_case_changes(self):
         """Gets the ignore_case_changes of this CompareOptions.  # noqa: E501

asposewordscloud/models/requests/compare_document_online_request.py

@@ -36,14 +36,16 @@ class CompareDocumentOnlineRequest(BaseRequestObject):
     Initializes a new instance.
     :param document The document.
     :param compare_data Compare data.
+    :param comparing_document The comparing document.
     :param load_encoding Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
     :param password Password for opening an encrypted document.
     :param dest_file_name 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.
     """
 
-    def __init__(self, document, compare_data, load_encoding=None, password=None, dest_file_name=None):
+    def __init__(self, document, compare_data, comparing_document=None, load_encoding=None, password=None, dest_file_name=None):
         self.document = document
         self.compare_data = compare_data
+        self.comparing_document = comparing_document
         self.load_encoding = load_encoding
         self.password = password
         self.dest_file_name = dest_file_name
@@ -92,6 +94,8 @@ def create_http_request(self, api_client):
             form_params.append(['document', self.document, 'file'])  # noqa: E501
         if self.compare_data is not None:
             form_params.append(['compareData', self.compare_data.to_json(), 'string'])  # noqa: E501
+        if self.comparing_document is not None:
+            form_params.append(['comparingDocument', self.comparing_document, 'file'])  # noqa: E501
 
         body_params = None
         return {

setup.py

@@ -5,7 +5,7 @@
 
     No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
 
-    OpenAPI spec version: 21.5.1
+    OpenAPI spec version: 21.6
 
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "aspose-words-cloud"
-VERSION = "21.5.1.0"
+VERSION = "21.6.0"
 # To install the library, run the following
 #
 # python setup.py install

test/api/document/test_compare_document.py

@@ -72,3 +72,22 @@ def test_compare_document_online(self):
         result = self.words_api.compare_document_online(request)
         self.assertIsNotNone(result, 'Error has occurred.')
 
+
+    #
+    # Test for document comparison online.
+    #
+    def test_compare_two_document_online(self):
+        remote_folder = self.remote_test_folder + '/DocumentActions/CompareDocument'
+        local_folder = 'DocumentActions/CompareDocument'
+        local_name1 = 'compareTestDoc1.doc'
+        local_name2 = 'compareTestDoc2.doc'
+        remote_name2 = 'TestCompareDocument2.doc'
+
+        self.upload_file(remote_folder + '/' + remote_name2, open(os.path.join(self.local_test_folder, local_folder + '/' + local_name2), 'rb'))
+
+        request_compare_data = asposewordscloud.CompareData(author = 'author', comparing_with_document = remote_folder + '/' + remote_name2, date_time = dateutil.parser.isoparse('2015-10-26T00:00:00.0000000Z'))
+        request = asposewordscloud.models.requests.CompareDocumentOnlineRequest(document = open(os.path.join(self.local_test_folder, local_folder + '/' + local_name1), 'rb'), compare_data = request_compare_data, comparing_document = open(os.path.join(self.local_test_folder, local_folder + '/' + local_name2), 'rb'), dest_file_name = self.remote_test_out + '/TestCompareDocumentOut.doc')
+
+        result = self.words_api.compare_document_online(request)
+        self.assertIsNotNone(result, 'Error has occurred.')
+