eve_online 0.35.0 → 0.39.0

data/lib/eve_online/esi/alliance.rb

@@ -7,7 +7,7 @@ module EveOnline
     class Alliance < Base
       extend Forwardable
 
-      API_PATH = "/v3/alliances/%<alliance_id>s/"
+      API_PATH = "/v4/alliances/%<alliance_id>s/"
 
       attr_reader :alliance_id
 

data/lib/eve_online/esi/alliance_icon.rb

@@ -7,7 +7,7 @@ module EveOnline
     class AllianceIcon < Base
       extend Forwardable
 
-      API_PATH = "/v1/alliances/%<alliance_id>s/icons/"
+      API_PATH = "/v2/alliances/%<alliance_id>s/icons/"
 
       attr_reader :alliance_id
 

data/lib/eve_online/esi/base.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require "net/http"
-require "openssl"
-require "json"
+require "faraday"
+require "faraday_middleware"
 require "active_support/time"
 
 module EveOnline
@@ -10,23 +9,20 @@ module EveOnline
     class Base
       API_HOST = "esi.evetech.net"
 
-      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :_etag,
-        :language
+      attr_reader :token, :_read_timeout, :_open_timeout, :_write_timeout,
+        :_etag, :language, :adapter, :middlewares
 
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-        attr_reader :_write_timeout
-      end
+      attr_writer :token
 
       def initialize(options = {})
         @token = options.fetch(:token, nil)
-        @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")
-          @_write_timeout = options.fetch(:write_timeout, 60)
-        end
+        @_write_timeout = options.fetch(:write_timeout, 60)
         @_etag = options.fetch(:etag, nil)
         @language = options.fetch(:language, "en-us")
+        @adapter = options.fetch(:adapter, Faraday.default_adapter)
+        @middlewares = options.fetch(:middlewares, [])
       end
 
       def url
@@ -42,33 +38,31 @@ module EveOnline
       end
 
       def http_method
-        "Get"
+        :get
       end
 
       def read_timeout
-        client.read_timeout
+        connection.options.read_timeout
       end
 
       def read_timeout=(value)
-        client.read_timeout = value
+        connection.options.read_timeout = value
       end
 
       def open_timeout
-        client.open_timeout
+        connection.options.open_timeout
       end
 
       def open_timeout=(value)
-        client.open_timeout = value
+        connection.options.open_timeout = value
       end
 
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-        def write_timeout
-          client.write_timeout
-        end
+      def write_timeout
+        connection.options.write_timeout
+      end
 
-        def write_timeout=(value)
-          client.write_timeout = value
-        end
+      def write_timeout=(value)
+        connection.options.write_timeout = value
       end
 
       def etag=(value)
@@ -76,56 +70,54 @@ module EveOnline
       end
 
       def etag
-        resource.header["Etag"]&.gsub("W/", "")&.gsub('"', "")
+        resource.headers["etag"]&.gsub("W/", "")&.gsub('"', "")
       end
 
       def page
       end
 
       def total_pages
-        resource.header["X-Pages"]&.to_i
+        resource.headers["x-pages"]&.to_i
       end
 
       def error_limit_remain
-        resource.header["X-ESI-Error-Limit-Remain"]&.to_i
+        resource.headers["x-esi-error-limit-remain"]&.to_i
       end
 
       def error_limit_reset
-        resource.header["X-ESI-Error-Limit-Reset"]&.to_i
+        resource.headers["x-esi-error-limit-reset"]&.to_i
       end
 
-      def client
-        @client ||= begin
-          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")
-            http.write_timeout = _write_timeout
-          end
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          # http.set_debug_output($stdout)
-          http
-        end
+      def request_id
+        resource.headers["x-esi-request-id"]
       end
 
-      def request
-        @request ||= begin
-          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
-        end
+      def add_middleware(middleware)
+        @middlewares << middleware
       end
 
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
-        class Net::WriteTimeout < StandardError; end
+      def connection
+        @connection ||= Faraday.new { |f|
+          f.headers["User-Agent"] = user_agent
+          f.headers["If-None-Match"] = _etag if _etag
+          f.headers["Accept"] = "application/json"
+          f.authorization :Bearer, token if token
+          f.options.read_timeout = _read_timeout
+          f.options.open_timeout = _open_timeout
+          f.options.write_timeout = _write_timeout
+          f.use FaradayMiddlewares::RaiseErrors
+          middlewares.each do |middleware|
+            if middleware[:esi].present?
+              f.use middleware[:class], esi: middleware[:esi]
+            else
+              f.use middleware[:class]
+            end
+          end
+          # f.use Faraday::Response::Logger
+          # f.use FaradayMiddleware::FollowRedirects, limit: 5
+          f.response :json, content_type: "application/json"
+          f.adapter adapter
+        }
       end
 
       def uri
@@ -159,49 +151,25 @@ module EveOnline
       end
 
       def resource
-        @resource ||= client.request(request)
-      rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout
+        @resource ||= connection.public_send(http_method, uri)
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError
         raise EveOnline::Exceptions::Timeout
       end
 
       def not_modified?
-        resource.is_a?(Net::HTTPNotModified)
+        resource.status == 304
       end
 
       def content
-        case resource
-        when Net::HTTPOK
-          # TODO: memoize resource.body as @content
-          resource.body
-        when Net::HTTPCreated
-          # TODO: write
-          raise NotImplementedError
-        when Net::HTTPNoContent
-          raise EveOnline::Exceptions::NoContent
-        when Net::HTTPNotModified
+        if not_modified?
           raise EveOnline::Exceptions::NotModified
