hubspot-api-client 15.0.2 → 16.0.1

data/lib/hubspot/codegen/cms/blogs/tags/api_client.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
@@ -14,6 +14,7 @@ require 'date'
 require 'json'
 require 'logger'
 require 'tempfile'
+require 'time'
 require 'typhoeus'
 
 module Hubspot
@@ -103,12 +104,13 @@ module Hubspot
           # @option opts [Object] :body HTTP body (JSON/XML)
           # @return [Typhoeus::Request] A Typhoeus Request
           def build_request(http_method, path, opts = {})
-            url = build_request_url(path)
+            url = build_request_url(path, opts)
             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] || {}
+            follow_location = opts[:follow_location] || true
 
             update_params_for_auth! header_params, query_params, opts[:auth_names]
 
@@ -125,7 +127,8 @@ module Hubspot
               :ssl_verifyhost => _verify_ssl_host,
               :sslcert => @config.cert_file,
               :sslkey => @config.key_file,
-              :verbose => @config.debugging
+              :verbose => @config.debugging,
+              :followlocation => follow_location
             }
 
             # set custom cert, if provided
@@ -172,6 +175,44 @@ module Hubspot
             data
           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(request)
+            tempfile = nil
+            encoding = nil
+            request.on_headers do |response|
+              content_disposition = response.headers['Content-Disposition']
+              if content_disposition && content_disposition =~ /filename=/i
+                filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+                prefix = sanitize_filename(filename)
+              else
+                prefix = 'download-'
+              end
+              prefix = prefix + '-' unless prefix.end_with?('-')
+              encoding = response.body.encoding
+              tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
+              @tempfile = tempfile
+            end
+            request.on_body do |chunk|
+              chunk.force_encoding(encoding)
+              tempfile.write(chunk)
+            end
+            request.on_complete do |response|
+              if tempfile
+                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
+          end
+
           # Check if the given MIME is a JSON MIME.
           # JSON MIME examples:
           #   application/json
@@ -208,7 +249,7 @@ module Hubspot
             begin
               data = JSON.parse("[#{body}]", :symbolize_names => true)[0]
             rescue JSON::ParserError => e
-              if %w(String Date DateTime).include?(return_type)
+              if %w(String Date Time).include?(return_type)
                 data = body
               else
                 raise e
@@ -233,9 +274,9 @@ module Hubspot
               data.to_f
             when 'Boolean'
               data == true
-            when 'DateTime'
+            when 'Time'
               # parse date time (expecting ISO 8601 format)
-              DateTime.parse data
+              Time.parse data
             when 'Date'
               # parse date time (expecting ISO 8601 format)
               Date.parse data
@@ -253,46 +294,9 @@ module Hubspot
                 data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
               end
             else
-              # models, e.g. Pet
-              Hubspot::Cms::Blogs::Tags.const_get(return_type).build_from_hash(data)
-            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(request)
-            tempfile = nil
-            encoding = nil
-            request.on_headers do |response|
-              content_disposition = response.headers['Content-Disposition']
-              if content_disposition && content_disposition =~ /filename=/i
-                filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-                prefix = sanitize_filename(filename)
-              else
-                prefix = 'download-'
-              end
-              prefix = prefix + '-' unless prefix.end_with?('-')
-              encoding = response.body.encoding
-              tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-              @tempfile = tempfile
-            end
-            request.on_body do |chunk|
-              chunk.force_encoding(encoding)
-              tempfile.write(chunk)
-            end
-            request.on_complete do |response|
-              if tempfile
-                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
+              # models (e.g. Pet) or oneOf
+              klass = Hubspot::Cms::Blogs::Tags.const_get(return_type)
+              klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
             end
           end
 
@@ -305,13 +309,13 @@ module Hubspot
             filename.gsub(/.*[\/\\]/, '')
           end
 
-          def build_request_url(path)
+          def build_request_url(path, opts = {})
             # Add leading and trailing slashes to path
             path = "/#{path}".gsub(/\/+/, '/')
-            @config.base_url + path
+            @config.base_url(opts[:operation]) + path
           end
 
-          # Update hearder and query params based on authentication settings.
+          # Update header and query params based on authentication settings.
           #
           # @param [Hash] header_params Header parameters
           # @param [Hash] query_params Query parameters
