eve_online 0.29.0 → 0.34.0

data/lib/eve_online/esi/alliance.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module EveOnline
   module ESI
     class Alliance < Base
       extend Forwardable
 
-      API_PATH = '/v3/alliances/%<alliance_id>s/'
+      API_PATH = "/v3/alliances/%<alliance_id>s/"
 
       attr_reader :alliance_id
 
@@ -18,17 +18,17 @@ module EveOnline
       end
 
       def_delegators :model, :as_json, :creator_corporation_id, :creator_id,
-                     :date_founded, :executor_corporation_id, :faction_id,
-                     :name, :ticker
+        :date_founded, :executor_corporation_id, :faction_id, :name, :ticker
 
       def model
         @model ||= Models::Alliance.new(response)
       end
 
-      def scope; end
+      def scope
+      end
 
       def path
-        format("#{ API_PATH }", alliance_id: alliance_id)
+        format(API_PATH, alliance_id: alliance_id)
       end
     end
   end

data/lib/eve_online/esi/alliance_corporations.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class AllianceCorporations < Base
-      API_PATH = '/v1/alliances/%<alliance_id>s/corporations/'
+      API_PATH = "/v2/alliances/%<alliance_id>s/corporations/"
 
       attr_reader :alliance_id
 
@@ -17,10 +17,11 @@ module EveOnline
         response
       end
 
-      def scope; end
+      def scope
+      end
 
       def path
-        format("#{ API_PATH }", alliance_id: alliance_id)
+        format(API_PATH, alliance_id: alliance_id)
       end
     end
   end

data/lib/eve_online/esi/alliance_icon.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module EveOnline
   module ESI
     class AllianceIcon < Base
       extend Forwardable
 
-      API_PATH = '/v1/alliances/%<alliance_id>s/icons/'
+      API_PATH = "/v1/alliances/%<alliance_id>s/icons/"
 
       attr_reader :alliance_id
 
@@ -23,10 +23,11 @@ module EveOnline
         @model ||= Models::AllianceIcon.new(response)
       end
 
-      def scope; end
+      def scope
+      end
 
       def path
-        format("#{ API_PATH }", alliance_id: alliance_id)
+        format(API_PATH, alliance_id: alliance_id)
       end
     end
   end

data/lib/eve_online/esi/alliances.rb

@@ -3,13 +3,14 @@
 module EveOnline
   module ESI
     class Alliances < Base
-      API_PATH = '/v1/alliances/'
+      API_PATH = "/v2/alliances/"
 
       def alliance_ids
         response
       end
 
-      def scope; end
+      def scope
+      end
 
       def path
         API_PATH

data/lib/eve_online/esi/base.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'openssl'
-require 'json'
-require 'active_support/time'
+require "net/http"
+require "openssl"
+require "json"
+require "active_support/time"
 
 module EveOnline
   module ESI
     class Base
-      API_HOST = 'esi.evetech.net'
+      API_HOST = "esi.evetech.net"
 
       attr_reader :token, :parser, :_read_timeout, :_open_timeout, :_etag,
-                  :datasource, :language
+        :language
 
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
         attr_reader :_write_timeout
       end
 
@@ -22,12 +22,11 @@ module EveOnline
         @parser = options.fetch(:parser, JSON)
         @_read_timeout = options.fetch(:read_timeout, 60)
         @_open_timeout = options.fetch(:open_timeout, 60)
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
           @_write_timeout = options.fetch(:write_timeout, 60)
         end
         @_etag = options.fetch(:etag, nil)
-        @datasource = options.fetch(:datasource, 'tranquility')
-        @language = options.fetch(:language, 'en-us')
+        @language = options.fetch(:language, "en-us")
       end
 
       def url
@@ -39,11 +38,11 @@ module EveOnline
       end
 
       def user_agent
-        "EveOnline API (https://github.com/evemonk/eve_online) v#{ VERSION }"
+        "EveOnline API (https://github.com/evemonk/eve_online) v#{VERSION}"
       end
 
       def http_method
-        'Get'
+        "Get"
       end
 
       def read_timeout
@@ -62,7 +61,7 @@ module EveOnline
         client.open_timeout = value
       end
 
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
         def write_timeout
           client.write_timeout
         end
@@ -77,13 +76,22 @@ module EveOnline
       end
 
       def etag
-        resource.header['Etag']&.gsub('W/', '')&.gsub('"', '')
+        resource.header["Etag"]&.gsub("W/", "")&.gsub('"', "")
       end
 
-      def page; end
+      def page
+      end
 
       def total_pages
-        resource.header['X-Pages']&.to_i
+        resource.header["X-Pages"]&.to_i
+      end
+
+      def error_limit_remain
+        resource.header["X-ESI-Error-Limit-Remain"]&.to_i
+      end
+
+      def error_limit_reset
+        resource.header["X-ESI-Error-Limit-Reset"]&.to_i
       end
 
       def client
@@ -91,7 +99,7 @@ module EveOnline
           http = Net::HTTP.new(uri.host, uri.port)
           http.read_timeout = _read_timeout
           http.open_timeout = _open_timeout
-          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
             http.write_timeout = _write_timeout
           end
           http.use_ssl = true
@@ -103,35 +111,37 @@ module EveOnline
 
       def request
         @request ||= begin
-          request = "Net::HTTP::#{ http_method }".constantize.new(uri.request_uri)
+          request = "Net::HTTP::#{http_method}".constantize.new(uri.request_uri)
 
