aspose_words_cloud 22.2.0 → 22.3.0

data/lib/aspose_words_cloud/api_client.rb

@@ -78,7 +78,6 @@ module AsposeWordsCloud
       end
 
       response = build_request(http_method, path, opts)
-      download_file response if opts[:return_type] == 'File'
       if @config.debugging
         @config.logger.debug "'HTTP' response body '~BEGIN~'\n #{response.body}\n'~END~'\n"
       end
@@ -97,11 +96,11 @@ module AsposeWordsCloud
       end
 
       if opts[:multipart_response] == true
-        data = deserialize_multipart(response)
+        data = deserialize_multipart(response.body, response.headers)
       elsif opts[:batch] == true
         data = deserialize_batch(response, opts[:request_map])
       else
-        data = deserialize(response.body, opts[:return_type]) if opts[:return_type]
+        data = deserialize(response.body, response.headers, opts[:return_type]) if opts[:return_type]
       end
 
       [data, response.status, response.headers]
@@ -176,14 +175,82 @@ module AsposeWordsCloud
        (mime == "*/*") || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
     end
 
+    def custom_strip(string, chars)
+      chars = Regexp.escape(chars)
+      string.gsub(/\A[#{chars}]+|[#{chars}]+\z/, "")
+    end
+
+    def extract_filename_from_headers(headers)
+      filename = 'default'
+      if headers.key?('content-disposition')
+        disposition = headers['content-disposition']
+        parts = disposition.split(';')
+        for part in parts
+          part2 = custom_strip(part, ' ')
+          subparts = part2.split('=')
+          if subparts.length() == 2 && subparts[0] == 'filename'
+            filename = custom_strip(subparts[1], ' \"')
+          end
+        end
+      end
+
+      filename
+    end
+
+    def extract_partname_from_headers(headers)
+      filename = 'default'
+      if headers.key?('content-disposition')
+        disposition = headers['content-disposition']
+        parts = disposition.split(';')
+        for part in parts
+          part2 = custom_strip(part, ' ')
+          subparts = part2.split('=')
+          if subparts.length() == 2 && subparts[0] == 'name'
+            filename = custom_strip(subparts[1], ' \"')
+          end
+        end
+      end
+
+      filename
+    end
+
+    # Deserialize files collection.
+    def parse_files_collection(data, headers)
+      result = {}
+      if headers.key?("content-type") && headers['content-type'].start_with?('multipart/mixed')
+        content_type = headers['content-type']
+        reader = MultipartParser::Reader.new(MultipartParser::Reader::extract_boundary_value(content_type))
+        reader.on_part do |part|
+          pn = extract_filename_from_headers(part.headers)
+          part.on_data do |partial_data|
+            if result[pn].nil?
+              result[pn] = partial_data
+            else
+              result[pn] = [result[pn]] if result[pn].kind_of?(Array)
+              result[pn] << partial_data
+            end
+          end
+        end
+
+        reader.write data
+        reader.ended? or raise Exception, 'Truncated multipart message'
+      else
+        result[extract_filename_from_headers(headers)] = data
+      end
+
+      result
+    end
+
     # Deserialize the response to the given return type.
     #
     # @param [String] response HTTP response
     # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
-    def deserialize(body, return_type)
+    def deserialize(body, headers, return_type)
       # handle file downloading - return the File instance processed in request callbacks
       # note that response body is empty when the file is written in chunks in request on_body callback
-      return @tempfile if return_type == 'File'
+      return body if return_type == 'File'
+
+      return parse_files_collection(body, headers) if return_type == 'FILES_COLLECTION'
 
       return nil if body.nil? || body.empty?
 
@@ -206,24 +273,24 @@ module AsposeWordsCloud
     # Deserialize multipart the response to the given return type.
     #
     # @param [Response] response HTTP response
-    def deserialize_multipart(response)
+    def deserialize_multipart(body, headers)
       parts={}
-      content_type = response.headers['content-type']
+      content_type = headers['content-type']
       reader = MultipartParser::Reader.new(MultipartParser::Reader::extract_boundary_value(content_type))
 
       reader.on_part do |part|
-        pn = part.headers['content-type'] == 'application/json' ? 'model' : 'document'
+        pn = extract_partname_from_headers(part.headers)
         part.on_data do |partial_data|
           if parts[pn].nil?
-            parts[pn] = partial_data
+            parts[pn] = { data: partial_data, headers: part.headers }
           else
-            parts[pn] = [parts[pn]] if parts[pn].kind_of?(Array)
-            parts[pn] << partial_data
+            parts[pn][:data] = [parts[pn][:data]] if parts[pn][:data].kind_of?(Array)
+            parts[pn][:data] << partial_data
           end
         end
       end
 
-      reader.write response.body
+      reader.write body
       reader.ended? or raise Exception, 'Truncated multipart message'
 
       parts
@@ -262,6 +329,7 @@ module AsposeWordsCloud
         if data_index != nil
           header_data = part_body[0..data_index]
           body_data = part_body[data_index+separator.length, part_body.length]
+          part[:headers] = header_data
           part[:body] = body_data
         end
       end
@@ -270,7 +338,7 @@ module AsposeWordsCloud
         req_id = response_data[:part].headers['requestid']
         batch_request = request_map[req_id]
         return_type = batch_request.request.get_response_type
-        responses_data.push(deserialize(response_data[:body], return_type))
+        responses_data.push(deserialize(response_data[:body], response_data[:part].headers, return_type))
       end
       responses_data
     end
@@ -317,59 +385,6 @@ module AsposeWordsCloud
       end
     end
 
-    # Save response body into a file in (the defined) temporary folder, using the filename
-    # from the "Content-Disposition" header if provided, otherwise a random filename.
-    # The response body is written to the file in chunks in order to handle files which
-    # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
-    # process can use.
-    #
-    # @see Configuration#temp_folder_path
-    def download_file(response)
-      tempfile = nil
-      encoding = nil
-      content_disposition = response.headers['Content-Disposition']
-      if content_disposition and content_disposition =~ /filename=/i
-        filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-        prefix = sanitize_filename(filename)
-      else
-        prefix = 'download-'
-      end
-      prefix += '-' unless prefix.end_with?('-')
-      encoding = response.body.encoding
-      tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-      @tempfile = tempfile
-      tempfile.write(response.body)
-      response.on_complete do |resp|
-        tempfile.rewind
-        tempfile.close
-        @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                            "explicitly with `tempfile.delete`"
-      end
-    end
-
-  # Save response body into a file in (the defined) temporary folder, using the filename
-  # from the "Content-Disposition" header if provided, otherwise a random filename.
-  # The response body is written to the file in chunks in order to handle files which
-  # size is larger than maximum Ruby String or even larger than the maximum memory a Ruby
-  # process can use.
-  #
-  # @see Configuration#temp_folder_path
-  def download_file_from_multipart(body)
-    prefix = 'download-'
-    prefix += '-' unless prefix.end_with?('-')
-    tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding:body.encoding, binmode: true)
-    @tempfile = tempfile
-    tempfile.write(body)
-    tempfile.size
-    @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                            "explicitly with `tempfile.delete`"
-    @tempfile
-  end
-
     # Sanitize filename by removing path.
     # e.g. ../../sun.gif becomes sun.gif
     #
@@ -451,7 +466,7 @@ module AsposeWordsCloud
     def add_param_to_query(url, param_name, param_value)
       uri = URI(url)
       if param_name == 'password' && !param_value.empty?
-        params = URI.decode_www_form(uri.query || "") << ['encryptedPassword', Base64.encode64(self.config.rsa_key.public_encrypt(param_value.to_s.force_encoding("utf-8")))]
+        params = URI.decode_www_form(uri.query || "") << ['encryptedPassword', self.config.encryptor.encrypt(param_value)]
       else
         params = URI.decode_www_form(uri.query || "") << [param_name, param_value]
       end

data/lib/aspose_words_cloud/configuration.rb

@@ -90,14 +90,16 @@ module AsposeWordsCloud
     # @return [true, false]
     attr_accessor :client_side_validation
 
-    # Defines RSA key
-    attr_accessor :rsa_key
+    # Defines RSA key data
+    attr_accessor :exponent
+    attr_accessor :modulus
+
+    # Defines encryptor
+    attr_accessor :encryptor
 
     # Defines request timeout
     attr_accessor :timeout
 
-
-
     def initialize
       @baseUrl = "https://api.aspose.cloud"
       @api_version = "/v4.0/"

data/lib/aspose_words_cloud/models/bmp_save_options_data.rb

@@ -401,6 +401,20 @@ module AsposeWordsCloud
     def valid?
       dml3_d_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Basic", "Advanced"])
       return false unless dml3_d_effects_rendering_mode_validator.valid?(@dml3_d_effects_rendering_mode)
+      dml_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      return false unless dml_effects_rendering_mode_validator.valid?(@dml_effects_rendering_mode)
+      dml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      return false unless dml_rendering_mode_validator.valid?(@dml_rendering_mode)
+      iml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      return false unless iml_rendering_mode_validator.valid?(@iml_rendering_mode)
+      color_mode_validator = EnumAttributeValidator.new('String', ["Normal", "Grayscale"])
+      return false unless color_mode_validator.valid?(@color_mode)
+      numeral_format_validator = EnumAttributeValidator.new('String', ["European", "ArabicIndic", "EasternArabicIndic", "Context", "System"])
+      return false unless numeral_format_validator.valid?(@numeral_format)
+      image_color_mode_validator = EnumAttributeValidator.new('String', ["None", "Grayscale", "BlackAndWhite"])
+      return false unless image_color_mode_validator.valid?(@image_color_mode)
+      pixel_format_validator = EnumAttributeValidator.new('String', ["Format16BppRgb555", "Format16BppRgb565", "Format16BppArgb1555", "Format24BppRgb", "Format32BppRgb", "Format32BppArgb", "Format32BppPArgb", "Format48BppRgb", "Format64BppArgb", "Format64BppPArgb", "Format1bppIndexed"])
+      return false unless pixel_format_validator.valid?(@pixel_format)
 
       return true
     end
@@ -419,6 +433,104 @@ module AsposeWordsCloud
       end
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_effects_rendering_mode Object to be assigned
+    def dml_effects_rendering_mode=(dml_effects_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      if dml_effects_rendering_mode.to_i == 0
+        unless validator.valid?(dml_effects_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_effects_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_effects_rendering_mode = dml_effects_rendering_mode
+      else
+        @dml_effects_rendering_mode = validator.allowable_values[dml_effects_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_rendering_mode Object to be assigned
+    def dml_rendering_mode=(dml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      if dml_rendering_mode.to_i == 0
+        unless validator.valid?(dml_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_rendering_mode = dml_rendering_mode
+      else
+        @dml_rendering_mode = validator.allowable_values[dml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] iml_rendering_mode Object to be assigned
+    def iml_rendering_mode=(iml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      if iml_rendering_mode.to_i == 0
+        unless validator.valid?(iml_rendering_mode)
+          raise ArgumentError, "invalid value for 'iml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @iml_rendering_mode = iml_rendering_mode
+      else
+        @iml_rendering_mode = validator.allowable_values[iml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] color_mode Object to be assigned
+    def color_mode=(color_mode)
+      validator = EnumAttributeValidator.new('String', ["Normal", "Grayscale"])
+      if color_mode.to_i == 0
+        unless validator.valid?(color_mode)
+          raise ArgumentError, "invalid value for 'color_mode', must be one of #{validator.allowable_values}."
+        end
+        @color_mode = color_mode
+      else
+        @color_mode = validator.allowable_values[color_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] numeral_format Object to be assigned
+    def numeral_format=(numeral_format)
+      validator = EnumAttributeValidator.new('String', ["European", "ArabicIndic", "EasternArabicIndic", "Context", "System"])
+      if numeral_format.to_i == 0
+        unless validator.valid?(numeral_format)
+          raise ArgumentError, "invalid value for 'numeral_format', must be one of #{validator.allowable_values}."
+        end
+        @numeral_format = numeral_format
+      else
+        @numeral_format = validator.allowable_values[numeral_format.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] image_color_mode Object to be assigned
+    def image_color_mode=(image_color_mode)
+      validator = EnumAttributeValidator.new('String', ["None", "Grayscale", "BlackAndWhite"])
+      if image_color_mode.to_i == 0
+        unless validator.valid?(image_color_mode)
+          raise ArgumentError, "invalid value for 'image_color_mode', must be one of #{validator.allowable_values}."
+        end
+        @image_color_mode = image_color_mode
+      else
+        @image_color_mode = validator.allowable_values[image_color_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] pixel_format Object to be assigned
+    def pixel_format=(pixel_format)
+      validator = EnumAttributeValidator.new('String', ["Format16BppRgb555", "Format16BppRgb565", "Format16BppArgb1555", "Format24BppRgb", "Format32BppRgb", "Format32BppArgb", "Format32BppPArgb", "Format48BppRgb", "Format64BppArgb", "Format64BppPArgb", "Format1bppIndexed"])
+      if pixel_format.to_i == 0
+        unless validator.valid?(pixel_format)
+          raise ArgumentError, "invalid value for 'pixel_format', must be one of #{validator.allowable_values}."
+        end
+        @pixel_format = pixel_format
+      else
+        @pixel_format = validator.allowable_values[pixel_format.to_i]
+      end
+    end
+
 
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared

data/lib/aspose_words_cloud/models/doc_save_options_data.rb

@@ -259,6 +259,12 @@ module AsposeWordsCloud
     def valid?
       dml3_d_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Basic", "Advanced"])
       return false unless dml3_d_effects_rendering_mode_validator.valid?(@dml3_d_effects_rendering_mode)
+      dml_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      return false unless dml_effects_rendering_mode_validator.valid?(@dml_effects_rendering_mode)
+      dml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      return false unless dml_rendering_mode_validator.valid?(@dml_rendering_mode)
+      iml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      return false unless iml_rendering_mode_validator.valid?(@iml_rendering_mode)
 
       return true
     end
@@ -277,6 +283,48 @@ module AsposeWordsCloud
       end
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_effects_rendering_mode Object to be assigned
+    def dml_effects_rendering_mode=(dml_effects_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      if dml_effects_rendering_mode.to_i == 0
+        unless validator.valid?(dml_effects_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_effects_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_effects_rendering_mode = dml_effects_rendering_mode
+      else
+        @dml_effects_rendering_mode = validator.allowable_values[dml_effects_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_rendering_mode Object to be assigned
+    def dml_rendering_mode=(dml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      if dml_rendering_mode.to_i == 0
+        unless validator.valid?(dml_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_rendering_mode = dml_rendering_mode
+      else
+        @dml_rendering_mode = validator.allowable_values[dml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] iml_rendering_mode Object to be assigned
+    def iml_rendering_mode=(iml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      if iml_rendering_mode.to_i == 0
+        unless validator.valid?(iml_rendering_mode)
+          raise ArgumentError, "invalid value for 'iml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @iml_rendering_mode = iml_rendering_mode
+      else
+        @iml_rendering_mode = validator.allowable_values[iml_rendering_mode.to_i]
+      end
+    end
+
 
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared

data/lib/aspose_words_cloud/models/docm_save_options_data.rb

@@ -257,6 +257,14 @@ module AsposeWordsCloud
     def valid?
       dml3_d_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Basic", "Advanced"])
       return false unless dml3_d_effects_rendering_mode_validator.valid?(@dml3_d_effects_rendering_mode)
+      dml_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      return false unless dml_effects_rendering_mode_validator.valid?(@dml_effects_rendering_mode)
+      dml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      return false unless dml_rendering_mode_validator.valid?(@dml_rendering_mode)
+      iml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      return false unless iml_rendering_mode_validator.valid?(@iml_rendering_mode)
+      compliance_validator = EnumAttributeValidator.new('String', ["Ecma376_2006", "Iso29500_2008_Transitional", "Iso29500_2008_Strict"])
+      return false unless compliance_validator.valid?(@compliance)
       compression_level_validator = EnumAttributeValidator.new('String', ["Normal", "Maximum", "Fast", "SuperFast"])
       return false unless compression_level_validator.valid?(@compression_level)
 
@@ -277,6 +285,62 @@ module AsposeWordsCloud
       end
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_effects_rendering_mode Object to be assigned
+    def dml_effects_rendering_mode=(dml_effects_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      if dml_effects_rendering_mode.to_i == 0
+        unless validator.valid?(dml_effects_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_effects_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_effects_rendering_mode = dml_effects_rendering_mode
+      else
+        @dml_effects_rendering_mode = validator.allowable_values[dml_effects_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_rendering_mode Object to be assigned
+    def dml_rendering_mode=(dml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      if dml_rendering_mode.to_i == 0
+        unless validator.valid?(dml_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_rendering_mode = dml_rendering_mode
+      else
+        @dml_rendering_mode = validator.allowable_values[dml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] iml_rendering_mode Object to be assigned
+    def iml_rendering_mode=(iml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      if iml_rendering_mode.to_i == 0
+        unless validator.valid?(iml_rendering_mode)
+          raise ArgumentError, "invalid value for 'iml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @iml_rendering_mode = iml_rendering_mode
+      else
+        @iml_rendering_mode = validator.allowable_values[iml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] compliance Object to be assigned
+    def compliance=(compliance)
+      validator = EnumAttributeValidator.new('String', ["Ecma376_2006", "Iso29500_2008_Transitional", "Iso29500_2008_Strict"])
+      if compliance.to_i == 0
+        unless validator.valid?(compliance)
+          raise ArgumentError, "invalid value for 'compliance', must be one of #{validator.allowable_values}."
+        end
+        @compliance = compliance
+      else
+        @compliance = validator.allowable_values[compliance.to_i]
+      end
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] compression_level Object to be assigned
     def compression_level=(compression_level)

data/lib/aspose_words_cloud/models/document_entry.rb

@@ -29,29 +29,29 @@ module AsposeWordsCloud
 
   # Represents a document which will be appended to the original resource document.
   class DocumentEntry
+    # Gets or sets document password encrypted on API public key. The default value is null (the document has no password).
+    attr_accessor :encrypted_password
+
     # Gets or sets the path to document to append at the server.
     attr_accessor :href
 
     # Gets or sets the option that controls formatting will be used: appended or destination document. Can be KeepSourceFormatting or UseDestinationStyles.
     attr_accessor :import_format_mode
-
-    # Gets or sets document password encrypted on API public key. The default value is null (the document has no password).
-    attr_accessor :password
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'encrypted_password' => :'EncryptedPassword',
         :'href' => :'Href',
-        :'import_format_mode' => :'ImportFormatMode',
-        :'password' => :'Password'
+        :'import_format_mode' => :'ImportFormatMode'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'encrypted_password' => :'String',
         :'href' => :'String',
-        :'import_format_mode' => :'String',
-        :'password' => :'String'
+        :'import_format_mode' => :'String'
       }
     end
 
@@ -63,6 +63,10 @@ module AsposeWordsCloud
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      if attributes.key?(:'EncryptedPassword')
+        self.encrypted_password = attributes[:'EncryptedPassword']
+      end
+
       if attributes.key?(:'Href')
         self.href = attributes[:'Href']
       end
@@ -70,10 +74,6 @@ module AsposeWordsCloud
       if attributes.key?(:'ImportFormatMode')
         self.import_format_mode = attributes[:'ImportFormatMode']
       end
-
-      if attributes.key?(:'Password')
-        self.password = attributes[:'Password']
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -94,9 +94,9 @@ module AsposeWordsCloud
     def ==(other)
       return true if self.equal?(other)
       self.class == other.class &&
+          encrypted_password == other.encrypted_password &&
           href == other.href &&
-          import_format_mode == other.import_format_mode &&
-          password == other.password
+          import_format_mode == other.import_format_mode
     end
 
     # @see the `==` method
@@ -108,7 +108,7 @@ module AsposeWordsCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [href, import_format_mode, password].hash
+      [encrypted_password, href, import_format_mode].hash
     end
 
     # Builds the object from hash

data/lib/aspose_words_cloud/models/docx_save_options_data.rb

@@ -257,6 +257,14 @@ module AsposeWordsCloud
     def valid?
       dml3_d_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Basic", "Advanced"])
       return false unless dml3_d_effects_rendering_mode_validator.valid?(@dml3_d_effects_rendering_mode)
+      dml_effects_rendering_mode_validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      return false unless dml_effects_rendering_mode_validator.valid?(@dml_effects_rendering_mode)
+      dml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      return false unless dml_rendering_mode_validator.valid?(@dml_rendering_mode)
+      iml_rendering_mode_validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      return false unless iml_rendering_mode_validator.valid?(@iml_rendering_mode)
+      compliance_validator = EnumAttributeValidator.new('String', ["Ecma376_2006", "Iso29500_2008_Transitional", "Iso29500_2008_Strict"])
+      return false unless compliance_validator.valid?(@compliance)
       compression_level_validator = EnumAttributeValidator.new('String', ["Normal", "Maximum", "Fast", "SuperFast"])
       return false unless compression_level_validator.valid?(@compression_level)
 
@@ -277,6 +285,62 @@ module AsposeWordsCloud
       end
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_effects_rendering_mode Object to be assigned
+    def dml_effects_rendering_mode=(dml_effects_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Simplified", "None", "Fine"])
+      if dml_effects_rendering_mode.to_i == 0
+        unless validator.valid?(dml_effects_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_effects_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_effects_rendering_mode = dml_effects_rendering_mode
+      else
+        @dml_effects_rendering_mode = validator.allowable_values[dml_effects_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dml_rendering_mode Object to be assigned
+    def dml_rendering_mode=(dml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "DrawingML"])
+      if dml_rendering_mode.to_i == 0
+        unless validator.valid?(dml_rendering_mode)
+          raise ArgumentError, "invalid value for 'dml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @dml_rendering_mode = dml_rendering_mode
+      else
+        @dml_rendering_mode = validator.allowable_values[dml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] iml_rendering_mode Object to be assigned
+    def iml_rendering_mode=(iml_rendering_mode)
+      validator = EnumAttributeValidator.new('String', ["Fallback", "InkML"])
+      if iml_rendering_mode.to_i == 0
+        unless validator.valid?(iml_rendering_mode)
+          raise ArgumentError, "invalid value for 'iml_rendering_mode', must be one of #{validator.allowable_values}."
+        end
+        @iml_rendering_mode = iml_rendering_mode
+      else
+        @iml_rendering_mode = validator.allowable_values[iml_rendering_mode.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] compliance Object to be assigned
+    def compliance=(compliance)
+      validator = EnumAttributeValidator.new('String', ["Ecma376_2006", "Iso29500_2008_Transitional", "Iso29500_2008_Strict"])
+      if compliance.to_i == 0
+        unless validator.valid?(compliance)
+          raise ArgumentError, "invalid value for 'compliance', must be one of #{validator.allowable_values}."
+        end
+        @compliance = compliance
+      else
+        @compliance = validator.allowable_values[compliance.to_i]
+      end
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] compression_level Object to be assigned
     def compression_level=(compression_level)