aspose_cad_cloud 24.5 → 24.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b76ed8473eb9fe882d2f12e24c5f46bba2a8b27a0bdb6d8bcc6d98fdd44e7df
-  data.tar.gz: efbbdfa2a5896be6397ee11431d435392d3c7a3e96d9f4a8710746e81ad798e4
+  metadata.gz: ecdab5a0cd30fddd4835cd12781e1665820ab9daa25bb0e26768d389b06e220a
+  data.tar.gz: 0a60969f42b4881136c27de0ee56daa5c167d33da69acc30ff5fb4e62371c116
 SHA512:
-  metadata.gz: 1c42f2f182f1bc037e01103d651b15556441456754c2cff82c1c007925ae3643dece44f38184fab3a25bf230e07808663c55aa34cab2feaed28a990f85eec187
-  data.tar.gz: 23d8945235393ba2bee4b77c9d988c5bcf533494972be5846793de3adeb0de6eb4ef01e9e0a3485ce0e894cef3114cafec001d3fab96ece880eb4a383619edee
+  metadata.gz: 85fc1ad6d3418c6757c6695acaaeed788a21f7df29d0105d5659101ed8dd5bd5193669ae23d81ffff3caede469e1d725706c420108c44dce571cfe7509b3dbc2
+  data.tar.gz: 202e74016f9a42db2f121cf02fbaab45d0615e399046aee020d252216672a202e0758c8db8595f24c256e0532173be5b2ef1b6080d98999574457bd11bc91353

data/lib/aspose_cad_cloud/api/cad_api.rb

@@ -38,7 +38,7 @@ module AsposeCadCloud
       request_token
     end
 
-    # Convert CAD drawing to DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG format.
+    # Convert CAD drawing to DXF, DWG, DGN, DRC, DWF, DWFX, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG format.
     # 
     # @param request ConvertRequest
     # @return [File]
@@ -48,7 +48,7 @@ module AsposeCadCloud
       data
     end
 
-    # Convert CAD drawing to DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG format.
+    # Convert CAD drawing to DXF, DWG, DGN, DRC, DWF, DWFX, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG format.
     # 
     # @param request ConvertRequest
     # @return [Array<(File, Fixnum, Hash)>]
@@ -57,6 +57,8 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? ConvertRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.convert ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.convert' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # verify the required parameter 'output_format' is set
       raise ArgumentError, 'Missing the required parameter output_format when calling CadApi.convert' if @api_client.config.client_side_validation && request.output_format.nil?
       # resource path
@@ -77,11 +79,11 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -540,6 +542,8 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? EditMetadataRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.edit_metadata ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.edit_metadata' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # resource path
       local_var_path = '/cad/EditMetadata'
 
@@ -551,11 +555,11 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -597,6 +601,8 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? ExtractMetadataRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.extract_metadata ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.extract_metadata' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # verify the required parameter 'output_format' is set
       raise ArgumentError, 'Missing the required parameter output_format when calling CadApi.extract_metadata' if @api_client.config.client_side_validation && request.output_format.nil?
       # resource path
@@ -612,11 +618,11 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -658,6 +664,8 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? ExtractTextRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.extract_text ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.extract_text' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # resource path
       local_var_path = '/cad/ExtractText'
 
@@ -669,11 +677,11 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -1438,6 +1446,8 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? PaperToCadRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.paper_to_cad ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.paper_to_cad' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # verify the required parameter 'output_format' is set
       raise ArgumentError, 'Missing the required parameter output_format when calling CadApi.paper_to_cad' if @api_client.config.client_side_validation && request.output_format.nil?
       # resource path
@@ -1453,11 +1463,11 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -5148,6 +5158,10 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? PutEditMetadataRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.put_edit_metadata ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.put_edit_metadata' if @api_client.config.client_side_validation && request.drawing_data.nil?
+      # verify the required parameter 'metadata_component' is set
+      raise ArgumentError, 'Missing the required parameter metadata_component when calling CadApi.put_edit_metadata' if @api_client.config.client_side_validation && request.metadata_component.nil?
       # resource path
       local_var_path = '/cad/EditMetadata'
 