-        when Net::HTTPBadRequest
-          raise EveOnline::Exceptions::BadRequest
-        when Net::HTTPUnauthorized
-          raise EveOnline::Exceptions::Unauthorized
-        when Net::HTTPForbidden
-          raise EveOnline::Exceptions::Forbidden
-        when Net::HTTPNotFound
-          raise EveOnline::Exceptions::ResourceNotFound
-        when Net::HTTPInternalServerError
-          raise EveOnline::Exceptions::InternalServerError
-        when Net::HTTPBadGateway
-          raise EveOnline::Exceptions::BadGateway
-        when Net::HTTPServiceUnavailable
-          raise EveOnline::Exceptions::ServiceUnavailable
         else
-          # raise EveOnline::Exceptions::UnknownStatus
-          raise NotImplementedError
+          resource.body
         end
       end
 
       def response
-        @response ||= parser.parse(content)
+        @response ||= content
       end
 
       private

data/lib/eve_online/esi/character_assets_locations.rb

@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        "Post"
+        :post
       end
 
       def payload

data/lib/eve_online/esi/character_assets_names.rb

@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        "Post"
+        :post
       end
 
       def payload

data/lib/eve_online/esi/character_corporation_history.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterCorporationHistory < Base
-      API_PATH = "/v1/characters/%<character_id>s/corporationhistory/"
+      API_PATH = "/v2/characters/%<character_id>s/corporationhistory/"
 
       attr_reader :character_id
 

data/lib/eve_online/esi/corporation_assets_locations.rb

@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        "Post"
+        :post
       end
 
       def payload

data/lib/eve_online/esi/corporation_assets_names.rb

@@ -26,7 +26,7 @@ module EveOnline
       end
 
       def http_method
-        "Post"
+        :post
       end
 
       def payload

data/lib/eve_online/esi/corporation_members.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CorporationMembers < Base
+      API_PATH = "/v3/corporations/%<corporation_id>s/members/"
+
+      attr_reader :corporation_id
+
+      def initialize(options = {})
+        super
+
+        @corporation_id = options.fetch(:corporation_id)
+      end
+
+      def character_ids
+        response
+      end
+
+      def scope
+        "esi-corporations.read_corporation_membership.v1"
+      end
+
+      def path
+        format(API_PATH, corporation_id: corporation_id)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/faraday_middlewares/raise_errors.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "faraday"
+
+module EveOnline
+  module ESI
+    module FaradayMiddlewares
+      class RaiseErrors < Faraday::Middleware
+        def call(env)
+          @app.call(env).on_complete do |environment|
+            on_complete(environment)
+          end
+        end
+
+        def on_complete(env)
+          case env[:status]
+          when 204
+            raise EveOnline::Exceptions::NoContent
+          when 400
+            raise EveOnline::Exceptions::BadRequest
+          when 401
+            raise EveOnline::Exceptions::Unauthorized
+          when 403
+            raise EveOnline::Exceptions::Forbidden
+          when 404
+            raise EveOnline::Exceptions::ResourceNotFound
+          when 420
+            raise EveOnline::Exceptions::ErrorLimited
+          when 500
+            raise EveOnline::Exceptions::InternalServerError
+          when 502
+            raise EveOnline::Exceptions::BadGateway
+          when 503
+            raise EveOnline::Exceptions::ServiceUnavailable
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/models/public_contract.rb

@@ -20,7 +20,7 @@ module EveOnline
             reward: reward,
             start_location_id: start_location_id,
             title: title,
-            type: type,
+            kind: kind,
             volume: volume
           }
         end
@@ -85,7 +85,7 @@ module EveOnline
           options["title"]
         end
 
-        def type
+        def kind
           options["type"]
         end
 

data/lib/eve_online/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EveOnline
-  VERSION = "0.35.0"
+  VERSION = "0.39.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -159,20 +187,19 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".deepsource.toml"
+- ".fasterer.yml"
 - ".github/FUNDING.yml"
 - ".gitignore"
 - ".mdlrc"
 - ".ruby-version"
+- ".standard.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- Gemfile.mutant
-- Gemfile.mutant.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - eve_online.gemspec
 - lib/eve_online.rb
 - lib/eve_online/esi/alliance.rb
@@ -219,12 +246,14 @@ files:
 - lib/eve_online/esi/corporation_industry_jobs.rb
 - lib/eve_online/esi/corporation_killmails_recent.rb
 - lib/eve_online/esi/corporation_loyalty_store_offers.rb
+- lib/eve_online/esi/corporation_members.rb
 - lib/eve_online/esi/corporation_npc.rb
 - lib/eve_online/esi/corporation_orders.rb
 - lib/eve_online/esi/dogma_attribute.rb
 - lib/eve_online/esi/dogma_attributes.rb
 - lib/eve_online/esi/dogma_effect.rb
 - lib/eve_online/esi/dogma_effects.rb
+- lib/eve_online/esi/faraday_middlewares/raise_errors.rb
 - lib/eve_online/esi/killmail.rb
 - lib/eve_online/esi/market_group.rb
 - lib/eve_online/esi/market_groups.rb
@@ -362,7 +391,6 @@ files:
 - lib/eve_online/exceptions/unauthorized.rb
 - lib/eve_online/formulas/blueprint_copy_time.rb
 - lib/eve_online/version.rb
-- mutant.sh
 homepage: https://github.com/evemonk/eve_online
 licenses:
 - MIT
@@ -380,15 +408,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
-summary: EveOnline ESI API.
+summary: EveOnline ESI API
 test_files: []