eve_online 0.18.0 → 0.19.0

data/TODO.md

@@ -1,7 +1,7 @@
 # TODO
 
 * Fix MD024
-* Add caching (ETag)
 * Add corporation roles
 * Add caching timeout
-* Add translations
+* Add 420 error status
+* Add errors limits

data/eve_online.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'EveOnline ESI API.'
   spec.description   = 'EveOnline ESI API.'
-  spec.homepage      = 'https://github.com/biow0lf/eve_online'
+  spec.homepage      = 'https://github.com/evemonk/eve_online'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mdl'
 
   spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
-  spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'memoist'
 end

data/lib/eve_online.rb

@@ -17,67 +17,87 @@ require 'eve_online/exceptions/no_content'
 # ESI API
 require 'eve_online/esi/base'
 
-require 'eve_online/esi/character'
-require 'eve_online/esi/character_portrait'
-require 'eve_online/esi/character_skills'
-require 'eve_online/esi/character_skill_queue'
-require 'eve_online/esi/character_loyalty_points'
-require 'eve_online/esi/character_wallet'
-require 'eve_online/esi/character_wallet_journal'
+require 'eve_online/esi/alliances'
+require 'eve_online/esi/alliance'
+require 'eve_online/esi/alliance_corporations'
+require 'eve_online/esi/alliance_icon'
+
 require 'eve_online/esi/character_assets'
-require 'eve_online/esi/character_attributes'
-require 'eve_online/esi/character_location'
-require 'eve_online/esi/character_ship'
-require 'eve_online/esi/character_industry_jobs'
-require 'eve_online/esi/character_clones'
-require 'eve_online/esi/character_implants'
-require 'eve_online/esi/character_blueprints'
-require 'eve_online/esi/character_standings'
-require 'eve_online/esi/character_fatigue'
-require 'eve_online/esi/character_online'
-require 'eve_online/esi/character_orders'
+require 'eve_online/esi/character_assets_locations'
+require 'eve_online/esi/character_assets_names'
+
 require 'eve_online/esi/character_bookmarks'
 require 'eve_online/esi/character_bookmark_folders'
-require 'eve_online/esi/character_notifications'
+
 require 'eve_online/esi/character_calendar'
-require 'eve_online/esi/character_killmails_recent'
 
-require 'eve_online/esi/market_history'
+require 'eve_online/esi/character'
+require 'eve_online/esi/character_blueprints'
+require 'eve_online/esi/character_fatigue'
+require 'eve_online/esi/character_notifications'
+require 'eve_online/esi/character_portrait'
+require 'eve_online/esi/character_standings'
+
+require 'eve_online/esi/character_clones'
+require 'eve_online/esi/character_implants'
 
 require 'eve_online/esi/corporation'
-require 'eve_online/esi/corporation_industry_jobs'
 require 'eve_online/esi/corporation_blueprints'
-require 'eve_online/esi/corporation_orders'
-require 'eve_online/esi/corporation_killmails_recent'
-
-require 'eve_online/esi/alliances'
-require 'eve_online/esi/alliance'
-require 'eve_online/esi/alliance_corporations'
-require 'eve_online/esi/alliance_icon'
 
 require 'eve_online/esi/dogma_attributes'
 require 'eve_online/esi/dogma_attribute'
+require 'eve_online/esi/dogma_effects'
+require 'eve_online/esi/dogma_effect'
+
+require 'eve_online/esi/character_industry_jobs'
+require 'eve_online/esi/corporation_industry_jobs'
+
+require 'eve_online/esi/character_killmails_recent'
+require 'eve_online/esi/corporation_killmails_recent'
+
+require 'eve_online/esi/character_location'
+require 'eve_online/esi/character_online'
+require 'eve_online/esi/character_ship'
+
+require 'eve_online/esi/character_loyalty_points'
+
+require 'eve_online/esi/character_orders'
+require 'eve_online/esi/corporation_orders'
+require 'eve_online/esi/market_history'
+
+require 'eve_online/esi/character_attributes'
+require 'eve_online/esi/character_skill_queue'
+require 'eve_online/esi/character_skills'
 
 require 'eve_online/esi/server_status'
-require 'eve_online/esi/races'
+
+require 'eve_online/esi/ancestries'
 require 'eve_online/esi/bloodlines'
+require 'eve_online/esi/universe_constellations'
+require 'eve_online/esi/universe_constellation'
 require 'eve_online/esi/factions'
-require 'eve_online/esi/ancestries'
-require 'eve_online/esi/universe_types'
-require 'eve_online/esi/universe_type'
+require 'eve_online/esi/races'
 require 'eve_online/esi/universe_regions'
 require 'eve_online/esi/universe_region'