@@ -323,7 +327,7 @@ module Hubspot
               case auth_setting[:in]
               when 'header' then header_params[auth_setting[:key]] = auth_setting[:value]
               when 'query'  then query_params[auth_setting[:key]] = auth_setting[:value]
-              else fail ArgumentError, 'Authentication token must be in `query` of `header`'
+              else fail ArgumentError, 'Authentication token must be in `query` or `header`'
               end
             end
           end
@@ -350,8 +354,8 @@ module Hubspot
           # @param [Array] content_types array for Content-Type
           # @return [String] the Content-Type header  (e.g. application/json)
           def select_header_content_type(content_types)
-            # use application/json by default
-            return 'application/json' if content_types.nil? || content_types.empty?
+            # return nil by default
+            return if content_types.nil? || content_types.empty?
             # use JSON when present, otherwise use the first one
             json_content_type = content_types.find { |s| json_mime?(s) }
             json_content_type || content_types.first

data/lib/hubspot/codegen/cms/blogs/tags/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 

data/lib/hubspot/codegen/cms/blogs/tags/configuration.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
@@ -24,6 +24,18 @@ module Hubspot
           # Defines url base path
           attr_accessor :base_path
 
+          # Define server configuration index
+          attr_accessor :server_index
+
+          # Define server operation configuration index
+          attr_accessor :server_operation_index
+
+          # Default server variables
+          attr_accessor :server_variables
+
+          # Default server operation variables
+          attr_accessor :server_operation_variables
+
           # Defines API keys used with API Key authentications.
           #
           # @return [Hash] key: parameter name, value: parameter value (API key)
@@ -124,6 +136,7 @@ module Hubspot
           # https://github.com/typhoeus/ethon/blob/master/lib/ethon/easy/queryable.rb#L96
           attr_accessor :params_encoding
 
+
           attr_accessor :inject_format
 
           attr_accessor :force_ending_format
@@ -134,15 +147,19 @@ module Hubspot
             @scheme = 'https'
             @host = 'api.hubapi.com'
             @base_path = ''
+            @server_index = 0
+            @server_operation_index = {}
+            @server_variables = {}
+            @server_operation_variables = {}
             @api_key = {}
             @api_key_prefix = {}
-            @timeout = 0
             @client_side_validation = true
             @verify_ssl = true
             @verify_ssl_host = true
-            @params_encoding = nil
             @cert_file = nil
             @key_file = nil
+            @timeout = 0
+            @params_encoding = nil
             @debugging = false
             @inject_format = false
             @force_ending_format = false
@@ -178,17 +195,23 @@ module Hubspot
             @base_path = '' if @base_path == '/'
           end
 
-          def base_url
-            "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
+          # Returns base URL for specified operation based on server settings
+          def base_url(operation = nil)
+            index = server_operation_index.fetch(operation, server_index)
+            return "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') if index == nil
+
+            server_url(index, server_operation_variables.fetch(operation, server_variables), operation_server_settings[operation])
           end
 
           # Gets API key (with prefix if set).
           # @param [String] param_name the parameter name of API key auth
-          def api_key_with_prefix(param_name)
+          def api_key_with_prefix(param_name, param_alias = nil)
+            key = @api_key[param_name]
+            key = @api_key.fetch(param_alias, key) unless param_alias.nil?
             if @api_key_prefix[param_name]
-              "#{@api_key_prefix[param_name]} #{@api_key[param_name]}"
+              "#{@api_key_prefix[param_name]} #{key}"
             else
-              @api_key[param_name]
+              key
             end
           end
 
@@ -221,18 +244,23 @@ module Hubspot
           def server_settings
             [
               {
-                url: "https://api.hubapi.com/",
+                url: "https://api.hubapi.com",
                 description: "No description provided",
               }
             ]
           end
 
+          def operation_server_settings
+            {
+            }
+          end
+
           # Returns URL based on server settings
           #
           # @param index array index of the server settings
           # @param variables hash of variable and the corresponding value
-          def server_url(index, variables = {})
-            servers = server_settings
+          def server_url(index, variables = {}, servers = nil)
+            servers = server_settings if servers == nil
 
             # check array index out of bound
             if (index < 0 || index >= servers.size)
@@ -242,10 +270,12 @@ module Hubspot
             server = servers[index]
             url = server[:url]
 