@@ -5159,12 +5173,12 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
-      form_params[downcase_first_letter('metadataComponent')] = request.metadata_component unless request.metadata_component.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
+      form_params[downcase_first_letter('metadataComponent')] = request.metadata_component
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -5393,8 +5407,12 @@ module AsposeCadCloud
       raise ArgumentError, 'Incorrect request type' unless request.is_a? WatermarkRequest
 
       @api_client.config.logger.debug 'Calling API: CadApi.watermark ...' if @api_client.config.debugging
+      # verify the required parameter 'drawing_data' is set
+      raise ArgumentError, 'Missing the required parameter drawing_data when calling CadApi.watermark' if @api_client.config.client_side_validation && request.drawing_data.nil?
       # verify the required parameter 'output_format' is set
       raise ArgumentError, 'Missing the required parameter output_format when calling CadApi.watermark' if @api_client.config.client_side_validation && request.output_format.nil?
+      # verify the required parameter 'watermark' is set
+      raise ArgumentError, 'Missing the required parameter watermark when calling CadApi.watermark' if @api_client.config.client_side_validation && request.watermark.nil?
       # resource path
       local_var_path = '/cad/Watermark'
 
@@ -5413,12 +5431,12 @@ module AsposeCadCloud
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data', 'application/octet-stream'])
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/octet-stream', 'multipart/form-data'])
 
       # form parameters
       form_params = {}
-      form_params[downcase_first_letter('drawing')] = request.drawing unless request.drawing.nil?
-      form_params[downcase_first_letter('watermarkRgb')] = request.watermark_rgb unless request.watermark_rgb.nil?
+      form_params[downcase_first_letter('drawingData')] = request.drawing_data
+      form_params[downcase_first_letter('watermark')] = request.watermark
 	  
       if not form_params.empty?
         header_params['Content-Type'] = 'multipart/form-data'
@@ -5458,7 +5476,7 @@ module AsposeCadCloud
       config.api_version = ''
       request_url = "/connect/token"
       post_data = "grant_type=client_credentials" + "&client_id=" + config.api_key['app_sid'] + "&client_secret=" + config.api_key['api_key']
-      data, status_code, header = @api_client.call_api(:POST, request_url, :body => post_data, :header_params => { "Content-Type": "application/x-www-form-urlencoded" }, :return_type => 'Object')
+      data, status_code, header = @api_client.call_token_api(:POST, request_url, :body => post_data, :header_params => { "Content-Type": "application/x-www-form-urlencoded" }, :return_type => 'Object')
       @api_client.config.access_token = data[:access_token]
       @api_client.config.api_version = api_version
     end

data/lib/aspose_cad_cloud/api_client.rb

@@ -90,6 +90,35 @@ module AsposeCadCloud
       [data, response.status, response.headers]
     end
 
+    # Call an API token.
+    #
+    # @return [Array<(Object, Fixnum, Hash)>] an array of 3 elements:
+    #   the data deserialized from response body (could be nil), response status code and response headers.
+    def call_token_api(http_method, path, opts = {})
+      response = build_access_token_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
+
+      unless response.success?
+        if response.status == 0
+          # Errors from libcurl will be made visible here
+          raise ApiError.new(:code => 0,
+                             :message => response.reason_phrase)
+        else
+          raise ApiError.new(:code => response.status,
+                             :response_headers => response.headers,
+                             :response_body => response.body),
+                response.reason_phrase
+        end
+      end
+
+
+      data = deserialize(response, opts[:return_type]) if opts[:return_type]
+      [data, response.status, response.headers]
+    end
+
     # Builds the HTTP request
     #
     # @param [String] http_method HTTP method/verb (e.g. POST)
@@ -145,6 +174,58 @@ module AsposeCadCloud
       end
     end
 
