Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,15 @@ 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 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.
@@ -230,7 +239,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', '~> 22.9'
+gem 'aspose_words_cloud', '~> 22.10'
 ```
 or install directly
 ```bash

lib/aspose_words_cloud.rb

@@ -30,9 +30,9 @@
 require_relative 'aspose_words_cloud/configuration'
 
 # Models
+require_relative 'aspose_words_cloud/models/file_reference'
 require_relative 'aspose_words_cloud/models/response_error'
 require_relative 'aspose_words_cloud/models/available_fonts_response'
-require_relative 'aspose_words_cloud/models/base_entry'
 require_relative 'aspose_words_cloud/models/bmp_save_options_data'
 require_relative 'aspose_words_cloud/models/bookmark'
 require_relative 'aspose_words_cloud/models/bookmark_data'

lib/aspose_words_cloud/api/words_api.rb

@@ -112,7 +112,6 @@ def call_api(http_method, path, opts = {})
     # @param [String] path URL path (e.g. /account/new)
     # @option opts [Hash] :header_params Header parameters
     # @option opts [Hash] :query_params Query parameters
-    # @option opts [Hash] :form_params Query parameters
     # @option opts [Object] :body HTTP body (JSON/XML)
     # @return [Faraday::Response] A Faraday Response
     def build_request(http_method, path, opts = {})
@@ -121,11 +120,9 @@ def build_request(http_method, path, opts = {})
 
       header_params = @default_headers.merge(opts[:header_params] || {})
       query_params = opts[:query_params] || {}
-      form_params = opts[:form_params] || {}
+      update_params_for_auth! header_params, query_params, ["JWT"]
       body = opts[:body] if opts[:body] || nil?
 
-      update_params_for_auth! header_params, query_params, opts[:auth_names]
-
       req_opts = {
         :method => http_method,
         :headers => header_params,
@@ -134,8 +131,6 @@ def build_request(http_method, path, opts = {})
       }
 
       if [:post, :patch, :put, :delete].include?(http_method)
-        req_body = build_request_body(header_params, form_params, opts[:body])
-        req_opts.update :body => req_body
         if @config.debugging
           @config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
         end
@@ -404,26 +399,43 @@ def build_request_url(path)
     # @param [Hash] form_params Query parameters
     # @param [Object] body HTTP body (JSON/XML)
     # @return [String] HTTP body data in the form of string
-    def build_request_body(header_params, form_params, body)
+    def build_request_body(header_params, form_params, files_references)
       # http form
-      if header_params['Content-Type']['application/x-www-form-urlencoded'] ||
-          header_params['Content-Type']['multipart/form-data']
+      files_references.each do |file_reference|
+        form_params.push({:'Name' => file_reference.reference, :'Data' => file_reference.content, :'MimeType' =>'application/octet-stream'})
+      end
+
+      if form_params.length() == 0
+        data = nil
+      elsif form_params.length() == 1
+        form_param = form_params[0]
+        value = form_param[:'Data']
+        case value
+        when ::File, ::Tempfile
+          data = File.open(value.path, 'rb') { |f| f.read }
+        when ::Array, nil, Faraday::ParamPart
+          data = value
+        else
+          data = value.to_s
+        end
+        header_params['Content-Type'] = form_param[:'MimeType']
+      else
         data = {}
-        form_params.each do |key, value|
+        form_params.each do |form_param|
+          key = form_param[:'Name']
+          value = form_param[:'Data']
+          mimeType = form_param[:'MimeType']
           case value
           when ::File, ::Tempfile
-            data[key] = Faraday::FilePart.new(value.path, Marcel::Magic.by_magic(value).to_s, key)
+            data[key] = Faraday::FilePart.new(value.path, mimeType)
           when ::Array, nil, Faraday::ParamPart
             data[key] = value
           else
-            data[key] = value.to_s
+            data[key] = Faraday::ParamPart.new(value.to_s, mimeType)
           end
         end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
       end
+
       data
     end
 
@@ -433,26 +445,50 @@ def build_request_body(header_params, form_params, body)
     # @param [Hash] form_params Query parameters
     # @param [Object] body HTTP body (JSON/XML)
     # @return [String] HTTP body data in the form of string
-    def build_request_body_batch(header_params, form_params, body)
-      # http form
-      if header_params['Content-Type']['application/x-www-form-urlencoded'] ||
-        header_params['Content-Type']['multipart/form-data']
-        data = {}
-        form_params.each do |key, value|
+    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'})
+      end
+
+      if form_params.length() == 0
+        data = ''
+      elsif form_params.length() == 1
+        form_param = form_params[0]
+        key = form_param[:'Name']
+        value = form_param[:'Data']
+        case value
+        when ::File, ::Tempfile
+          data = File.open(value.path, 'rb') { |f| f.read }
+        when ::Array, nil, Faraday::ParamPart
+          data = value
+        else
+          data = value.to_s
+        end
+        header_params['Content-Type'] = form_param[:'MimeType']
+      else
+        boundary = SecureRandom.uuid
+        data = ""
+        form_params.each do |form_param|
+          key = form_param[:'Name']
+          value = form_param[:'Data']
+          mimeType = form_param[:'MimeType']
+          data.concat(("--" + boundary + "\r\n").force_encoding('UTF-8'))
+          data.concat(("Content-Type: " + mimeType + "\r\n").force_encoding('UTF-8'))
+          data.concat(("Content-Disposition: form-data; name=\"" + key + "\"\r\n\r\n").force_encoding('UTF-8'))
           case value
           when ::File, ::Tempfile