+            return url unless server.key? :variables
+
             # go through variable and assign a value
             server[:variables].each do |name, variable|
               if variables.key?(name)
-                if (server[:variables][name][:enum_values].include? variables[name])
+                if (!server[:variables][name].key?(:enum_values) || server[:variables][name][:enum_values].include?(variables[name]))
                   url.gsub! "{" + name.to_s + "}", variables[name]
                 else
                   fail ArgumentError, "The variable `#{name}` in the server URL has invalid value #{variables[name]}. Must be #{server[:variables][name][:enum_values]}."
@@ -258,6 +288,7 @@ module Hubspot
 
             url
           end
+
         end
       end
     end

data/lib/hubspot/codegen/cms/blogs/tags/models/attach_to_lang_primary_request_v_next.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Cms
@@ -61,6 +62,11 @@ module Hubspot
             }
           end
 
+          # Returns all the JSON keys this model knows about
+          def self.acceptable_attributes
+            attribute_map.values
+          end
+
           # Attribute type mapping.
           def self.openapi_types
             {
@@ -196,8 +202,11 @@ module Hubspot
           # @return [Object] Returns the model itself
           def build_from_hash(attributes)
             return nil unless attributes.is_a?(Hash)
+            attributes = attributes.transform_keys(&:to_sym)
             self.class.openapi_types.each_pair do |key, type|
-              if type =~ /\AArray<(.*)>/i
+              if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+                self.send("#{key}=", nil)
+              elsif type =~ /\AArray<(.*)>/i
                 # check to ensure the input is an array given that the attribute
                 # is documented as an array but the input is not
                 if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -205,7 +214,7 @@ module Hubspot
                 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
@@ -217,8 +226,8 @@ module Hubspot
           # @return [Object] Deserialized data
           def _deserialize(type, value)
             case type.to_sym
-            when :DateTime
-              DateTime.parse(value)
+            when :Time
+              Time.parse(value)
             when :Date
               Date.parse(value)
             when :String
@@ -248,7 +257,9 @@ module Hubspot
                 end
               end
             else # model
-              Hubspot::Cms::Blogs::Tags.const_get(type).build_from_hash(value)
+              # models (e.g. Pet) or oneOf
+              klass = Hubspot::Cms::Blogs::Tags.const_get(type)
+              klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
             end
           end
 
@@ -274,7 +285,7 @@ module Hubspot
                 is_nullable = self.class.openapi_nullable.include?(attr)
                 next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
               end
-              
+
               hash[param] = _to_hash(value)
             end
             hash
@@ -297,7 +308,9 @@ module Hubspot
               value
             end
           end
+
         end
+
       end
     end
   end

data/lib/hubspot/codegen/cms/blogs/tags/models/batch_input_json_node.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Cms
@@ -27,6 +28,11 @@ module Hubspot
             }
           end
 
+          # Returns all the JSON keys this model knows about
+          def self.acceptable_attributes
+            attribute_map.values
+          end
+
           # Attribute type mapping.
           def self.openapi_types
             {
@@ -112,8 +118,11 @@ module Hubspot
           # @return [Object] Returns the model itself
           def build_from_hash(attributes)
             return nil unless attributes.is_a?(Hash)
+            attributes = attributes.transform_keys(&:to_sym)
             self.class.openapi_types.each_pair do |key, type|
-              if type =~ /\AArray<(.*)>/i
+              if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+                self.send("#{key}=", nil)
+              elsif type =~ /\AArray<(.*)>/i
                 # check to ensure the input is an array given that the attribute
                 # is documented as an array but the input is not
                 if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -121,7 +130,7 @@ module Hubspot
                 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
@@ -133,8 +142,8 @@ module Hubspot
           # @return [Object] Deserialized data
           def _deserialize(type, value)
             case type.to_sym
-            when :DateTime
-              DateTime.parse(value)
+            when :Time
+              Time.parse(value)
             when :Date
               Date.parse(value)
             when :String
@@ -164,7 +173,9 @@ module Hubspot
                 end
               end
             else # model
-              Hubspot::Cms::Blogs::Tags.const_get(type).build_from_hash(value)
+              # models (e.g. Pet) or oneOf
+              klass = Hubspot::Cms::Blogs::Tags.const_get(type)
+              klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
             end
           end
 
@@ -190,7 +201,7 @@ module Hubspot
                 is_nullable = self.class.openapi_nullable.include?(attr)
                 next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
               end
-              
+
               hash[param] = _to_hash(value)
             end
             hash
@@ -213,7 +224,9 @@ module Hubspot
               value
             end
           end
+
         end
+
       end
     end
   end

data/lib/hubspot/codegen/cms/blogs/tags/models/batch_input_string.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Cms
@@ -27,6 +28,11 @@ module Hubspot
             }
           end
 