+
+    # Builds the HTTP request for access token
+    #
+    # @param [String] http_method HTTP method/verb (e.g. POST)
+    # @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_access_token_request(http_method, path, opts = {})
+      url = build_request_token_url(path)
+      http_method = http_method.to_sym.downcase
+
+      header_params = @default_headers.merge(opts[:header_params] || {})
+      query_params = opts[:query_params] || {}
+      form_params = opts[:form_params] || {}
+      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,
+        :params => query_params,
+        :body => body
+      }
+
+      if [:post].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
+      end
+
+      conn = Faraday.new url, { :params => query_params, :headers => header_params } do |f|
+        f.request :multipart
+        f.request :url_encoded
+        f.adapter Faraday.default_adapter
+      end
+
+      case http_method
+      when :post
+        return conn.post url, req_opts[:body]
+      else
+        return conn.delete url do |c|
+          c.body = req_opts[:body]
+        end
+      end
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -252,7 +333,7 @@ module AsposeCadCloud
       end
       prefix += '-' unless prefix.end_with?('-')
       encoding = response.body.encoding
-      tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
+      tempfile = Tempfile.open(prefix, @config.temp_folder_path, binmode: true, encoding: encoding)
       @tempfile = tempfile
       tempfile.write(response.body)
       response.on_complete do |resp|
@@ -280,6 +361,21 @@ module AsposeCadCloud
       return req
     end
 
+    def build_request_token_url(path)
+      # Add leading and trailing slashes to path
+      path = "/#{path}".gsub(/\/+/, '/')
+      req = URI::Parser.new.escape auth_token(@config.base_url) + path
+      return req
+    end
+
+    def auth_token(path)
+      pattern = /api(-qa)?/
+      replacement = 'id\1'
+
+      return path.gsub(pattern, replacement)
+    end
+
+
     # Builds the HTTP request body
     #
     # @param [Hash] header_params Header parameters

data/lib/aspose_cad_cloud/configuration.rb

@@ -115,7 +115,7 @@ module AsposeCadCloud
       @api_key_prefix = {}
       @client_side_validation = true
       @debugging = false
-      @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+      @logger = Logger.new(STDOUT)
 
       yield(self) if block_given?
     end

data/lib/aspose_cad_cloud/models/cad_rasterization_options_dto.rb

@@ -129,8 +129,8 @@ module AsposeCadCloud
         :'border_y' => :'Float',
         :'page_height' => :'Float',
         :'page_width' => :'Float',
-        :'background_color' => :'Color',
-        :'draw_color' => :'Color',
+        :'background_color' => :'ColorDTO',
+        :'draw_color' => :'ColorDTO',
         :'unit_type' => :'String',
         :'content_as_bitmap' => :'BOOLEAN',
         :'graphics_options' => :'GraphicsOptions',
@@ -242,14 +242,6 @@ module AsposeCadCloud
         invalid_properties.push("invalid value for 'page_width', page_width cannot be nil.")
       end
 
-      if @background_color.nil?
-        invalid_properties.push("invalid value for 'background_color', background_color cannot be nil.")
-      end
-
-      if @draw_color.nil?
-        invalid_properties.push("invalid value for 'draw_color', draw_color cannot be nil.")
-      end
-
       if @unit_type.nil?
         invalid_properties.push("invalid value for 'unit_type', unit_type cannot be nil.")
       end
@@ -284,8 +276,6 @@ module AsposeCadCloud
       return false if @border_y.nil?
       return false if @page_height.nil?
       return false if @page_width.nil?
-      return false if @background_color.nil?
-      return false if @draw_color.nil?
       return false if @unit_type.nil?
       unit_type_validator = EnumAttributeValidator.new('String', ["Kilometer", "Meter", "Centimenter", "Millimeter", "Micrometer", "Nanometer", "Angstrom", "Decimeter", "Decameter", "Hectometer", "Gigameter", "AstronomicalUnit", "LightYear", "Parsec", "Mile", "Yard", "Foot", "Inch", "Mil", "MicroInch", "Custom", "Unitless"])
       return false unless unit_type_validator.valid?(@unit_type)

data/lib/aspose_cad_cloud/models/color_dto.rb

