eve_online 0.31.0 → 0.35.1

data/eve_online.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
     "changelog_uri" => "https://github.com/evemonk/eve_online/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://github.com/evemonk/eve_online/blob/master/README.md",
     "homepage_uri" => "https://github.com/evemonk/eve_online",
-    "source_code_uri" => "https://github.com/evemonk/eve_online",
+    "source_code_uri" => "https://github.com/evemonk/eve_online"
   }
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mdl"
   spec.add_development_dependency "appraisal"
 
-  spec.add_runtime_dependency "activesupport", ">= 4.2.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.2.0"
 end

data/lib/eve_online.rb

@@ -14,6 +14,7 @@ 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"
 
 # ESI API
 require "eve_online/esi/base"
@@ -30,9 +31,6 @@ require "eve_online/esi/corporation_assets"
 require "eve_online/esi/corporation_assets_locations"
 require "eve_online/esi/corporation_assets_names"
 
-require "eve_online/esi/character_bookmarks"
-require "eve_online/esi/character_bookmark_folders"
-
 require "eve_online/esi/character_calendar"
 require "eve_online/esi/character_calendar_event"
 
@@ -47,9 +45,14 @@ require "eve_online/esi/character_standings"
 require "eve_online/esi/character_clones"
 require "eve_online/esi/character_implants"
 
+require "eve_online/esi/character_contracts"
+require "eve_online/esi/public_contracts"
+require "eve_online/esi/public_contract"
+
 require "eve_online/esi/corporation"
 require "eve_online/esi/corporation_alliance_history"
 require "eve_online/esi/corporation_blueprints"
+require "eve_online/esi/corporation_npc"
 
 require "eve_online/esi/dogma_attributes"
 require "eve_online/esi/dogma_attribute"
@@ -61,6 +64,7 @@ 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/killmail"
 
 require "eve_online/esi/character_location"
 require "eve_online/esi/character_online"
@@ -84,6 +88,7 @@ require "eve_online/esi/corporation_orders"
 require "eve_online/esi/market_history"
 require "eve_online/esi/market_groups"
 require "eve_online/esi/market_group"
+require "eve_online/esi/market_prices"
 
 require "eve_online/esi/character_attributes"
 require "eve_online/esi/character_skill_queue"
@@ -121,6 +126,7 @@ require "eve_online/esi/universe_type"
 
 require "eve_online/esi/character_wallet"
 require "eve_online/esi/character_wallet_journal"
+require "eve_online/esi/character_wallet_transactions"
 
 require "eve_online/esi/wars"
 require "eve_online/esi/war"
@@ -149,22 +155,25 @@ require "eve_online/esi/models/character_order"
 require "eve_online/esi/models/character_location"
 require "eve_online/esi/models/character_ship"
 require "eve_online/esi/models/blueprint"
-require "eve_online/esi/models/bookmark"
-require "eve_online/esi/models/bookmark_folder"
 require "eve_online/esi/models/standing"
+require "eve_online/esi/models/contract"
+require "eve_online/esi/models/public_contract"
+require "eve_online/esi/models/public_contract_item"
 require "eve_online/esi/models/fatigue"
 require "eve_online/esi/models/notification"
 require "eve_online/esi/models/event"
 require "eve_online/esi/models/event_details"
 require "eve_online/esi/models/type"
 require "eve_online/esi/models/jump_clone"
-require "eve_online/esi/models/wallet_journal_entry"
+require "eve_online/esi/models/wallet_journal"
+require "eve_online/esi/models/wallet_transaction"
 require "eve_online/esi/models/corporation_order"
 require "eve_online/esi/models/home_location"
 require "eve_online/esi/models/server_status"
 
 require "eve_online/esi/models/market_history"
 require "eve_online/esi/models/market_group"
+require "eve_online/esi/models/market_price"
 
 require "eve_online/esi/models/corporation"
 require "eve_online/esi/models/corporation_alliance_history"
@@ -218,6 +227,15 @@ require "eve_online/esi/models/ally"
 require "eve_online/esi/models/allies"
 require "eve_online/esi/models/defender"
 require "eve_online/esi/models/killmail_short"
+require "eve_online/esi/models/killmail"
+
+require "eve_online/formulas/blueprint_copy_time"
 
 module EveOnline
 end
+
+# class Net::HTTPErrorLimited < Net::HTTPClientError # 420
+#   HAS_BODY = false
+# end
+#
+# Net::HTTPResponse::CODE_TO_OBJ.merge!("420"=>Net::HTTPErrorLimited)

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
 

data/lib/eve_online/esi/alliances.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Alliances < Base
-      API_PATH = "/v1/alliances/"
+      API_PATH = "/v2/alliances/"
 
       def alliance_ids
         response

data/lib/eve_online/esi/base.rb

@@ -86,6 +86,14 @@ module EveOnline
         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
         @client ||= begin
           http = Net::HTTP.new(uri.host, uri.port)

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
 

data/lib/eve_online/esi/character_calendar.rb

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

data/lib/eve_online/esi/character_calendar_event.rb

@@ -5,7 +5,7 @@ module EveOnline
     class CharacterCalendarEvent < Base
       extend Forwardable
 
-      API_PATH = "/v3/characters/%<character_id>s/calendar/%<event_id>s/"
+      API_PATH = "/v4/characters/%<character_id>s/calendar/%<event_id>s/"
 
       attr_reader :character_id, :event_id
 