-            data[key] = File.open(value.path, 'rb') { |f| f.read }
+            data.concat(File.open(value.path, 'rb') { |f| f.read })
           when ::Array, nil, Faraday::ParamPart
-            data[key] = value
+            data.concat(value)
           else
-            data[key] = value.to_s
+            data.concat(value.to_s)
           end
+          data.concat(("\r\n").force_encoding('UTF-8'))
         end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
+        data.concat(("--" + boundary + "--").force_encoding('UTF-8'))
+        header_params['Content-Type'] = 'multipart/form-data; boundary="' + boundary + '"';
       end
+
       data
     end
 

lib/aspose_words_cloud/api_client.rb

@@ -233,5 +233,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end

lib/aspose_words_cloud/models/available_fonts_response.rb

@@ -48,10 +48,6 @@ class BmpSaveOptionsData
     # Gets or sets the name of destination file.
     attr_accessor :file_name
 
-    # Gets or sets value determining which document formats are allowed to be mapped by Aspose.Words.Markup.StructuredDocumentTag.XmlMapping.
-    # By default only Aspose.Words.LoadFormat.FlatOpc document format is allowed to be mapped.
-    attr_accessor :flat_opc_xml_mapping_only
-
     # Gets or sets the value determining how ink (InkML) objects are rendered.
     attr_accessor :iml_rendering_mode
 
@@ -175,7 +171,6 @@ def self.attribute_map
         :'dml_effects_rendering_mode' => :'DmlEffectsRenderingMode',
         :'dml_rendering_mode' => :'DmlRenderingMode',
         :'file_name' => :'FileName',
-        :'flat_opc_xml_mapping_only' => :'FlatOpcXmlMappingOnly',
         :'iml_rendering_mode' => :'ImlRenderingMode',
         :'update_created_time_property' => :'UpdateCreatedTimeProperty',
         :'update_fields' => :'UpdateFields',
@@ -215,7 +210,6 @@ def self.swagger_types
         :'dml_effects_rendering_mode' => :'String',
         :'dml_rendering_mode' => :'String',
         :'file_name' => :'String',
-        :'flat_opc_xml_mapping_only' => :'BOOLEAN',
         :'iml_rendering_mode' => :'String',
         :'update_created_time_property' => :'BOOLEAN',
         :'update_fields' => :'BOOLEAN',
@@ -280,10 +274,6 @@ def initialize(attributes = {})
         self.file_name = attributes[:'FileName']
       end
 
-      if attributes.key?(:'FlatOpcXmlMappingOnly')
-        self.flat_opc_xml_mapping_only = attributes[:'FlatOpcXmlMappingOnly']
-      end
-
       if attributes.key?(:'ImlRenderingMode')
         self.iml_rendering_mode = attributes[:'ImlRenderingMode']
       end
@@ -543,7 +533,6 @@ def ==(other)
           dml_effects_rendering_mode == other.dml_effects_rendering_mode &&
           dml_rendering_mode == other.dml_rendering_mode &&
           file_name == other.file_name &&
-          flat_opc_xml_mapping_only == other.flat_opc_xml_mapping_only &&
           iml_rendering_mode == other.iml_rendering_mode &&
           update_created_time_property == other.update_created_time_property &&
           update_fields == other.update_fields &&
@@ -582,7 +571,7 @@ def eql?(other)
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [allow_embedding_post_script_fonts, custom_time_zone_info_data, dml3_d_effects_rendering_mode, dml_effects_rendering_mode, dml_rendering_mode, file_name, flat_opc_xml_mapping_only, iml_rendering_mode, update_created_time_property, update_fields, update_last_printed_property, update_last_saved_time_property, update_sdt_content, zip_output, color_mode, jpeg_quality, metafile_rendering_options, numeral_format, optimize_output, page_count, page_index, horizontal_resolution, image_brightness, image_color_mode, image_contrast, paper_color, pixel_format, resolution, scale, use_anti_aliasing, use_gdi_emf_renderer, use_high_quality_rendering, vertical_resolution, save_format].hash
+      [allow_embedding_post_script_fonts, custom_time_zone_info_data, dml3_d_effects_rendering_mode, dml_effects_rendering_mode, dml_rendering_mode, file_name, iml_rendering_mode, update_created_time_property, update_fields, update_last_printed_property, update_last_saved_time_property, update_sdt_content, zip_output, color_mode, jpeg_quality, metafile_rendering_options, numeral_format, optimize_output, page_count, page_index, horizontal_resolution, image_brightness, image_color_mode, image_contrast, paper_color, pixel_format, resolution, scale, use_anti_aliasing, use_gdi_emf_renderer, use_high_quality_rendering, vertical_resolution, save_format].hash
     end
 
     # Builds the object from hash
@@ -691,5 +680,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end

lib/aspose_words_cloud/models/bmp_save_options_data.rb

@@ -217,5 +217,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end

lib/aspose_words_cloud/models/bookmark.rb

@@ -207,5 +207,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end

lib/aspose_words_cloud/models/bookmark_data.rb

@@ -227,5 +227,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end

lib/aspose_words_cloud/models/bookmark_insert.rb

@@ -207,5 +207,8 @@ def _to_hash(value)
       end
     end
 
+    def collectFilesContent(resultFilesContent)
+    end
+
   end
 end