@@ -0,0 +1,242 @@
+
+require 'date'
+
+module AsposeCadCloud
+ #
+ # --------------------------------------------------------------------------------------------------------------------
+ # <copyright company="Aspose" file="ColorDTO.rb">
+ #   Copyright (c) 2017 Aspose.CAD Cloud
+ # </copyright>
+ # <summary>
+ #   Permission is hereby granted, free of charge, to any person obtaining a copy
+ #  of this software and associated documentation files (the "Software"), to deal
+ #  in the Software without restriction, including without limitation the rights
+ #  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ #  copies of the Software, and to permit persons to whom the Software is
+ #  furnished to do so, subject to the following conditions:
+ #
+ #  The above copyright notice and this permission notice shall be included in all
+ #  copies or substantial portions of the Software.
+ #
+ #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ #  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ #  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ #  SOFTWARE.
+ # </summary>
+ # --------------------------------------------------------------------------------------------------------------------
+ #
+
+  # RGB color values
+  class ColorDTO
+    # Red light(0-255).
+    attr_accessor :r
+
+    # Green light(0-255).
+    attr_accessor :g
+
+    # Blue light(0-255).
+    attr_accessor :b
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'r' => :'R',
+        :'g' => :'G',
+        :'b' => :'B'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'r' => :'Integer',
+        :'g' => :'Integer',
+        :'b' => :'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.key?(:'R')
+        self.r = attributes[:'R']
+      end
+
+      if attributes.key?(:'G')
+        self.g = attributes[:'G']
+      end
+
+      if attributes.key?(:'B')
+        self.b = attributes[:'B']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = []
+      if @r.nil?
+        invalid_properties.push("invalid value for 'r', r cannot be nil.")
+      end
+
+      if @g.nil?
+        invalid_properties.push("invalid value for 'g', g cannot be nil.")
+      end
+
+      if @b.nil?
+        invalid_properties.push("invalid value for 'b', b cannot be nil.")
+      end
+
+      return 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 @r.nil?
+      return false if @g.nil?
+      return false if @b.nil?
+      return true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(other)
+      return true if self.equal?(other)
+      self.class == other.class &&
+          r == other.r &&
+          g == other.g &&
+          b == other.b
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [r, g, b].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    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) })
+          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
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        Time.at(/\d/.match(value)[0].to_f).to_datetime
+      when :Date
+        Time.at(/\d/.match(value)[0].to_f).to_date
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else
+      # model
+        temp_model = AsposeCadCloud.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end

data/lib/aspose_cad_cloud/models/{error_model.rb → error.rb}

@@ -4,7 +4,7 @@ require 'date'
 module AsposeCadCloud
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose" file="ErrorModel.rb">
+ # <copyright company="Aspose" file="Error.rb">
  #   Copyright (c) 2017 Aspose.CAD Cloud
  # </copyright>
  # <summary>
@@ -30,7 +30,7 @@ module AsposeCadCloud
  #
 
   # Error
-  class ErrorModel
+  class Error
     # Code             
     attr_accessor :code
 

data/lib/aspose_cad_cloud/models/files_upload_result.rb

@@ -50,7 +50,7 @@ module AsposeCadCloud
     def self.swagger_types
       {
         :'uploaded' => :'Array<String>',
-        :'errors' => :'Array<ErrorModel>'
+        :'errors' => :'Array<Error>'
       }
     end
 

data/lib/aspose_cad_cloud/models/requests/ConvertRequest.rb

@@ -32,21 +32,21 @@ module AsposeCadCloud
   #
   class ConvertRequest
 
+        # Input drawing
+        attr_accessor :drawing_data
         # Output DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG, PNG, BMP, DIB, TIFF, TIF, JPEG, GIF, PSD, JPG, JPE, JIF, JFIF, PSD, WEBP, DCM, DICOM, JP2, J2K, JPF, JPM, JPG2, J2C, JPC, JPX, MJ2 , DJVU file format.
         attr_accessor :output_format
-        # Form-data file
-        attr_accessor :drawing
         # For output pdf format: PDF_15, PDFa_1a OR PDFa_1b. Null for another format
         attr_accessor :output_type_ext
 	
         #
         # Initializes a new instance.
+        # @param drawing_data Input drawing
         # @param output_format Output DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, PDF, SVG, PNG, BMP, DIB, TIFF, TIF, JPEG, GIF, PSD, JPG, JPE, JIF, JFIF, PSD, WEBP, DCM, DICOM, JP2, J2K, JPF, JPM, JPG2, J2C, JPC, JPX, MJ2 , DJVU file format.