data/lib/eve_online/esi/{character_bookmarks.rb → character_contracts.rb}

@@ -2,8 +2,8 @@
 
 module EveOnline
   module ESI
-    class CharacterBookmarks < Base
-      API_PATH = "/v2/characters/%<character_id>s/bookmarks/"
+    class CharacterContracts < Base
+      API_PATH = "/v1/characters/%<character_id>s/contracts/"
 
       attr_reader :character_id, :page
 
@@ -14,19 +14,19 @@ module EveOnline
         @page = options.fetch(:page, 1)
       end
 
-      def bookmarks
-        @bookmarks ||=
+      def contracts
+        @contracts ||=
           begin
             output = []
-            response.each do |bookmark|
-              output << Models::Bookmark.new(bookmark)
+            response.each do |contract|
+              output << Models::Contract.new(contract)
             end
             output
           end
       end
 
       def scope
-        "esi-bookmarks.read_character_bookmarks.v1"
+        "esi-contracts.read_character_contracts.v1"
       end
 
       def additional_query_params

data/lib/eve_online/esi/character_location.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterLocation < Base
       extend Forwardable
 
-      API_PATH = "/v1/characters/%<character_id>s/location/"
+      API_PATH = "/v2/characters/%<character_id>s/location/"
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_online.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterOnline < Base
       extend Forwardable
 
-      API_PATH = "/v2/characters/%<character_id>s/online/"
+      API_PATH = "/v3/characters/%<character_id>s/online/"
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_ship.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterShip < Base
       extend Forwardable
 
-      API_PATH = "/v1/characters/%<character_id>s/ship/"
+      API_PATH = "/v2/characters/%<character_id>s/ship/"
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_skills.rb

@@ -16,7 +16,7 @@ module EveOnline
       def as_json
         {
           total_sp: total_sp,
-          unallocated_sp: unallocated_sp,
+          unallocated_sp: unallocated_sp
         }
       end
 

data/lib/eve_online/esi/character_wallet.rb

@@ -15,7 +15,7 @@ module EveOnline
 
       def as_json
         {
-          wallet: wallet,
+          wallet: wallet
         }
       end
 

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -18,8 +18,8 @@ module EveOnline
         @wallet_journal_entries ||=
           begin
             output = []
-            response.each do |wallet_journal_entry|
-              output << Models::WalletJournalEntry.new(wallet_journal_entry)
+            response.each do |wallet_journal|
+              output << Models::WalletJournal.new(wallet_journal)
             end
             output
           end

data/lib/eve_online/esi/character_wallet_transactions.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CharacterWalletTransactions < Base
+      API_PATH = "/v1/characters/%<character_id>s/wallet/transactions/"
+
+      attr_reader :character_id, :from_id
+
+      def initialize(options)
+        super
+
+        @character_id = options.fetch(:character_id)
+        @from_id = options.fetch(:from_id, nil)
+      end
+
+      def wallet_transactions
+        @wallet_transactions ||=
+          begin
+            output = []
+            response.each do |wallet_transaction|
+              output << Models::WalletTransaction.new(wallet_transaction)
+            end
+            output
+          end
+      end
+
+      def scope
+        "esi-wallet.read_character_wallet.v1"
+      end
+
+      def additional_query_params
+        [:from_id]
+      end
+
+      def path
+        format(API_PATH, character_id: character_id)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/corporation_assets.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CorporationAssets < Base
-      API_PATH = "/v3/corporations/%<corporation_id>s/assets/"
+      API_PATH = "/v5/corporations/%<corporation_id>s/assets/"
 
       attr_reader :corporation_id, :page
 

data/lib/eve_online/esi/corporation_npc.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CorporationNPC < Base
+      API_PATH = "/v1/corporations/npccorps/"
+
+      def corporation_npc_ids
+        response
+      end
+
+      def scope
+      end
+
+      def path
+        API_PATH
+      end
+    end
+  end
+end

data/lib/eve_online/esi/killmail.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class Killmail < Base
+      API_PATH = "/v1/killmails/%<killmail_id>s/%<killmail_hash>s/"
+
+      attr_reader :killmail_id, :killmail_hash
+
+      def initialize(options)
+        super
+
+        @killmail_id = options.fetch(:killmail_id)
+        @killmail_hash = options.fetch(:killmail_hash)
+      end
+
+      # TODO: implement
+      def as_json
+        {}
+      end
+
+      def scope
+      end
+
+      def path
+        format(API_PATH, killmail_id: killmail_id, killmail_hash: killmail_hash)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/market_prices.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class MarketPrices < Base
+      API_PATH = "/v1/markets/prices/"
+
+      def market_prices
+        @market_prices ||=
+          begin
+            output = []
+            response.each do |market_price|
+              output << Models::MarketPrice.new(market_price)
+            end
+            output
+          end
+      end
+
+      def scope
+      end
+
+      def path
+        API_PATH
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module EveOnline
             alliance_id: alliance_id,
             corporation_id: corporation_id,
             isk_destroyed: isk_destroyed,
-            ships_killed: ships_killed,
+            ships_killed: ships_killed
           }
         end
 

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

@@ -12,7 +12,7 @@ module EveOnline
             executor_corporation_id: executor_corporation_id,
             faction_id: faction_id,
             name: name,
-            ticker: ticker,
+            ticker: ticker
           }
         end
 

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

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             icon_medium: icon_medium,
-            icon_small: icon_small,
+            icon_small: icon_small
           }
         end