-require 'eve_online/esi/universe_constellations'
-require 'eve_online/esi/universe_constellation'
 require 'eve_online/esi/universe_systems'
+require 'eve_online/esi/universe_types'
+require 'eve_online/esi/universe_type'
+
+require 'eve_online/esi/character_wallet'
+require 'eve_online/esi/character_wallet_journal'
+
 require 'eve_online/esi/wars'
 require 'eve_online/esi/war_killmails'
 
+# Models
 require 'eve_online/esi/models/base'
+require 'eve_online/esi/models/position'
 require 'eve_online/esi/models/loyalty_point'
 require 'eve_online/esi/models/skill_queue_entry'
 require 'eve_online/esi/models/skill'
 require 'eve_online/esi/models/asset'
+require 'eve_online/esi/models/asset_location'
+require 'eve_online/esi/models/asset_name'
 require 'eve_online/esi/models/online'
 require 'eve_online/esi/models/attributes'
 require 'eve_online/esi/models/character'
@@ -110,6 +130,13 @@ require 'eve_online/esi/models/alliance_short'
 require 'eve_online/esi/models/alliance_icon'
 
 require 'eve_online/esi/models/dogma_attribute'
+require 'eve_online/esi/models/dogma_attributes'
+require 'eve_online/esi/models/dogma_attribute_short'
+require 'eve_online/esi/models/dogma_effect'
+require 'eve_online/esi/models/dogma_effects'
+require 'eve_online/esi/models/dogma_effect_short'
+require 'eve_online/esi/models/dogma_effect_modifier'
+require 'eve_online/esi/models/dogma_effect_modifiers'
 
 require 'eve_online/esi/models/race'
 require 'eve_online/esi/models/bloodline'

data/lib/eve_online/esi/alliance_corporations.rb

@@ -13,7 +13,7 @@ module EveOnline
         @alliance_id = options.fetch(:alliance_id)
       end
 
-      def corporations
+      def corporation_ids
         response
       end
 

data/lib/eve_online/esi/alliances.rb

@@ -5,7 +5,7 @@ module EveOnline
     class Alliances < Base
       API_ENDPOINT = 'https://esi.evetech.net/v1/alliances/?datasource=%<datasource>s'
 
-      def alliances
+      def alliance_ids
         response
       end
 

data/lib/eve_online/esi/ancestries.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Ancestries < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/ancestries/?datasource=%<datasource>s&language=en-us'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/ancestries/?datasource=%<datasource>s'
 
       def ancestries
         output = []

data/lib/eve_online/esi/base.rb

@@ -1,23 +1,27 @@
 # frozen_string_literal: true
 
+require 'net/http'
+require 'openssl'
 require 'json'
 require 'memoist'
 require 'active_support/time'
-require 'faraday'
 
 module EveOnline
   module ESI
     class Base
       extend Memoist
 
-      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :datasource
+      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :etag,
+                  :datasource, :language
 
       def initialize(options = {})
-        @token = options[:token]
-        @parser = options[:parser] || JSON
-        @_read_timeout = options[:read_timeout] || 60
-        @_open_timeout = options[:open_timeout] || 60
-        @datasource = options[:datasource] || 'tranquility'
+        @token = options.fetch(:token, nil)
+        @parser = options.fetch(:parser, JSON)
+        @_read_timeout = options.fetch(:read_timeout, 60)
+        @_open_timeout = options.fetch(:open_timeout, 60)
+        @etag = options.fetch(:etag, nil)
+        @datasource = options.fetch(:datasource, 'tranquility')
+        @language = options.fetch(:language, 'en-us')
       end
 
       def url
@@ -29,80 +33,112 @@ module EveOnline
       end
 
       def user_agent
-        "EveOnline API (https://github.com/biow0lf/eve_online) v#{ VERSION }"
+        "EveOnline API (https://github.com/evemonk/eve_online) v#{ VERSION }"
+      end
+
+      def http_method
+        'Get'
       end
 
       def read_timeout
-        client.options.timeout
+        client.read_timeout
       end
 
       def read_timeout=(value)
-        client.options.timeout = value
+        client.read_timeout = value
       end
 
       def open_timeout
-        client.options.open_timeout
+        client.open_timeout
       end
 
       def open_timeout=(value)
-        client.options.open_timeout = value
+        client.open_timeout = value
+      end
+
+      def current_etag
+        resource.header['Etag']&.gsub('"', '')
       end
 
       def page; end
 
-      # def total_pages
-      #   resource.headers['x-pages']&.to_i
-      # end
+      def total_pages
+        resource.header['X-Pages']&.to_i
+      end
 
       def client
         @client ||= begin