-        # @param drawing Form-data file
         # @param output_type_ext For output pdf format: PDF_15, PDFa_1a OR PDFa_1b. Null for another format
-        def initialize(output_format, drawing = nil, output_type_ext = nil)
+        def initialize(drawing_data, output_format, output_type_ext = nil)
+           self.drawing_data = drawing_data
            self.output_format = output_format
-           self.drawing = drawing
            self.output_type_ext = output_type_ext
         end
   end

data/lib/aspose_cad_cloud/models/requests/EditMetadataRequest.rb

@@ -32,14 +32,14 @@ module AsposeCadCloud
   #
   class EditMetadataRequest
 
-        # Gets or sets drawing
-        attr_accessor :drawing
+        # Input drawing
+        attr_accessor :drawing_data
 	
         #
         # Initializes a new instance.
-        # @param drawing 
-        def initialize(drawing = nil)
-           self.drawing = drawing
+        # @param drawing_data Input drawing
+        def initialize(drawing_data)
+           self.drawing_data = drawing_data
         end
   end
 end

data/lib/aspose_cad_cloud/models/requests/ExtractMetadataRequest.rb

@@ -32,18 +32,18 @@ module AsposeCadCloud
   #
   class ExtractMetadataRequest
 
+        # Input drawing
+        attr_accessor :drawing_data
         # Output TXT, XML or JSON file format.
         attr_accessor :output_format
-        # Form-data file
-        attr_accessor :drawing
 	
         #
         # Initializes a new instance.
+        # @param drawing_data Input drawing
         # @param output_format Output TXT, XML or JSON file format.
-        # @param drawing Form-data file
-        def initialize(output_format, drawing = nil)
+        def initialize(drawing_data, output_format)
+           self.drawing_data = drawing_data
            self.output_format = output_format
-           self.drawing = drawing
         end
   end
 end

data/lib/aspose_cad_cloud/models/requests/ExtractTextRequest.rb

@@ -32,14 +32,14 @@ module AsposeCadCloud
   #
   class ExtractTextRequest
 
-        # Gets or sets drawing
-        attr_accessor :drawing
+        # Input drawing
+        attr_accessor :drawing_data
 	
         #
         # Initializes a new instance.
-        # @param drawing 
-        def initialize(drawing = nil)
-           self.drawing = drawing
+        # @param drawing_data Input drawing
+        def initialize(drawing_data)
+           self.drawing_data = drawing_data
         end
   end
 end

data/lib/aspose_cad_cloud/models/requests/PaperToCadRequest.rb

@@ -32,18 +32,18 @@ module AsposeCadCloud
   #
   class PaperToCadRequest
 
+        # Input drawing
+        attr_accessor :drawing_data
         # Output DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, SVG file format.
         attr_accessor :output_format
-        # Form-data file
-        attr_accessor :drawing
 	
         #
         # Initializes a new instance.
+        # @param drawing_data Input drawing
         # @param output_format Output DXF, DWG, DGN, DWF, DWFX, DRC, IFC, STL, STP, STEP, CGM, GLB, GLTF, DWT, IGES, PLT, CF2, OBJ, HPGL, IGS, PCL, FBX, SVG file format.
-        # @param drawing Form-data file
-        def initialize(output_format, drawing = nil)
+        def initialize(drawing_data, output_format)
+           self.drawing_data = drawing_data
            self.output_format = output_format
-           self.drawing = drawing
         end
   end
 end

data/lib/aspose_cad_cloud/models/requests/PutEditMetadataRequest.rb

@@ -32,17 +32,17 @@ module AsposeCadCloud
   #
   class PutEditMetadataRequest
 
-        # Gets or sets drawing
-        attr_accessor :drawing
-        # Gets or sets metadata_component
+        # Input drawing
+        attr_accessor :drawing_data
+        # Metadata string json from POST/EditMetadata
         attr_accessor :metadata_component
 	
         #
         # Initializes a new instance.
