aspose_slides_cloud 20.6.0 → 21.1.0

data/lib/aspose_slides_cloud/api_client.rb

@@ -57,7 +57,7 @@ module AsposeSlidesCloud
         @config.logger.debug "HTTP response\nHeaders: #{response.headers}\nStatus: #{response.status}\nBody: #{response.body}\n"
       end
 
-      if response.status == 401 and @config.access_token
+      if (response.status == 401 || (response.status == 500 && response.body.length == 0)) and @config.access_token
         @config.access_token = nil
         return repeat_call_api(http_method, path, opts)
       end
@@ -147,7 +147,9 @@ module AsposeSlidesCloud
           opts[:query_params][key] = opts[:query_params][key].join[","]
         end
       end
-      req.options.timeout = 200
+      if @config.http_request_timeout > 0
+          req.options.timeout = @config.http_request_timeout
+      end
       req.url path.sub(/^\/+/, '')
       req.headers = opts[:header_params]
       req.params = opts[:query_params]
@@ -160,10 +162,9 @@ module AsposeSlidesCloud
     end
 
     def set_headers(headers)
-      headers['x-aspose-client'] = 'ruby sdk'
-      headers['x-aspose-version'] = AsposeSlidesCloud::VERSION
+      headers['x-aspose-client'] = "ruby sdk v#{AsposeSlidesCloud::VERSION}"
       if @config.timeout > 0
-        headers['x-aspose-timeout'] = @config.timeout
+        headers['x-aspose-timeout'] = @config.timeout.to_s
       end
       @config.custom_headers.each do |key, value|
         headers[key] = value
@@ -172,26 +173,28 @@ module AsposeSlidesCloud
     end
 
     def set_auth_header(headers)
-      unless @config.access_token
-        auth_token_response = Faraday.post(
-          @config.auth_base_url + '/connect/token',
-          { :grant_type => 'client_credentials', 'client_id' => @config.app_sid, 'client_secret' => @config.app_key })
-
-        unless auth_token_response.success?
-          if auth_token_response.status == 0
-            # Errors from libcurl will be made visible here
-            fail ApiError.new(:code => 0,
-                            :message => auth_token_response.return_message)
-          else
-            fail ApiError.new(:code => 401,
-                            :response_headers => auth_token_response.headers,
-                            :response_body => auth_token_response.body),
-                 "unauthorized"
+      if config.app_sid || config.access_token
+        unless @config.access_token
+          auth_token_response = Faraday.post(
+            @config.auth_base_url + '/connect/token',
+            { :grant_type => 'client_credentials', 'client_id' => @config.app_sid, 'client_secret' => @config.app_sid })
+
+          unless auth_token_response.success?
+            if auth_token_response.status == 0
+              # Errors from libcurl will be made visible here
+              fail ApiError.new(:code => 0,
+                              :message => auth_token_response.return_message)
+            else
+              fail ApiError.new(:code => 401,
+                              :response_headers => auth_token_response.headers,
+                              :response_body => auth_token_response.body),
+                   "unauthorized"
+            end
           end
+          @config.access_token = JSON.parse("[#{auth_token_response.body}]", :symbolize_names => true)[0][:access_token]
         end
-        @config.access_token = JSON.parse("[#{auth_token_response.body}]", :symbolize_names => true)[0][:access_token]
+        headers['Authorization'] = 'Bearer ' + @config.access_token
       end
-      headers['Authorization'] = 'Bearer ' + @config.access_token
     end
 
     # Check if the given MIME is a JSON MIME.
@@ -274,8 +277,11 @@ module AsposeSlidesCloud
           data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
-        # models, e.g. Pet
-        AsposeSlidesCloud.const_get(return_type).new.tap do |model|
+        type = AsposeSlidesCloud::TypeRegistry.get_type(return_type, data)
+        if !type
+          type = return_type
+        end
+        AsposeSlidesCloud.const_get(type).new.tap do |model|
           model.build_from_hash data
         end
       end

data/lib/aspose_slides_cloud/configuration.rb

@@ -66,9 +66,13 @@ module AsposeSlidesCloud
     # @return [String]
     attr_accessor :temp_folder_path
 
-    # The time limit for HTTP request in seconds.
-    # Default to 0 (never times out).
+    # slides operaion timeout in seconds. The timeout applies to the Slides operation, not to the HTTP request.
+    # Default to 0 (no timeout).
     attr_accessor :timeout
+
+    # The time limit for HTTP request in seconds.
+    # Default to 300.
+    attr_accessor :http_request_timeout
  
     # Set this to false to skip client side validation in the operation.
     # Default to true.
@@ -129,6 +133,7 @@ module AsposeSlidesCloud
       @base_url = 'https://api.aspose.cloud'
       @auth_base_url = 'https://api.aspose.cloud'
       @version = 'v3.0'