+          # Returns all the JSON keys this model knows about
+          def self.acceptable_attributes
+            attribute_map.values
+          end
+
           # Attribute type mapping.
           def self.openapi_types
             {
@@ -112,8 +118,11 @@ module Hubspot
           # @return [Object] Returns the model itself
           def build_from_hash(attributes)
             return nil unless attributes.is_a?(Hash)
+            attributes = attributes.transform_keys(&:to_sym)
             self.class.openapi_types.each_pair do |key, type|
-              if type =~ /\AArray<(.*)>/i
+              if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+                self.send("#{key}=", nil)
+              elsif type =~ /\AArray<(.*)>/i
                 # check to ensure the input is an array given that the attribute
                 # is documented as an array but the input is not
                 if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -121,7 +130,7 @@ module Hubspot
                 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
@@ -133,8 +142,8 @@ module Hubspot
           # @return [Object] Deserialized data
           def _deserialize(type, value)
             case type.to_sym
-            when :DateTime
-              DateTime.parse(value)
+            when :Time
+              Time.parse(value)
             when :Date
               Date.parse(value)
             when :String
@@ -164,7 +173,9 @@ module Hubspot
                 end
               end
             else # model
-              Hubspot::Cms::Blogs::Tags.const_get(type).build_from_hash(value)
+              # models (e.g. Pet) or oneOf
+              klass = Hubspot::Cms::Blogs::Tags.const_get(type)
+              klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
             end
           end
 
@@ -190,7 +201,7 @@ module Hubspot
                 is_nullable = self.class.openapi_nullable.include?(attr)
                 next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
               end
-              
+
               hash[param] = _to_hash(value)
             end
             hash
@@ -213,7 +224,9 @@ module Hubspot
               value
             end
           end
+
         end
+
       end
     end
   end

data/lib/hubspot/codegen/cms/blogs/tags/models/batch_input_tag.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Hubspot
   module Cms
@@ -27,6 +28,11 @@ module Hubspot
             }
           end
 
+          # Returns all the JSON keys this model knows about
+          def self.acceptable_attributes
+            attribute_map.values
+          end
+
           # Attribute type mapping.
           def self.openapi_types
             {
@@ -112,8 +118,11 @@ module Hubspot
           # @return [Object] Returns the model itself
           def build_from_hash(attributes)
             return nil unless attributes.is_a?(Hash)
+            attributes = attributes.transform_keys(&:to_sym)
             self.class.openapi_types.each_pair do |key, type|
-              if type =~ /\AArray<(.*)>/i
+              if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+                self.send("#{key}=", nil)
+              elsif type =~ /\AArray<(.*)>/i
                 # check to ensure the input is an array given that the attribute
                 # is documented as an array but the input is not
                 if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -121,7 +130,7 @@ module Hubspot
                 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
@@ -133,8 +142,8 @@ module Hubspot
           # @return [Object] Deserialized data
           def _deserialize(type, value)
             case type.to_sym
-            when :DateTime
-              DateTime.parse(value)
+            when :Time
+              Time.parse(value)
             when :Date
               Date.parse(value)
             when :String
@@ -164,7 +173,9 @@ module Hubspot
                 end
               end
             else # model
-              Hubspot::Cms::Blogs::Tags.const_get(type).build_from_hash(value)
+              # models (e.g. Pet) or oneOf
+              klass = Hubspot::Cms::Blogs::Tags.const_get(type)
+              klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
             end
           end
 
@@ -190,7 +201,7 @@ module Hubspot
                 is_nullable = self.class.openapi_nullable.include?(attr)
                 next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
               end
-              
+
               hash[param] = _to_hash(value)
             end
             hash
@@ -213,7 +224,9 @@ module Hubspot
               value
             end
           end
+
         end
+
       end
     end
   end