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

Author: dynabic-billing-team

Jenkinsfile

@@ -26,9 +26,9 @@ def runtests(dockerImageVersion)
                 sh 'git clean -fdx'
 
                 if (needToBuild) {
-                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                         sh 'mkdir -p Settings'
-                        sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
+                        sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
                     }
                 }
             }

JenkinsfileRelease

@@ -38,10 +38,10 @@ def testGemLocally()
 	try {	
         stage('2:checkout again'){
 			checkout([$class: 'GitSCM', branches: [[name: '*/testPackage']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
-			withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-				sh 'mkdir -p Settings'
-				sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"${testServerUrl}\\"}" > Settings/servercreds.json'
-			}
+            withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+                sh 'mkdir -p Settings'
+                sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
+            }
         }
 
 	    stage('3:build gem and test'){

README.md

@@ -13,6 +13,17 @@ This repository contains Aspose.Words Cloud SDK for Ruby source code. This SDK a
 * 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 20.11
+
+- In configuration json file appSid / appKey has been replaced to clientId / clientSecret.
+- In Words API initialization methods clientId parameter precedes clientSecret parameter.
+
+
+## Enhancements in Version 20.10
+
+- Internal API changes.
+
+
 ## Enhancements in Version 20.9
 
 - Added Batch API feature
@@ -89,7 +100,7 @@ To use Aspose Words for Cloud Ruby SDK you need to register an account with [Asp
 To install this package do the following:
 update your Gemfile
 ```ruby
-gem 'aspose_words_cloud', '~> 20.10'
+gem 'aspose_words_cloud', '~> 20.11'
 ```
 or install directly
 ```bash
@@ -100,8 +111,8 @@ gem install aspose_words_cloud
 ```ruby
     # Start README example
     AsposeWordsCloud.configure do |config|
-            config.api_key['api_key'] = AppKey
-            config.api_key['app_sid'] = AppSid
+            config.client_data['ClientId'] = clientId
+            config.client_data['ClientSecret'] = clientSecret
             config.host = host
     request = DeleteWatermarkRequest.new remote_name, remote_test_folder + test_folder
     result = @words_api.delete_watermark request