eve_online 0.42.0 → 0.44.0

data/eve_online.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "eve_online/version"
+require_relative "lib/eve_online/version"
 
 Gem::Specification.new do |spec|
   spec.name = "eve_online"
@@ -16,9 +14,10 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
 
   spec.metadata = {
+    "rubygems_mfa_required" => "true",
     "bug_tracker_uri" => "https://github.com/evemonk/eve_online/issues",
-    "changelog_uri" => "https://github.com/evemonk/eve_online/blob/master/CHANGELOG.md",
-    "documentation_uri" => "https://github.com/evemonk/eve_online/blob/master/README.md",
+    "changelog_uri" => "https://github.com/evemonk/eve_online/blob/main/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/evemonk/eve_online/blob/main/README.md",
     "homepage_uri" => "https://github.com/evemonk/eve_online",
     "source_code_uri" => "https://github.com/evemonk/eve_online"
   }
@@ -26,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin|swagger)/}) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -35,10 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "vcr"
-  spec.add_development_dependency "mdl"
-  spec.add_development_dependency "appraisal"
 
-  spec.add_runtime_dependency "faraday"
-  spec.add_runtime_dependency "faraday_middleware"
-  spec.add_runtime_dependency "activesupport", ">= 5.2.0"
+  spec.add_runtime_dependency "faraday", ">= 2.3.0"
+  spec.add_runtime_dependency "activesupport", ">= 6.1.0"
 end

data/gemfiles/activesupport_6.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "nokogiri"
+gem "awesome_print", require: "ap"
+gem "pry"
+gem "standard", require: false
+gem "fasterer", require: false
+gem "activesupport", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_7.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "nokogiri"
+gem "awesome_print", require: "ap"
+gem "pry"
+gem "standard", require: false
+gem "fasterer", require: false
+gem "activesupport", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_main.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "nokogiri"
+gem "awesome_print", require: "ap"
+gem "pry"
+gem "standard", require: false
+gem "fasterer", require: false
+gem "activesupport", git: "https://github.com/rails/rails", require: "activesupport", branch: "main"
+
+gemspec path: "../"

data/lib/eve_online/esi/base.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "faraday"
-require "faraday_middleware"
 require "active_support/time"
+require "active_support/core_ext/object/blank"
 
 module EveOnline
   module ESI
@@ -10,7 +10,7 @@ module EveOnline
       API_HOST = "esi.evetech.net"
 
       attr_reader :token, :_read_timeout, :_open_timeout, :_write_timeout,
-        :_etag, :language, :adapter, :middlewares
+        :language, :adapter, :middlewares
 
       attr_writer :token
 
@@ -19,7 +19,6 @@ module EveOnline
         @_read_timeout = options.fetch(:read_timeout, 60)
         @_open_timeout = options.fetch(:open_timeout, 60)
         @_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, [])
@@ -65,14 +64,6 @@ module EveOnline
         connection.options.write_timeout = value
       end
 
-      def etag=(value)
-        @_etag = value
-      end
-
-      def etag
-        resource.headers["etag"]&.gsub("W/", "")&.gsub('"', "")
-      end
-
       def page
       end
 
@@ -99,19 +90,14 @@ module EveOnline
       def connection
         @connection ||= Faraday.new do |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.request :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
+            f.use middleware[:class], esi: self
           end
           f.response :json, content_type: "application/json"
           f.adapter adapter
@@ -154,20 +140,8 @@ module EveOnline
         raise EveOnline::Exceptions::Timeout
       end
 
-      def not_modified?
-        resource.status == 304
-      end
-
-      def content
-        if not_modified?
-          raise EveOnline::Exceptions::NotModified
-        else
-          resource.body
-        end
-      end
-
       def response
-        @response ||= content
+        @response ||= resource.body
       end
 
       private

data/lib/eve_online/esi/character_assets_locations.rb

@@ -37,10 +37,6 @@ module EveOnline
         "esi-assets.read_assets.v1"
       end
 
-      def etag
-        raise NotImplementedError
-      end
-
       def path
         format(API_PATH, character_id: character_id)
       end

data/lib/eve_online/esi/character_assets_names.rb

@@ -37,10 +37,6 @@ module EveOnline
         "esi-assets.read_assets.v1"
       end
 
-      def etag
-        raise NotImplementedError
-      end
-
       def path
         format(API_PATH, character_id: character_id)
       end

data/lib/eve_online/esi/corporation_assets_locations.rb

@@ -41,10 +41,6 @@ module EveOnline
         ["Director"]
       end
 
-      def etag
-        raise NotImplementedError
-      end
-
       def path
         format(API_PATH, corporation_id: corporation_id)
       end

data/lib/eve_online/esi/corporation_assets_names.rb

@@ -41,10 +41,6 @@ module EveOnline
         ["Director"]
       end
 
-      def etag
-        raise NotImplementedError
-      end
-
       def path
         format(API_PATH, corporation_id: corporation_id)
       end

