esi_client 0.8.5.0 → 1.0.1

data/lib/esi_client/api/wars_api.rb

@@ -3,14 +3,13 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
-require 'uri'
+require "uri"
 
 module ESIClient
   class WarsApi
@@ -19,47 +18,49 @@ module ESIClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
+
     # List wars
     # Return a list of wars  ---  This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :max_war_id Only return wars with ID smaller than this.
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_wars(opts = {})
       data, _status_code, _headers = get_wars_with_http_info(opts)
-      data
+      return data
     end
 
     # List wars
     # Return a list of wars  ---  This route is cached for up to 3600 seconds
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :max_war_id Only return wars with ID smaller than this.
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
     def get_wars_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: WarsApi.get_wars ...'
+        @api_client.config.logger.debug "Calling API: WarsApi.get_wars ..."
       end
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/wars/'
+      local_var_path = "/v1/wars/".sub('{format}','json')
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'max_war_id'] = opts[:'max_war_id'] if !opts[:'max_war_id'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # 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(['application/json'])
-      header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -79,16 +80,18 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # Get war information
     # Return details about a war  ---  This route is cached for up to 3600 seconds
     # @param war_id ID for a war
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetWarsWarIdOk]
     def get_wars_war_id(war_id, opts = {})
       data, _status_code, _headers = get_wars_war_id_with_http_info(war_id, opts)
-      data
+      return data
     end
 
     # Get war information
@@ -96,37 +99,31 @@ module ESIClient
     # @param war_id ID for a war
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetWarsWarIdOk, Fixnum, Hash)>] GetWarsWarIdOk data, response status code and response headers
     def get_wars_war_id_with_http_info(war_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: WarsApi.get_wars_war_id ...'
+        @api_client.config.logger.debug "Calling API: WarsApi.get_wars_war_id ..."
       end
       # verify the required parameter 'war_id' is set
-      if @api_client.config.client_side_validation && war_id.nil?
-        fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id"
-      end
-      if @api_client.config.client_side_validation && war_id < 1
-        fail ArgumentError, 'invalid value for "war_id" when calling WarsApi.get_wars_war_id, must be greater than or equal to 1.'
-      end
-
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id" if war_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = '/v1/wars/{war_id}/'.sub('{' + 'war_id' + '}', war_id.to_s)
+      local_var_path = "/v1/wars/{war_id}/".sub('{format}','json').sub('{' + 'war_id' + '}', war_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # 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(['application/json'])
-      header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}
@@ -146,17 +143,19 @@ module ESIClient
       end
       return data, status_code, headers
     end
+
     # List kills for a war
     # Return a list of kills related to a war  ---  This route is cached for up to 3600 seconds
     # @param war_id A valid war ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [Integer] :page Which page of results to return (default to 1)
+    # @option opts [Integer] :page Which page to query, starting at 1, 2000 killmails per page. (default to 1)
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetWarsWarIdKillmails200Ok>]
     def get_wars_war_id_killmails(war_id, opts = {})
       data, _status_code, _headers = get_wars_war_id_killmails_with_http_info(war_id, opts)
-      data
+      return data
     end
 
     # List kills for a war
@@ -164,43 +163,33 @@ module ESIClient
     # @param war_id A valid war ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