-        # @param drawing 
-        # @param metadata_component 
-        def initialize(drawing = nil, metadata_component = nil)
-           self.drawing = drawing
+        # @param drawing_data Input drawing
+        # @param metadata_component Metadata string json from POST/EditMetadata
+        def initialize(drawing_data, metadata_component)
+           self.drawing_data = drawing_data
            self.metadata_component = metadata_component
         end
   end

data/lib/aspose_cad_cloud/models/requests/WatermarkRequest.rb

@@ -32,25 +32,25 @@ module AsposeCadCloud
   #
   class WatermarkRequest
 
+        # Input drawing
+        attr_accessor :drawing_data
         # Gets or sets output_format
         attr_accessor :output_format
-        # Gets or sets drawing
-        attr_accessor :drawing
-        # Gets or sets watermark_rgb
-        attr_accessor :watermark_rgb
+        # JSON-serialized export options passed as zero-indexed multipart/form-data. Follow #/definitions/WatermarkRGB model definition.
+        attr_accessor :watermark
         # Gets or sets output_type_ext
         attr_accessor :output_type_ext
 	
         #
         # Initializes a new instance.
+        # @param drawing_data Input drawing
         # @param output_format 
-        # @param drawing 
-        # @param watermark_rgb 
+        # @param watermark JSON-serialized export options passed as zero-indexed multipart/form-data. Follow #/definitions/WatermarkRGB model definition.
         # @param output_type_ext 
-        def initialize(output_format, drawing = nil, watermark_rgb = nil, output_type_ext = nil)
+        def initialize(drawing_data, output_format, watermark, output_type_ext = nil)
+           self.drawing_data = drawing_data
            self.output_format = output_format
-           self.drawing = drawing
-           self.watermark_rgb = watermark_rgb
+           self.watermark = watermark
            self.output_type_ext = output_type_ext
         end
   end

data/lib/aspose_cad_cloud/models/vector_rasterization_options_dto.rb

@@ -101,8 +101,8 @@ module AsposeCadCloud
         :'border_y' => :'Float',
         :'page_height' => :'Float',
         :'page_width' => :'Float',
-        :'background_color' => :'Color',
-        :'draw_color' => :'Color',
+        :'background_color' => :'ColorDTO',
+        :'draw_color' => :'ColorDTO',
         :'unit_type' => :'String',
         :'content_as_bitmap' => :'BOOLEAN',
         :'graphics_options' => :'GraphicsOptions'
@@ -175,14 +175,6 @@ module AsposeCadCloud
         invalid_properties.push("invalid value for 'page_width', page_width cannot be nil.")
       end
 
-      if @background_color.nil?
-        invalid_properties.push("invalid value for 'background_color', background_color cannot be nil.")
-      end
-
-      if @draw_color.nil?
-        invalid_properties.push("invalid value for 'draw_color', draw_color cannot be nil.")
-      end
-
       if @unit_type.nil?
         invalid_properties.push("invalid value for 'unit_type', unit_type cannot be nil.")
       end
@@ -201,8 +193,6 @@ module AsposeCadCloud
       return false if @border_y.nil?
       return false if @page_height.nil?
       return false if @page_width.nil?
-      return false if @background_color.nil?
-      return false if @draw_color.nil?
       return false if @unit_type.nil?
       unit_type_validator = EnumAttributeValidator.new('String', ["Kilometer", "Meter", "Centimenter", "Millimeter", "Micrometer", "Nanometer", "Angstrom", "Decimeter", "Decameter", "Hectometer", "Gigameter", "AstronomicalUnit", "LightYear", "Parsec", "Mile", "Yard", "Foot", "Inch", "Mil", "MicroInch", "Custom", "Unitless"])
       return false unless unit_type_validator.valid?(@unit_type)

data/lib/aspose_cad_cloud/models/{color.rb → watermark_rgb.rb}

@@ -4,7 +4,7 @@ require 'date'
 module AsposeCadCloud
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose" file="Color.rb">
+ # <copyright company="Aspose" file="WatermarkRGB.rb">
  #   Copyright (c) 2017 Aspose.CAD Cloud
  # </copyright>
  # <summary>
@@ -29,50 +29,38 @@ module AsposeCadCloud
  # --------------------------------------------------------------------------------------------------------------------
  #
 