-          faraday = Faraday.new
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.read_timeout = _read_timeout
+          http.open_timeout = _open_timeout
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          # http.set_debug_output($stdout)
+          http
+        end
+      end
 
-          faraday.headers[:user_agent] = user_agent
-          faraday.authorization(:Bearer, token) if token
-          faraday.options.timeout = _read_timeout
-          faraday.options.open_timeout = _open_timeout
-          faraday
+      def request
+        @request ||= begin
+          request = "Net::HTTP::#{ http_method }".constantize.new(uri.request_uri)
+
+          request['User-Agent'] = user_agent
+          request['Accept'] = 'application/json'
+          request['Accept-Language'] = language
+          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
 
+      def uri
+        @uri ||= URI.parse(url)
+      end
+
       def resource
-        @resource ||= client.get(url)
+        @resource ||= client.request(request)
+      end
+
+      def no_content?
+        resource.is_a?(Net::HTTPNotModified)
       end
 
       def content
-        case resource.status
-        when 200
+        case resource
+        when Net::HTTPOK
           resource.body
-        when 201
+        when Net::HTTPCreated
           # TODO: write
           raise NotImplementedError
-        when 204
+        when Net::HTTPNoContent
           # TODO: write
           # raise NotImplementedError
           raise EveOnline::Exceptions::NoContent
-        when 304
-          # TODO: write
+        when Net::HTTPNotModified
+          # TODO: write etag support
           raise NotImplementedError
-        when 400
+        when Net::HTTPBadRequest
           raise EveOnline::Exceptions::BadRequest
-        when 401
+        when Net::HTTPUnauthorized
           raise EveOnline::Exceptions::Unauthorized
-        when 403
+        when Net::HTTPForbidden
           raise EveOnline::Exceptions::Forbidden
-        when 404
+        when Net::HTTPNotFound
           raise EveOnline::Exceptions::ResourceNotFound
-        when 500
+        when Net::HTTPInternalServerError
           raise EveOnline::Exceptions::InternalServerError
-        when 502
+        when Net::HTTPBadGateway
           raise EveOnline::Exceptions::BadGateway
-        when 503
+        when Net::HTTPServiceUnavailable
           raise EveOnline::Exceptions::ServiceUnavailable
         else
           # raise EveOnline::Exceptions::UnknownStatus
           raise NotImplementedError
         end
-      rescue Faraday::TimeoutError
+      rescue Net::OpenTimeout, Net::ReadTimeout
         raise EveOnline::Exceptions::Timeout
       end
       memoize :content

data/lib/eve_online/esi/bloodlines.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Bloodlines < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/bloodlines/?datasource=%<datasource>s&language=en-us'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/bloodlines/?datasource=%<datasource>s'
 
       def bloodlines
         output = []

data/lib/eve_online/esi/character_assets.rb

@@ -23,10 +23,6 @@ module EveOnline
       end
       memoize :assets
 
-      def total_pages
-        resource.headers['x-pages']&.to_i
-      end
-
       def scope
         'esi-assets.read_assets.v1'
       end

data/lib/eve_online/esi/character_assets_locations.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CharacterAssetsLocations < Base
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/assets/locations/?datasource=%<datasource>s'
+
+      attr_reader :character_id, :item_ids
+
+      def initialize(options)
+        super
+
+        @character_id = options.fetch(:character_id)
+        @item_ids = options.fetch(:item_ids)
+      end
+
+      def assets_locations
+        output = []
+        response.each do |asset_location|
+          output << Models::AssetLocation.new(asset_location)
+        end
+        output
+      end
+      memoize :assets_locations
+
+      def http_method
+        'Post'
+      end
+
+      def payload
+        item_ids.to_json
+      end
+
+      def scope
+        'esi-assets.read_assets.v1'
+      end
+
+      def url
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/character_assets_names.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CharacterAssetsNames < Base
+      API_ENDPOINT = 'https://esi.evetech.net/v1/characters/%<character_id>s/assets/names/?datasource=%<datasource>s'
+
+      attr_reader :character_id, :item_ids
+
+      def initialize(options)
+        super
+
+        @character_id = options.fetch(:character_id)
+        @item_ids = options.fetch(:item_ids)
+      end
+
+      def assets_names
+        output = []
+        response.each do |asset_name|
+          output << Models::AssetName.new(asset_name)
+        end
+        output
+      end
+      memoize :assets_names
+
+      def http_method
+        'Post'
+      end
+
+      def payload
+        item_ids.to_json
+      end
+
+      def scope
+        'esi-assets.read_assets.v1'
+      end
+
+      def url
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
+      end
+    end
+  end
+end