Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,12 +13,23 @@ 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 24.1
+
+- Added support for InsertAfterNode in the insert API without NodePath.
+- Added support for inserting nodes (runs/rows/cells/bookmarks) without NodePath.
+- Added support for transparency in the Watermark API.
+- Added support for password and encryptedPassword fields in FileReference.
+- Fixed missing href value in document responses.
+
+
 ## Enhancements in Version 23.12
 
 - Properties Name, Text, StartRange, EndRange marked as required for InsertBookmark operation.
 - Implemented DeleteOfficeMathObjects operation to delete all office math objects from document.
 - Parameter ProtectionRequest was removed from the UnprotectDocument operation. Now removing protection from a document does not require a password.
 - Model ProtectionRequest marked as deprecated, please use ProtectionRequestV2 instead for perform ProtectDocument operation. To change the password or protection type of protected document, the old password is no required.
+- Added fields Password and EncryptedPassword to FileReference for documents encrypted by password.
+- Removed parameter encryptedPassword2 from CompareDocument method. Please use FileReference password instead.
 - Rename aspose-client header.
 
 ## Enhancements in Version 23.11
@@ -305,7 +316,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', '~> 23.12'
+gem 'aspose_words_cloud', '~> 24.1'
 ```
 or install directly
 ```bash

lib/aspose_words_cloud.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="aspose_words_cloud.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -166,7 +166,6 @@
 require_relative 'aspose_words_cloud/models/metafile_rendering_options_data'
 require_relative 'aspose_words_cloud/models/mhtml_save_options_data'
 require_relative 'aspose_words_cloud/models/modification_operation_result'
-require_relative 'aspose_words_cloud/models/new_document_position'
 require_relative 'aspose_words_cloud/models/node_link'
 require_relative 'aspose_words_cloud/models/odt_save_options_data'
 require_relative 'aspose_words_cloud/models/office_math_link'
@@ -197,6 +196,9 @@
 require_relative 'aspose_words_cloud/models/pdf_permissions'
 require_relative 'aspose_words_cloud/models/pdf_save_options_data'
 require_relative 'aspose_words_cloud/models/png_save_options_data'
+require_relative 'aspose_words_cloud/models/position_after_node'
+require_relative 'aspose_words_cloud/models/position_before_node'
+require_relative 'aspose_words_cloud/models/position_inside_node'
 require_relative 'aspose_words_cloud/models/preferred_width'
 require_relative 'aspose_words_cloud/models/protection_data'
 require_relative 'aspose_words_cloud/models/protection_data_response'

lib/aspose_words_cloud/api/words_api.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="words_api.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,6 +36,7 @@ class WordsApi
 
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
+      @api_client.config.encryptor = self
       @rsa_key = nil
       require_all '../models/requests'
       require_all '../models/responses'
@@ -14383,14 +14384,13 @@ def encrypt(data)
             modulus = @api_client.config.modulus
             exponent = @api_client.config.exponent
 
-            if modulus.to_s.empty || exponent.to_s.empty
-                data = self.get_public_key GetPublicKeyRequest.new
-                modulus = data.modulus
-                exponent = data.exponent
+            if (modulus == nil || modulus.to_s.empty?) || (exponent == nil || exponent.to_s.empty?)
+                response = self.get_public_key GetPublicKeyRequest.new
+                modulus = response.modulus
+                exponent = response.exponent
             end
 
-            @rsa_key = OpenSSL::PKey::RSA.new
-            @rsa_key.set_key(base64_to_long(modulus), base64_to_long(exponent), nil)            
+            @rsa_key = rsa = create_rsa_key(modulus, exponent)
         end
 
         Base64.encode64(@rsa_key.public_encrypt(data.to_s.force_encoding("utf-8")))
@@ -14423,15 +14423,24 @@ def encrypt(data)
       end
     end
 
+    private def create_rsa_key(n, e)
+      data_sequence = OpenSSL::ASN1::Sequence([
+                                                OpenSSL::ASN1::Integer(base64_to_long(n)),
+                                                OpenSSL::ASN1::Integer(base64_to_long(e))
+                                              ])
+      asn1 = OpenSSL::ASN1::Sequence(data_sequence)
+      OpenSSL::PKey::RSA.new(asn1.to_der)
+    end
+
     private def base64_to_long(data)
-      decoded_with_padding = Base64.urlsafe_decode64(data) + Base64.decode64('==')
-      decoded_with_padding.to_s.unpack('C*').map do |byte|
-        to_hex(byte)
+      decoded_with_padding = Base64.urlsafe_decode64(data) + Base64.decode64("==")
+      decoded_with_padding.to_s.unpack("C*").map do |byte|
+        byte_to_hex(byte)
       end.join.to_i(16)
     end
 
-    private def to_hex(int)
-      int < 16 ? '0' + int.to_s(16) : int.to_s(16)
+    private def byte_to_hex(int)
+      int < 16 ? "0" + int.to_s(16) : int.to_s(16)
     end
   end
 end

lib/aspose_words_cloud/api_client.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="api_client.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -406,7 +406,13 @@ def build_request_url(path)
     def build_request_body(header_params, form_params, files_references)
       # http form
       files_references.each do |file_reference|
-        form_params.push({:'Name' => file_reference.reference, :'Data' => file_reference.content, :'MimeType' =>'application/octet-stream'})
+        if !file_reference.password.nil?
+            file_reference.encryptedPassword = self.config.encryptor.encrypt(file_reference.password)
+            file_reference.password = nil
+        end
+        if file_reference.source == 'Request'
+            form_params.push({:'Name' => file_reference.reference, :'Data' => file_reference.content, :'MimeType' =>'application/octet-stream'})
+        end
       end
 
       if form_params.length() == 0
@@ -451,7 +457,13 @@ def build_request_body(header_params, form_params, files_references)
     # @return [String] HTTP body data in the form of string
     def build_request_body_batch(header_params, form_params, files_references)
       files_references.each do |file_reference|
-        form_params.push({:'Name' => file_reference.reference, :'Data' => file_reference.content, :'MimeType' =>'application/octet-stream'})
+        if !file_reference.password.nil?
+            file_reference.encryptedPassword = self.config.encryptor.encrypt(file_reference.password)
+            file_reference.password = nil
+        end
+        if file_reference.source == 'Request'
+            form_params.push({:'Name' => file_reference.reference, :'Data' => file_reference.content, :'MimeType' =>'application/octet-stream'})
+        end
       end
 
       if form_params.length() == 0

lib/aspose_words_cloud/api_error.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="api_error.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy

lib/aspose_words_cloud/configuration.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="configuration.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy

lib/aspose_words_cloud/models/available_fonts_response.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="available_fonts_response.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy

lib/aspose_words_cloud/models/bmp_save_options_data.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="bmp_save_options_data.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy

lib/aspose_words_cloud/models/bookmark.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="bookmark.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy

lib/aspose_words_cloud/models/bookmark_data.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="bookmark_data.rb">
-#   Copyright (c) 2023 Aspose.Words for Cloud
+#   Copyright (c) 2024 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy