dyspatch_client 3.0.1 → 4.0.0

data/lib/dyspatch_client/api/localizations_api.rb

@@ -1,16 +1,16 @@
 =begin
 #Dyspatch API
 
-## Introduction  The Dyspatch API is based on the REST paradigm and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries  Dyspatch provides API Clients for the following languages and web frameworks:  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby) 
+## Introduction  The Dyspatch API is based on the REST paradigm, and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs, and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries Dyspatch provides API Clients for popular languages and web frameworks.  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby)  
 
-OpenAPI spec version: 2019.10
+The version of the OpenAPI document: 2019.10
 Contact: support@dyspatch.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.10
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.2.3-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module DyspatchClient
   class LocalizationsApi
@@ -20,65 +20,82 @@ module DyspatchClient
       @api_client = api_client
     end
     # Get Localization Object by ID
-    # Returns a specific localization object with a matching ID.
-    # @param localization_id A localization ID
-    # @param target_language The type of templating language to compile as. Should only be used for visual templates.
+    # Returns a specific localization object with a matching ID
+    # @param localization_id [String] A localization ID
+    # @param target_language [String] The type of templating language to compile as. Should only be used for visual templates.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \"2019.10\", set the value to \"application/vnd.dyspatch.2019.10+json\"
     # @param [Hash] opts the optional parameters
     # @return [LocalizationRead]
-    def localizations_localization_id_get(localization_id, target_language, opts = {})
-      data, _status_code, _headers = localizations_localization_id_get_with_http_info(localization_id, target_language, opts)
+    def get_localization_by_id(localization_id, target_language, accept, opts = {})
+      data, _status_code, _headers = get_localization_by_id_with_http_info(localization_id, target_language, accept, opts)
       data
     end
 
     # Get Localization Object by ID
-    # Returns a specific localization object with a matching ID.
-    # @param localization_id A localization ID
-    # @param target_language The type of templating language to compile as. Should only be used for visual templates.
+    # Returns a specific localization object with a matching ID
+    # @param localization_id [String] A localization ID
+    # @param target_language [String] The type of templating language to compile as. Should only be used for visual templates.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \"2019.10\", set the value to \"application/vnd.dyspatch.2019.10+json\"
     # @param [Hash] opts the optional parameters