+      @http_request_timeout = 300
       @timeout = 0
       @custom_headers = Hash.new
       @client_side_validation = true

data/lib/aspose_slides_cloud/models/add_layout_slide.rb

@@ -24,10 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # Add layout slide task.
-  class AddLayoutSlide
-    # Task type.
-    attr_accessor :type
-
+  class AddLayoutSlide < Task
     # Source file.
     attr_accessor :clone_from_file
 
@@ -58,35 +55,24 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'type' => :'Type',
+      super.merge({
         :'clone_from_file' => :'CloneFromFile',
-        :'clone_from_position' => :'CloneFromPosition'
-      }
+        :'clone_from_position' => :'CloneFromPosition',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'type' => :'String',
+      super.merge({
         :'clone_from_file' => :'InputFile',
-        :'clone_from_position' => :'Integer'
-      }
+        :'clone_from_position' => :'Integer',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      else
-        self.type = "AddLayoutSlide"
-      end
+      super
 
       if attributes.has_key?(:'CloneFromFile')
         self.clone_from_file = attributes[:'CloneFromFile']
@@ -95,16 +81,13 @@ module AsposeSlidesCloud
       if attributes.has_key?(:'CloneFromPosition')
         self.clone_from_position = attributes[:'CloneFromPosition']
       end
+      self.type = "AddLayoutSlide"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
+      invalid_properties = super
       if @clone_from_position.nil?
         invalid_properties.push('invalid value for "clone_from_position", clone_from_position cannot be nil.')
       end
@@ -115,23 +98,11 @@ module AsposeSlidesCloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      return false unless type_validator.valid?(@type)
+      return false if !super
       return false if @clone_from_position.nil?
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -160,15 +131,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
+          end
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/add_master_slide.rb

@@ -24,10 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # Add master slide task.
-  class AddMasterSlide
-    # Task type.
-    attr_accessor :type
-
+  class AddMasterSlide < Task
     # Source presentation clone from.
     attr_accessor :clone_from_file
 
@@ -61,37 +58,26 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'type' => :'Type',
+      super.merge({
         :'clone_from_file' => :'CloneFromFile',
         :'clone_from_position' => :'CloneFromPosition',
-        :'apply_to_all' => :'ApplyToAll'
-      }
+        :'apply_to_all' => :'ApplyToAll',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'type' => :'String',
+      super.merge({
         :'clone_from_file' => :'InputFile',
         :'clone_from_position' => :'Integer',
-        :'apply_to_all' => :'BOOLEAN'
-      }
+        :'apply_to_all' => :'BOOLEAN',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      else
-        self.type = "AddMasterSlide"
-      end
+      super
 
       if attributes.has_key?(:'CloneFromFile')
         self.clone_from_file = attributes[:'CloneFromFile']
@@ -104,16 +90,13 @@ module AsposeSlidesCloud
       if attributes.has_key?(:'ApplyToAll')
         self.apply_to_all = attributes[:'ApplyToAll']
       end
+      self.type = "AddMasterSlide"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
+      invalid_properties = super
       if @clone_from_position.nil?
         invalid_properties.push('invalid value for "clone_from_position", clone_from_position cannot be nil.')
       end
@@ -128,24 +111,12 @@ module AsposeSlidesCloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      return false unless type_validator.valid?(@type)
+      return false if !super
       return false if @clone_from_position.nil?
       return false if @apply_to_all.nil?
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -175,15 +146,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
+          end
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/add_shape.rb

@@ -24,10 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # Add shape task.
-  class AddShape
-    # Task type.
-    attr_accessor :type
-
+  class AddShape < Task
     # Shape DTO.
     attr_accessor :shape
 
@@ -58,35 +55,24 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'type' => :'Type',
+      super.merge({
         :'shape' => :'Shape',
-        :'shape_path' => :'ShapePath'
-      }
+        :'shape_path' => :'ShapePath',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'type' => :'String',
+      super.merge({
         :'shape' => :'ShapeBase',
-        :'shape_path' => :'String'
-      }
+        :'shape_path' => :'String',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      else
-        self.type = "AddShape"
-      end
+      super
 
       if attributes.has_key?(:'Shape')
         self.shape = attributes[:'Shape']
@@ -95,38 +81,23 @@ module AsposeSlidesCloud
       if attributes.has_key?(:'ShapePath')
         self.shape_path = attributes[:'ShapePath']
       end
+      self.type = "AddShape"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
+      invalid_properties = super
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      return false unless type_validator.valid?(@type)
+      return false if !super
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['Save', 'SaveSlide', 'SaveShape', 'AddSlide', 'AddMasterSlide', 'AddLayoutSlide', 'RemoveSlide', 'ReoderSlide', 'Merge', 'UpdateBackground', 'ResetSlide', 'AddShape', 'RemoveShape', 'UpdateShape', 'ReplaceText'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -155,15 +126,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
+          end
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self