+  # Watermark text with RGB values
+  class WatermarkRGB
+    # Watermark text.
+    attr_accessor :text
 
-  class Color
+    # Red light(0-255).
     attr_accessor :r
 
+    # Green light(0-255).
     attr_accessor :g
 
+    # Blue light(0-255).
     attr_accessor :b
 
-    attr_accessor :a
-
-    attr_accessor :is_known_color
-
-    attr_accessor :is_empty
-
-    attr_accessor :is_named_color
-
-    attr_accessor :name
-
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'text' => :'Text',
         :'r' => :'R',
         :'g' => :'G',
-        :'b' => :'B',
-        :'a' => :'A',
-        :'is_known_color' => :'IsKnownColor',
-        :'is_empty' => :'IsEmpty',
-        :'is_named_color' => :'IsNamedColor',
-        :'name' => :'Name'
+        :'b' => :'B'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'text' => :'String',
         :'r' => :'Integer',
         :'g' => :'Integer',
-        :'b' => :'Integer',
-        :'a' => :'Integer',
-        :'is_known_color' => :'BOOLEAN',
-        :'is_empty' => :'BOOLEAN',
-        :'is_named_color' => :'BOOLEAN',
-        :'name' => :'String'
+        :'b' => :'Integer'
       }
     end
 
@@ -84,6 +72,10 @@ module AsposeCadCloud
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      if attributes.key?(:'Text')
+        self.text = attributes[:'Text']
+      end
+
       if attributes.key?(:'R')
         self.r = attributes[:'R']
       end
@@ -96,26 +88,6 @@ module AsposeCadCloud
         self.b = attributes[:'B']
       end
 
-      if attributes.key?(:'A')
-        self.a = attributes[:'A']
-      end
-
-      if attributes.key?(:'IsKnownColor')
-        self.is_known_color = attributes[:'IsKnownColor']
-      end
-
-      if attributes.key?(:'IsEmpty')
-        self.is_empty = attributes[:'IsEmpty']
-      end
-
-      if attributes.key?(:'IsNamedColor')
-        self.is_named_color = attributes[:'IsNamedColor']
-      end
-
-      if attributes.key?(:'Name')
-        self.name = attributes[:'Name']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -134,22 +106,6 @@ module AsposeCadCloud
         invalid_properties.push("invalid value for 'b', b cannot be nil.")
       end
 
-      if @a.nil?
-        invalid_properties.push("invalid value for 'a', a cannot be nil.")
-      end
-
-      if @is_known_color.nil?
-        invalid_properties.push("invalid value for 'is_known_color', is_known_color cannot be nil.")
-      end
-
-      if @is_empty.nil?
-        invalid_properties.push("invalid value for 'is_empty', is_empty cannot be nil.")
-      end
-
-      if @is_named_color.nil?
-        invalid_properties.push("invalid value for 'is_named_color', is_named_color cannot be nil.")
-      end
-
       return invalid_properties
     end
 
@@ -159,10 +115,6 @@ module AsposeCadCloud
       return false if @r.nil?
       return false if @g.nil?
       return false if @b.nil?
-      return false if @a.nil?
-      return false if @is_known_color.nil?
-      return false if @is_empty.nil?
-      return false if @is_named_color.nil?
       return true
     end
 
@@ -171,14 +123,10 @@ module AsposeCadCloud
     def ==(other)
       return true if self.equal?(other)
       self.class == other.class &&
+          text == other.text &&
           r == other.r &&
           g == other.g &&
-          b == other.b &&
-          a == other.a &&
-          is_known_color == other.is_known_color &&
-          is_empty == other.is_empty &&
-          is_named_color == other.is_named_color &&
-          name == other.name
+          b == other.b
     end
 
     # @see the `==` method
@@ -190,7 +138,7 @@ module AsposeCadCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [r, g, b, a, is_known_color, is_empty, is_named_color, name].hash
+      [text, r, g, b].hash
     end
 
     # Builds the object from hash

data/lib/aspose_cad_cloud/version.rb

@@ -25,5 +25,5 @@
  # --------------------------------------------------------------------------------------------------------------------
  #
 module AsposeCadCloud