-          request['User-Agent'] = user_agent
-          request['Accept'] = 'application/json'
-          request['Authorization'] = "Bearer #{ token }" if token
-          request['If-None-Match'] = _etag if _etag
-          request['Content-Type'] = 'application/json' if http_method == 'Post'
-          request.body = payload if http_method == 'Post'
+          request["User-Agent"] = user_agent
+          request["Accept"] = "application/json"
+          request["Authorization"] = "Bearer #{token}" if token
+          request["If-None-Match"] = _etag if _etag
+          request["Content-Type"] = "application/json" if http_method == "Post"
+          request.body = payload if http_method == "Post"
 
           request
         end
       end
 
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
         class Net::WriteTimeout < StandardError; end
       end
 
       def uri
-        @uri ||= URI::HTTPS.build(host: API_HOST,
-                                  path: path,
-                                  query: query.to_query)
+        @uri ||= begin
+          params = {host: API_HOST, path: path}
+          params[:query] = query.to_query if query.presence
+          URI::HTTPS.build(params)
+        end
       end
 
-      def additation_query_params
+      def additional_query_params
         []
       end
 
       def base_query_params
-        [:datasource]
+        []
       end
 
       def path
@@ -141,7 +151,7 @@ module EveOnline
       def query
         hash = {}
 
-        (base_query_params + additation_query_params).each do |param|
+        (base_query_params + additional_query_params).each do |param|
           hash[param] = public_send(param)
         end
 
@@ -197,7 +207,7 @@ module EveOnline
       private
 
       def parse_datetime_with_timezone(value)
-        ActiveSupport::TimeZone['UTC'].parse(value)
+        ActiveSupport::TimeZone["UTC"].parse(value)
       end
     end
   end

data/lib/eve_online/esi/character.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module EveOnline
   module ESI
     class Character < Base
       extend Forwardable
 
-      API_PATH = '/v4/characters/%<character_id>s/'
+      API_PATH = "/v4/characters/%<character_id>s/"
 
       attr_reader :character_id
 
@@ -18,17 +18,18 @@ module EveOnline
       end
 
       def_delegators :model, :as_json, :alliance_id, :ancestry_id, :birthday,
-                     :bloodline_id, :corporation_id, :description, :faction_id,
-                     :gender, :name, :race_id, :security_status, :title
+        :bloodline_id, :corporation_id, :description, :faction_id, :gender,
+        :name, :race_id, :security_status, :title
 
       def model
         @model ||= Models::Character.new(response)
       end
 
-      def scope; end
+      def scope
+      end
 
       def path
-        format("#{ API_PATH }", character_id: character_id)
+        format(API_PATH, character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_assets.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterAssets < Base
-      API_PATH = '/v3/characters/%<character_id>s/assets/'
+      API_PATH = "/v5/characters/%<character_id>s/assets/"
 
       attr_reader :character_id, :page
 
@@ -26,15 +26,15 @@ module EveOnline
       end
 
       def scope
-        'esi-assets.read_assets.v1'
+        "esi-assets.read_assets.v1"
       end
 
-      def additation_query_params
+      def additional_query_params
         [:page]
       end
 
       def path
-        format("#{ API_PATH }", character_id: character_id)
+        format(API_PATH, character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_assets_locations.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterAssetsLocations < Base
-      API_PATH = '/v2/characters/%<character_id>s/assets/locations/'
+      API_PATH = "/v2/characters/%<character_id>s/assets/locations/"
 
       attr_reader :character_id, :item_ids
 
@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        'Post'
+        "Post"
       end
 
       def payload
@@ -34,7 +34,7 @@ module EveOnline
       end
 
       def scope
-        'esi-assets.read_assets.v1'
+        "esi-assets.read_assets.v1"
       end
 
       def etag
@@ -42,7 +42,7 @@ module EveOnline
       end
 
       def path
-        format("#{ API_PATH }", character_id: character_id)
+        format(API_PATH, character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_assets_names.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterAssetsNames < Base
-      API_PATH = '/v1/characters/%<character_id>s/assets/names/'
+      API_PATH = "/v1/characters/%<character_id>s/assets/names/"
 
       attr_reader :character_id, :item_ids
 
@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        'Post'
+        "Post"
       end
 
       def payload
@@ -34,7 +34,7 @@ module EveOnline
       end
 
       def scope
-        'esi-assets.read_assets.v1'
+        "esi-assets.read_assets.v1"
       end
 
       def etag
@@ -42,7 +42,7 @@ module EveOnline
       end
 
       def path
-        format("#{ API_PATH }", character_id: character_id)
+        format(API_PATH, character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_attributes.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module EveOnline
   module ESI
     class CharacterAttributes < Base
       extend Forwardable
 
-      API_PATH = '/v1/characters/%<character_id>s/attributes/'
+      API_PATH = "/v1/characters/%<character_id>s/attributes/"
 
       attr_reader :character_id
 
@@ -18,19 +18,19 @@ module EveOnline
       end
 
       def_delegators :model, :as_json, :accrued_remap_cooldown_date,
-                     :bonus_remaps, :charisma, :intelligence, :last_remap_date,
-                     :memory, :perception, :willpower
+        :bonus_remaps, :charisma, :intelligence, :last_remap_date, :memory,
+        :perception, :willpower
 
       def model
         @model ||= Models::Attributes.new(response)
       end
 
       def scope
-        'esi-skills.read_skills.v1'
+        "esi-skills.read_skills.v1"
       end
 
       def path
-        format("#{ API_PATH }", character_id: character_id)
+        format(API_PATH, character_id: character_id)
       end
     end
   end