-    # @return [Array<(LocalizationRead, Fixnum, Hash)>] LocalizationRead data, response status code and response headers
-    def localizations_localization_id_get_with_http_info(localization_id, target_language, opts = {})
+    # @return [Array<(LocalizationRead, Integer, Hash)>] LocalizationRead data, response status code and response headers
+    def get_localization_by_id_with_http_info(localization_id, target_language, accept, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LocalizationsApi.localizations_localization_id_get ...'
+        @api_client.config.logger.debug 'Calling API: LocalizationsApi.get_localization_by_id ...'
       end
       # verify the required parameter 'localization_id' is set
       if @api_client.config.client_side_validation && localization_id.nil?
-        fail ArgumentError, "Missing the required parameter 'localization_id' when calling LocalizationsApi.localizations_localization_id_get"
+        fail ArgumentError, "Missing the required parameter 'localization_id' when calling LocalizationsApi.get_localization_by_id"
       end
       # verify the required parameter 'target_language' is set
       if @api_client.config.client_side_validation && target_language.nil?
-        fail ArgumentError, "Missing the required parameter 'target_language' when calling LocalizationsApi.localizations_localization_id_get"
+        fail ArgumentError, "Missing the required parameter 'target_language' when calling LocalizationsApi.get_localization_by_id"
       end
       # verify enum value
-      if @api_client.config.client_side_validation && !['html', 'jinja', 'handlebars', 'ampscript', 'freemarker', 'cheetah'].include?(target_language)
-        fail ArgumentError, "invalid value for 'target_language', must be one of html, jinja, handlebars, ampscript, freemarker, cheetah"
+      allowable_values = ["html", "handlebars", "ampscript", "freemarker", "cheetah"]
+      if @api_client.config.client_side_validation && !allowable_values.include?(target_language)
+        fail ArgumentError, "invalid value for \"target_language\", must be one of #{allowable_values}"
+      end
+      # verify the required parameter 'accept' is set
+      if @api_client.config.client_side_validation && accept.nil?
+        fail ArgumentError, "Missing the required parameter 'accept' when calling LocalizationsApi.get_localization_by_id"
       end
       # resource path
-      local_var_path = '/localizations/{localizationId}'.sub('{' + 'localizationId' + '}', localization_id.to_s)
+      local_var_path = '/localizations/{localizationId}'.sub('{' + 'localizationId' + '}', CGI.escape(localization_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'targetLanguage'] = target_language
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json', '*/*'])
+      header_params[:'Accept'] = accept
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['Bearer']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'LocalizationRead' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['Bearer']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'LocalizationRead')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LocalizationsApi#localizations_localization_id_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: LocalizationsApi#get_localization_by_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end

data/lib/dyspatch_client/api/templates_api.rb

@@ -1,16 +1,16 @@
 =begin
 #Dyspatch API
 
-## Introduction  The Dyspatch API is based on the REST paradigm and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries  Dyspatch provides API Clients for the following languages and web frameworks:  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby) 
+## Introduction  The Dyspatch API is based on the REST paradigm, and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs, and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries Dyspatch provides API Clients for popular languages and web frameworks.  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby)  
 
-OpenAPI spec version: 2019.10
+The version of the OpenAPI document: 2019.10
 Contact: support@dyspatch.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.10
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.2.3-SNAPSHOT
 
 =end
 
-require 'uri'
+require 'cgi'
 
 module DyspatchClient
   class TemplatesApi
@@ -19,115 +19,149 @@ module DyspatchClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # List Templates
-    # Gets a list of Template Metadata objects for all templates. Up to 25 results returned before results are paginated.
+    # Get Template by ID
+    # Gets a template object with the matching ID. If the template has published content the \"compiled\" field will contain the template .
+    # @param template_id [String] A template ID
+    # @param target_language [String] The type of templating language to compile as. Should only be used for visual templates.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \"2019.10\", set the value to \"application/vnd.dyspatch.2019.10+json\"
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :cursor A cursor value used to retrieve a specific page from a paginated result set.
-    # @return [TemplatesRead]
-    def templates_get(opts = {})
-      data, _status_code, _headers = templates_get_with_http_info(opts)
+    # @return [TemplateRead]
+    def get_template_by_id(template_id, target_language, accept, opts = {})
+      data, _status_code, _headers = get_template_by_id_with_http_info(template_id, target_language, accept, opts)
       data
     end
 
-    # List Templates
-    # Gets a list of Template Metadata objects for all templates. Up to 25 results returned before results are paginated.
+    # Get Template by ID
+    # Gets a template object with the matching ID. If the template has published content the \"compiled\" field will contain the template .
+    # @param template_id [String] A template ID
+    # @param target_language [String] The type of templating language to compile as. Should only be used for visual templates.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \"2019.10\", set the value to \"application/vnd.dyspatch.2019.10+json\"
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :cursor A cursor value used to retrieve a specific page from a paginated result set.
-    # @return [Array<(TemplatesRead, Fixnum, Hash)>] TemplatesRead data, response status code and response headers
-    def templates_get_with_http_info(opts = {})
+    # @return [Array<(TemplateRead, Integer, Hash)>] TemplateRead data, response status code and response headers
+    def get_template_by_id_with_http_info(template_id, target_language, accept, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: TemplatesApi.templates_get ...'
+        @api_client.config.logger.debug 'Calling API: TemplatesApi.get_template_by_id ...'
+      end
+      # verify the required parameter 'template_id' is set
+      if @api_client.config.client_side_validation && template_id.nil?
+        fail ArgumentError, "Missing the required parameter 'template_id' when calling TemplatesApi.get_template_by_id"
+      end
+      # verify the required parameter 'target_language' is set
+      if @api_client.config.client_side_validation && target_language.nil?
+        fail ArgumentError, "Missing the required parameter 'target_language' when calling TemplatesApi.get_template_by_id"
+      end
+      # verify enum value
+      allowable_values = ["html", "handlebars", "ampscript", "freemarker", "cheetah"]
+      if @api_client.config.client_side_validation && !allowable_values.include?(target_language)
+        fail ArgumentError, "invalid value for \"target_language\", must be one of #{allowable_values}"
+      end
+      # verify the required parameter 'accept' is set
+      if @api_client.config.client_side_validation && accept.nil?
+        fail ArgumentError, "Missing the required parameter 'accept' when calling TemplatesApi.get_template_by_id"
       end
       # resource path
-      local_var_path = '/templates'
+      local_var_path = '/templates/{templateId}'.sub('{' + 'templateId' + '}', CGI.escape(template_id.to_s))
 
       # query parameters
-      query_params = {}
-      query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
+      query_params = opts[:query_params] || {}
+      query_params[:'targetLanguage'] = target_language
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json', '*/*'])
+      header_params[:'Accept'] = accept
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['Bearer']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'TemplateRead' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['Bearer']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'TemplatesRead')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: TemplatesApi#templates_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: TemplatesApi#get_template_by_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
-    # Get Template by ID
-    # Gets a template object with the matching ID. If the template has published content the "compiled" field will contain the template .
-    # @param template_id A template ID
-    # @param target_language The type of templating language to compile as. Should only be used for visual templates.
+
+    # List Templates
+    # Gets a list of Template Metadata objects for all templates. Up to 25 results returned before results are paginated.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \&quot;2019.10\&quot;, set the value to \&quot;application/vnd.dyspatch.2019.10+json\&quot;
     # @param [Hash] opts the optional parameters
-    # @return [TemplateRead]
-    def templates_template_id_get(template_id, target_language, opts = {})
-      data, _status_code, _headers = templates_template_id_get_with_http_info(template_id, target_language, opts)
+    # @option opts [String] :cursor A cursor value used to retrieve a specific page from a paginated result set.
+    # @return [TemplatesRead]
+    def get_templates(accept, opts = {})
+      data, _status_code, _headers = get_templates_with_http_info(accept, opts)
       data
     end
 
-    # Get Template by ID
-    # Gets a template object with the matching ID. If the template has published content the "compiled" field will contain the template .
-    # @param template_id A template ID
-    # @param target_language The type of templating language to compile as. Should only be used for visual templates.
+    # List Templates
+    # Gets a list of Template Metadata objects for all templates. Up to 25 results returned before results are paginated.
+    # @param accept [String] A version of the API that should be used for the request. For example, to use version \&quot;2019.10\&quot;, set the value to \&quot;application/vnd.dyspatch.2019.10+json\&quot;
     # @param [Hash] opts the optional parameters
-    # @return [Array<(TemplateRead, Fixnum, Hash)>] TemplateRead data, response status code and response headers
-    def templates_template_id_get_with_http_info(template_id, target_language, opts = {})
+    # @option opts [String] :cursor A cursor value used to retrieve a specific page from a paginated result set.
+    # @return [Array<(TemplatesRead, Integer, Hash)>] TemplatesRead data, response status code and response headers
+    def get_templates_with_http_info(accept, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: TemplatesApi.templates_template_id_get ...'
+        @api_client.config.logger.debug 'Calling API: TemplatesApi.get_templates ...'
       end
-      # verify the required parameter 'template_id' is set
-      if @api_client.config.client_side_validation && template_id.nil?
-        fail ArgumentError, "Missing the required parameter 'template_id' when calling TemplatesApi.templates_template_id_get"
-      end
-      # verify the required parameter 'target_language' is set
-      if @api_client.config.client_side_validation && target_language.nil?
-        fail ArgumentError, "Missing the required parameter 'target_language' when calling TemplatesApi.templates_template_id_get"
-      end
-      # verify enum value
-      if @api_client.config.client_side_validation && !['html', 'jinja', 'handlebars', 'ampscript', 'freemarker', 'cheetah'].include?(target_language)
-        fail ArgumentError, "invalid value for 'target_language', must be one of html, jinja, handlebars, ampscript, freemarker, cheetah"
+      # verify the required parameter 'accept' is set
+      if @api_client.config.client_side_validation && accept.nil?
+        fail ArgumentError, "Missing the required parameter 'accept' when calling TemplatesApi.get_templates"
       end
       # resource path
-      local_var_path = '/templates/{templateId}'.sub('{' + 'templateId' + '}', template_id.to_s)
+      local_var_path = '/templates'
 
       # query parameters
-      query_params = {}
-      query_params[:'targetLanguage'] = target_language
+      query_params = opts[:query_params] || {}
+      query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/vnd.dyspatch.2019.10+json', '*/*'])
+      header_params[:'Accept'] = accept
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['Bearer']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'TemplatesRead' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['Bearer']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'TemplateRead')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: TemplatesApi#templates_template_id_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: TemplatesApi#get_templates\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end

data/lib/dyspatch_client/api_client.rb

@@ -1,12 +1,12 @@
 =begin
 #Dyspatch API
 
-## Introduction  The Dyspatch API is based on the REST paradigm and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries  Dyspatch provides API Clients for the following languages and web frameworks:  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby) 
+## Introduction  The Dyspatch API is based on the REST paradigm, and features resource based URLs with standard HTTP response codes to indicate errors. We use standard HTTP authentication and request verbs, and all responses are JSON formatted. See our [Implementation Guide](https://docs.dyspatch.io/development/implementing_dyspatch/) for more details on how to implement Dyspatch.  ## API Client Libraries Dyspatch provides API Clients for popular languages and web frameworks.  - [Java](https://github.com/getdyspatch/dyspatch-java) - [Javascript](https://github.com/getdyspatch/dyspatch-javascript) - [Python](https://github.com/getdyspatch/dyspatch-python) - [C#](https://github.com/getdyspatch/dyspatch-dotnet) - [Go](https://github.com/getdyspatch/dyspatch-golang) - [Ruby](https://github.com/getdyspatch/dyspatch-ruby)  
 
-OpenAPI spec version: 2019.10
+The version of the OpenAPI document: 2019.10
 Contact: support@dyspatch.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.10
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.2.3-SNAPSHOT
 
 =end
 
@@ -15,7 +15,6 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
 
 module DyspatchClient
   class ApiClient
@@ -31,7 +30,7 @@ module DyspatchClient
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config = Configuration.default)
       @config = config
-      @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
+      @user_agent = "OpenAPI-Generator/#{VERSION}/ruby"
       @default_headers = {
         'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
@@ -44,7 +43,7 @@ module DyspatchClient
 
     # Call an API with given options.
     #
-    # @return [Array<(Object, Fixnum, Hash)>] an array of 3 elements:
+    # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
@@ -128,6 +127,34 @@ module DyspatchClient
       request
     end
 
+    # Builds the HTTP request body
+    #
+    # @param [Hash] header_params Header parameters
+    # @param [Hash] form_params Query parameters
+    # @param [Object] body HTTP body (JSON/XML)
+    # @return [String] HTTP body data in the form of string
+    def build_request_body(header_params, form_params, body)
+      # http form
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+          header_params['Content-Type'] == 'multipart/form-data'
+        data = {}
+        form_params.each do |key, value|
+          case value
+          when ::File, ::Array, nil
+            # let typhoeus handle File, Array and nil parameters
+            data[key] = value
+          else
+            data[key] = value.to_s
+          end
+        end
+      elsif body
+        data = body.is_a?(String) ? body : body.to_json
+      else
+        data = nil
+      end
+      data
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -143,7 +170,7 @@ module DyspatchClient
     # Deserialize the response to the given return type.
     #
     # @param [Response] response HTTP response
-    # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
+    # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
     def deserialize(response, return_type)
       body = response.body
 
@@ -187,7 +214,7 @@ module DyspatchClient
         data.to_i
       when 'Float'
         data.to_f
-      when 'BOOLEAN'
+      when 'Boolean'
         data == true
       when 'DateTime'
         # parse date time (expecting ISO 8601 format)
@@ -210,9 +237,7 @@ module DyspatchClient
         end
       else
         # models, e.g. Pet
-        DyspatchClient.const_get(return_type).new.tap do |model|
-          model.build_from_hash data
-        end
+        DyspatchClient.const_get(return_type).build_from_hash(data)
       end
     end
 
@@ -244,7 +269,7 @@ module DyspatchClient
         tempfile.write(chunk)
       end
       request.on_complete do |response|
-        tempfile.close
+        tempfile.close if tempfile
         @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 "\
@@ -264,35 +289,7 @@ module DyspatchClient
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
-
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @return [String] HTTP body data in the form of string
-    def build_request_body(header_params, form_params, body)
-      # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
-      end
-      data
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.
@@ -314,7 +311,7 @@ module DyspatchClient
 
     # Sets user agent in HTTP header
     #
-    # @param [String] user_agent User agent (e.g. swagger-codegen/ruby/1.0.0)
+    # @param [String] user_agent User agent (e.g. openapi-generator/ruby/1.0.0)
     def user_agent=(user_agent)
       @user_agent = user_agent
       @default_headers['User-Agent'] = @user_agent