-  VERSION = "24.5".freeze
+  VERSION = "24.5.1".freeze
 end

data/lib/aspose_cad_cloud.rb

@@ -34,7 +34,7 @@ require_relative 'aspose_cad_cloud/models/bitmap_compression'
 require_relative 'aspose_cad_cloud/models/cad_draw_type_mode'
 require_relative 'aspose_cad_cloud/models/cad_response'
 require_relative 'aspose_cad_cloud/models/cf2_properties'
-require_relative 'aspose_cad_cloud/models/color'
+require_relative 'aspose_cad_cloud/models/color_dto'
 require_relative 'aspose_cad_cloud/models/color_modes'
 require_relative 'aspose_cad_cloud/models/compression_method'
 require_relative 'aspose_cad_cloud/models/dgn_properties'
@@ -43,8 +43,8 @@ require_relative 'aspose_cad_cloud/models/drawing_options_base_dto'
 require_relative 'aspose_cad_cloud/models/dwf_properties'
 require_relative 'aspose_cad_cloud/models/dwg_properties'
 require_relative 'aspose_cad_cloud/models/dxf_properties'
+require_relative 'aspose_cad_cloud/models/error'
 require_relative 'aspose_cad_cloud/models/error_details'
-require_relative 'aspose_cad_cloud/models/error_model'
 require_relative 'aspose_cad_cloud/models/fbx_properties'
 require_relative 'aspose_cad_cloud/models/file_versions'
 require_relative 'aspose_cad_cloud/models/files_list'
@@ -84,6 +84,7 @@ require_relative 'aspose_cad_cloud/models/tiff_expected_format'
 require_relative 'aspose_cad_cloud/models/tiff_photometrics'
 require_relative 'aspose_cad_cloud/models/unit_type'
 require_relative 'aspose_cad_cloud/models/vector_rasterization_options_dto'
+require_relative 'aspose_cad_cloud/models/watermark_rgb'
 require_relative 'aspose_cad_cloud/models/bmp_options_dto'
 require_relative 'aspose_cad_cloud/models/cad_rasterization_options_dto'
 require_relative 'aspose_cad_cloud/models/cgm_options_dto'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspose_cad_cloud
 version: !ruby/object:Gem::Version
-  version: '24.5'
+  version: 24.5.1
 platform: ruby
 authors:
 - Aspose
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -95,7 +95,7 @@ files:
 - lib/aspose_cad_cloud/models/cad_response.rb
 - lib/aspose_cad_cloud/models/cf2_properties.rb
 - lib/aspose_cad_cloud/models/cgm_options_dto.rb
-- lib/aspose_cad_cloud/models/color.rb
+- lib/aspose_cad_cloud/models/color_dto.rb
 - lib/aspose_cad_cloud/models/color_modes.rb
 - lib/aspose_cad_cloud/models/compression_method.rb
 - lib/aspose_cad_cloud/models/dgn_properties.rb
@@ -108,8 +108,8 @@ files:
 - lib/aspose_cad_cloud/models/dwg_properties.rb
 - lib/aspose_cad_cloud/models/dxf_options_dto.rb
 - lib/aspose_cad_cloud/models/dxf_properties.rb
+- lib/aspose_cad_cloud/models/error.rb
 - lib/aspose_cad_cloud/models/error_details.rb
-- lib/aspose_cad_cloud/models/error_model.rb
 - lib/aspose_cad_cloud/models/fbx_options_dto.rb
 - lib/aspose_cad_cloud/models/fbx_properties.rb
 - lib/aspose_cad_cloud/models/file_version.rb
@@ -241,6 +241,7 @@ files:
 - lib/aspose_cad_cloud/models/u3d_options_dto.rb
 - lib/aspose_cad_cloud/models/unit_type.rb
 - lib/aspose_cad_cloud/models/vector_rasterization_options_dto.rb
+- lib/aspose_cad_cloud/models/watermark_rgb.rb
 - lib/aspose_cad_cloud/models/webp_options_dto.rb
 - lib/aspose_cad_cloud/models/wmf_options_dto.rb
 - lib/aspose_cad_cloud/version.rb