-    # @option opts [Integer] :page Which page of results to return
+    # @option opts [Integer] :page Which page to query, starting at 1, 2000 killmails per page.
+    # @option opts [String] :user_agent Client identifier, takes precedence over headers
+    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetWarsWarIdKillmails200Ok>, Fixnum, Hash)>] Array<GetWarsWarIdKillmails200Ok> data, response status code and response headers
     def get_wars_war_id_killmails_with_http_info(war_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: WarsApi.get_wars_war_id_killmails ...'
+        @api_client.config.logger.debug "Calling API: WarsApi.get_wars_war_id_killmails ..."
       end
       # verify the required parameter 'war_id' is set
-      if @api_client.config.client_side_validation && war_id.nil?
-        fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id_killmails"
-      end
-      if @api_client.config.client_side_validation && war_id < 1
-        fail ArgumentError, 'invalid value for "war_id" when calling WarsApi.get_wars_war_id_killmails, must be greater than or equal to 1.'
-      end
-
-      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+      fail ArgumentError, "Missing the required parameter 'war_id' when calling WarsApi.get_wars_war_id_killmails" if war_id.nil?
+      if opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
-      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
-        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling WarsApi.get_wars_war_id_killmails, must be greater than or equal to 1.'
-      end
-
       # resource path
-      local_var_path = '/v1/wars/{war_id}/killmails/'.sub('{' + 'war_id' + '}', war_id.to_s)
+      local_var_path = "/v1/wars/{war_id}/killmails/".sub('{format}','json').sub('{' + 'war_id' + '}', war_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
+      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # 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(['application/json'])
-      header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
+      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
 
       # form parameters
       form_params = {}

data/lib/esi_client/api_client.rb

@@ -3,10 +3,9 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -33,7 +32,7 @@ module ESIClient
       @config = config
       @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
       @default_headers = {
-        'Content-Type' => 'application/json',
+        'Content-Type' => "application/json",
         'User-Agent' => @user_agent
       }
     end
@@ -123,9 +122,7 @@ module ESIClient
         end
       end
 
-      request = Typhoeus::Request.new(url, req_opts)
-      download_file(request) if opts[:return_type] == 'File'
-      request
+      Typhoeus::Request.new(url, req_opts)
     end
 
     # Check if the given MIME is a JSON MIME.
@@ -137,7 +134,7 @@ module ESIClient
     # @param [String] mime MIME
     # @return [Boolean] True if the MIME is application/json
     def json_mime?(mime)
-      (mime == '*/*') || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
+       (mime == "*/*") || !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
     end
 
     # Deserialize the response to the given return type.
@@ -146,16 +143,14 @@ module ESIClient
     # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
     def deserialize(response, return_type)
       body = response.body
-
-      # handle file downloading - return the File instance processed in request callbacks
-      # note that response body is empty when the file is written in chunks in request on_body callback
-      return @tempfile if return_type == 'File'
-
       return nil if body.nil? || body.empty?
 
       # return response body directly for String return type
       return body if return_type == 'String'
 
+      # handle file downloading - save response body into a tmp file and return the File instance
+      return download_file(response) if return_type == 'File'
+
       # ensuring a default content type
       content_type = response.headers['Content-Type'] || 'application/json'
 
@@ -201,12 +196,12 @@ module ESIClient
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
         sub_type = $1
-        data.map { |item| convert_to_type(item, sub_type) }
+        data.map {|item| convert_to_type(item, sub_type) }
       when /\AHash\<String, (.+)\>\z/
         # e.g. Hash<String, Integer>
         sub_type = $1
         {}.tap do |hash|
-          data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
+          data.each {|k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
         # models, e.g. Pet
@@ -218,38 +213,30 @@ module ESIClient
 
     # 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)
+    # @return [Tempfile] the file downloaded
+    def download_file(response)
+      content_disposition = response.headers['Content-Disposition']
+      if content_disposition and content_disposition =~ /filename=/i
+        filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+        prefix = sanitize_filename(filename)
+      else
+        prefix = 'download-'
       end
-      request.on_complete do |response|
-        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`"
+      prefix = prefix + '-' unless prefix.end_with?('-')
+
+      tempfile = nil
+      encoding = response.body.encoding
+      Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding) do |file|
+        file.write(response.body)
+        tempfile = file
       end
+      @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                          "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                          "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                          "explicitly with `tempfile.delete`"
+      tempfile
     end
 
     # Sanitize filename by removing path.
@@ -280,7 +267,7 @@ module ESIClient
         data = {}
         form_params.each do |key, value|
           case value
-          when ::File, ::Array, nil
+          when File, Array, nil
             # let typhoeus handle File, Array and nil parameters
             data[key] = value
           else
@@ -327,7 +314,7 @@ module ESIClient
       return nil if accepts.nil? || accepts.empty?
       # use JSON when present, otherwise use all of the provided
       json_accept = accepts.find { |s| json_mime?(s) }
-      json_accept || accepts.join(',')
+      return json_accept || accepts.join(',')
     end
 
     # Return Content-Type header based on an array of content types provided.
@@ -338,7 +325,7 @@ module ESIClient
       return 'application/json' 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
+      return json_content_type || content_types.first
     end
 
     # Convert object (array, hash, object, etc) to JSON string.
@@ -348,7 +335,7 @@ module ESIClient
       return model if model.nil? || model.is_a?(String)
       local_body = nil
       if model.is_a?(Array)
-        local_body = model.map { |m| object_to_hash(m) }
+        local_body = model.map{|m| object_to_hash(m) }
       else
         local_body = object_to_hash(model)
       end

data/lib/esi_client/api_error.rb

@@ -3,10 +3,9 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 

data/lib/esi_client/configuration.rb

@@ -3,10 +3,9 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.8.5
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -76,11 +75,6 @@ module ESIClient
     # Default to 0 (never times out).
     attr_accessor :timeout
 
-    # Set this to false to skip client side validation in the operation.
-    # Default to true.
-    # @return [true, false]
-    attr_accessor :client_side_validation
-
     ### TLS/SSL setting
     # Set this to false to skip verifying SSL certificate when calling API from https server.
     # Default to true.
@@ -129,12 +123,11 @@ module ESIClient
 
     def initialize
       @scheme = 'https'
-      @host = 'esi.evetech.net'
-      @base_path = ''
+      @host = 'esi.tech.ccp.is'
+      @base_path = '/'
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0
-      @client_side_validation = true
       @verify_ssl = true
       @verify_ssl_host = true
       @params_encoding = nil
@@ -170,7 +163,7 @@ module ESIClient
     def base_path=(base_path)
       # Add leading and trailing slashes to base_path
       @base_path = "/#{base_path}".gsub(/\/+/, '/')
-      @base_path = '' if @base_path == '/'
+      @base_path = "" if @base_path == "/"
     end
 
     def base_url

data/lib/esi_client/models/delete_characters_character_id_contacts_forbidden.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.5.0
+OpenAPI spec version: 0.4.7
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git