data/lib/eve_online/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EveOnline
-  VERSION = Gem::Version.new("0.42.0")
+  VERSION = Gem::Version.new("0.44.0")
 end

data/lib/eve_online.rb

@@ -13,7 +13,6 @@ require "eve_online/exceptions/internal_server_error"
 require "eve_online/exceptions/bad_gateway"
 require "eve_online/exceptions/service_unavailable"
 require "eve_online/exceptions/no_content"
-require "eve_online/exceptions/not_modified"
 require "eve_online/exceptions/error_limited"
 
 module EveOnline

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,76 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mdl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
 description: EveOnline ESI API.
 email:
 - igor.zubkov@gmail.com
@@ -185,17 +143,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".deepsource.toml"
 - ".fasterer.yml"
-- ".github/FUNDING.yml"
 - ".github/dependabot.yml"
+- ".github/workflows/mdl.yml"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".mdlrc"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".standard.yml"
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -203,6 +160,9 @@ files:
 - README.md
 - Rakefile
 - eve_online.gemspec
+- gemfiles/activesupport_6.1.gemfile
+- gemfiles/activesupport_7.0.gemfile
+- gemfiles/activesupport_main.gemfile
 - lib/eve_online.rb
 - lib/eve_online/esi/alliance.rb
 - lib/eve_online/esi/alliance_corporations.rb
@@ -388,7 +348,6 @@ files:
 - lib/eve_online/exceptions/forbidden.rb
 - lib/eve_online/exceptions/internal_server_error.rb
 - lib/eve_online/exceptions/no_content.rb
-- lib/eve_online/exceptions/not_modified.rb
 - lib/eve_online/exceptions/resource_not_found.rb
 - lib/eve_online/exceptions/service_unavailable.rb
 - lib/eve_online/exceptions/timeout.rb
@@ -400,9 +359,10 @@ homepage: https://github.com/evemonk/eve_online
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/evemonk/eve_online/issues
-  changelog_uri: https://github.com/evemonk/eve_online/blob/master/CHANGELOG.md
-  documentation_uri: https://github.com/evemonk/eve_online/blob/master/README.md
+  changelog_uri: https://github.com/evemonk/eve_online/blob/main/CHANGELOG.md
+  documentation_uri: https://github.com/evemonk/eve_online/blob/main/README.md
   homepage_uri: https://github.com/evemonk/eve_online
   source_code_uri: https://github.com/evemonk/eve_online
 post_install_message:
@@ -413,14 +373,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: EveOnline ESI API

data/.circleci/config.yml

@@ -1,50 +0,0 @@
-version: 2
-
-jobs:
-  ruby-2.6.8:
-    docker:
-      - image: circleci/ruby:2.6.8
-    steps:
-      - checkout
-      - run: rm Gemfile.lock
-      - run: rm .ruby-version
-      - run: bundle install
-      - run: bundle exec appraisal install || true
-      - run: bundle exec appraisal rake
-      - run: bundle exec standardrb
-      - run: bundle exec fasterer
-      - run: bundle exec mdl README.md CHANGELOG.md
-  ruby-2.7.4:
-    docker:
-      - image: circleci/ruby:2.7.4
-    steps:
-      - checkout
-      - run: rm Gemfile.lock
-      - run: rm .ruby-version
-      - run: bundle install
-      - run: bundle exec appraisal install || true
-      - run: bundle exec appraisal rake
-      - run: bundle exec standardrb
-      - run: bundle exec fasterer
-      - run: bundle exec mdl README.md CHANGELOG.md
-  ruby-3.0.2:
-    docker:
-      - image: circleci/ruby:3.0.2
-    steps:
-      - checkout
-      - run: rm Gemfile.lock
-      - run: rm .ruby-version
-      - run: bundle install
-      - run: bundle exec appraisal install || true
-      - run: bundle exec appraisal rake
-      - run: bundle exec standardrb
-      - run: bundle exec fasterer
-      - run: bundle exec mdl README.md CHANGELOG.md
-
-workflows:
-  version: 2
-  tests:
-    jobs:
-      - ruby-2.6.8
-      - ruby-2.7.4
-      - ruby-3.0.2

data/.github/FUNDING.yml

@@ -1 +0,0 @@
-github: biow0lf

data/Appraisals

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-appraise "activesupport_52" do
-  gem "activesupport", "~> 5.2.0"
-end
-
-appraise "activesupport_60" do
-  gem "activesupport", "~> 6.0.0"
-end
-
-appraise "activesupport_61" do
-  gem "activesupport", "~> 6.1.0"
-end
-
-if Gem::Version.new(RUBY_VERSION) > Gem::Version.new("2.7.0")
-  appraise "activesupport_edge" do
-    gem "activesupport", git: "https://github.com/rails/rails", require: "activesupport", branch: "main"
-  end
-end

data/lib/eve_online/exceptions/not_modified.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module EveOnline
-  module Exceptions
-    class NotModified < Base
-    end
-  end
-end