eve_online 0.17.0 → 0.18.0

data/lib/eve_online/esi/character_notifications.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterNotifications < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/notifications/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/notifications/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_online.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterOnline < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/online/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/online/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_orders.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterOrders < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/orders/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/orders/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_portrait.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterPortrait < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/portrait/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/portrait/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_ship.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module EveOnline
+  module ESI
+    class CharacterShip < Base
+      extend Forwardable
+
+      API_ENDPOINT = 'https://esi.evetech.net/v1/characters/%<character_id>s/ship/?datasource=%<datasource>s'
+
+      attr_reader :character_id
+
+      def initialize(options)
+        super
+
+        @character_id = options.fetch(:character_id)
+      end
+
+      def_delegators :model, :as_json, :ship_item_id, :ship_name, :ship_type_id
+
+      def model
+        Models::CharacterShip.new(response)
+      end
+      memoize :model
+
+      def scope
+        'esi-location.read_ship_type.v1'
+      end
+
+      def url
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/character_skill_queue.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterSkillQueue < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/skillqueue/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/skillqueue/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_skills.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterSkills < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/skills/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v4/characters/%<character_id>s/skills/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_standings.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterStandings < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/standings/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/characters/%<character_id>s/standings/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_wallet.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterWallet < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/wallet/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/characters/%<character_id>s/wallet/?datasource=%<datasource>s'
 
       attr_reader :character_id
 

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -3,14 +3,15 @@
 module EveOnline
   module ESI
     class CharacterWalletJournal < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/wallet/journal/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v4/characters/%<character_id>s/wallet/journal/?datasource=%<datasource>s&page=%<page>s'
 
-      attr_reader :character_id
+      attr_reader :character_id, :page
 
       def initialize(options)
         super
 
         @character_id = options.fetch(:character_id)
+        @page = options.fetch(:page, 1)
       end
 
       def wallet_journal_entries
@@ -22,12 +23,16 @@ module EveOnline
       end
       memoize :wallet_journal_entries
 
+      def total_pages
+        resource.headers['x-pages']&.to_i
+      end
+
       def scope
         'esi-wallet.read_character_wallet.v1'
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation.rb

@@ -7,7 +7,7 @@ module EveOnline
     class Corporation < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
 
       attr_reader :corporation_id
 

data/lib/eve_online/esi/corporation_blueprints.rb

@@ -3,14 +3,15 @@
 module EveOnline
   module ESI
     class CorporationBlueprints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/corporations/%<corporation_id>s/blueprints/?datasource=%<datasource>s&page=1'
+      API_ENDPOINT = 'https://esi.evetech.net/v2/corporations/%<corporation_id>s/blueprints/?datasource=%<datasource>s&page=%<page>s'
 
-      attr_reader :corporation_id
+      attr_reader :corporation_id, :page
 
       def initialize(options)
         super
 
         @corporation_id = options.fetch(:corporation_id)
+        @page = options.fetch(:page, 1)
       end
 
       def blueprints
@@ -22,12 +23,16 @@ module EveOnline
       end
       memoize :blueprints
 
+      def total_pages
+        resource.headers['x-pages']&.to_i
+      end
+
       def scope
         'esi-corporations.read_blueprints.v1'
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource)
+        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation_industry_jobs.rb

@@ -3,15 +3,16 @@
 module EveOnline
   module ESI
     class CorporationIndustryJobs < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s&page=%<page>s'
 
-      attr_reader :corporation_id, :include_completed
+      attr_reader :corporation_id, :include_completed, :page
 
       def initialize(options)
         super
 
         @corporation_id = options.fetch(:corporation_id)
         @include_completed = options.fetch(:include_completed, false)
+        @page = options.fetch(:page, 1)
       end
 
       def jobs
@@ -23,12 +24,16 @@ module EveOnline
       end
       memoize :jobs
 
+      def total_pages
+        resource.headers['x-pages']&.to_i
+      end
+
       def scope
         'esi-industry.read_corporation_jobs.v1'
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, include_completed: include_completed, datasource: datasource)
+        format(API_ENDPOINT, corporation_id: corporation_id, include_completed: include_completed, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation_killmails_recent.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class CorporationKillmailsRecent < Base
+      API_ENDPOINT = 'https://esi.evetech.net/v1/corporations/%<corporation_id>s/killmails/recent/?datasource=%<datasource>s&page=%<page>s'
+
+      attr_reader :corporation_id, :page
+
+      def initialize(options = {})
+        super
+
+        @corporation_id = options.fetch(:corporation_id)
+        @page = options.fetch(:page, 1)
+      end
+
+      def killmails
+        output = []
+        response.each do |killmail|
+          output << Models::KillmailShort.new(killmail)
+        end
+        output
+      end
+      memoize :killmails
+
+      def total_pages
+        resource.headers['x-pages']&.to_i
+      end
+
+      def scope
+        'esi-killmails.read_corporation_killmails.v1'
+      end
+
+      def url
+        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/corporation_orders.rb

@@ -3,14 +3,15 @@
 module EveOnline
   module ESI
     class CorporationOrders < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/corporations/%<corporation_id>s/orders/?datasource=%<datasource>s&page=1'
+      API_ENDPOINT = 'https://esi.evetech.net/v3/corporations/%<corporation_id>s/orders/?datasource=%<datasource>s&page=%<page>s'
 
-      attr_reader :corporation_id
+      attr_reader :corporation_id, :page
 
       def initialize(options)
         super
 
         @corporation_id = options.fetch(:corporation_id)
+        @page = options.fetch(:page, 1)
       end
 
       def orders
@@ -22,6 +23,10 @@ module EveOnline
       end
       memoize :orders
 
+      def total_pages
+        resource.headers['x-pages']&.to_i
+      end
+
       def scope
         'esi-markets.read_corporation_orders.v1'
       end
@@ -32,7 +37,7 @@ module EveOnline
       # end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource)
+        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/dogma_attribute.rb

@@ -7,7 +7,7 @@ module EveOnline
     class DogmaAttribute < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/dogma/attributes/%<attribute_id>s/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/attributes/%<attribute_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 

data/lib/eve_online/esi/dogma_attributes.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class DogmaAttributes < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/dogma/attributes/?datasource=%<datasource>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/attributes/?datasource=%<datasource>s'
 
       def attributes
         response

data/lib/eve_online/esi/factions.rb

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

data/lib/eve_online/esi/market_history.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class MarketHistory < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/markets/%<region_id>s/history/?datasource=%<datasource>s&type_id=%<type_id>s'
+      API_ENDPOINT = 'https://esi.evetech.net/v1/markets/%<region_id>s/history/?datasource=%<datasource>s&type_id=%<type_id>s'
 
       attr_reader :region_id, :type_id
 

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
 

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class CharacterLocation < Base
+        def as_json
+          {
+            solar_system_id: solar_system_id,
+            station_id: station_id,
+            structure_id: structure_id
+          }
+        end
+
+        def solar_system_id
+          options['solar_system_id']
+        end
+
+        def station_id
+          options['station_id']
+        end
+
+        def structure_id
+          options['structure_id']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class CharacterShip < Base
+        def as_json
+          {
+            ship_item_id: ship_item_id,
+            ship_name: ship_name,
+            ship_type_id: ship_type_id
+          }
+        end
+
+        def ship_item_id
+          options['ship_item_id']
+        end
+
+        def ship_name
+          options['ship_name']
+        end
+
+        def ship_type_id
+          options['ship_type_id']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class Constellation < Base
+        def as_json
+          {
+            constellation_id: constellation_id,
+            name: name,
+            position_x: position_x,
+            position_y: position_y,
+            position_z: position_z,
+            region_id: region_id,
+            systems: systems
+          }
+        end
+
+        def constellation_id
+          options['constellation_id']
+        end
+
+        def name
+          options['name']
+        end
+
+        def position_x
+          options['position']['x'] if options['position']
+        end
+
+        def position_y
+          options['position']['y'] if options['position']
+        end
+
+        def position_z
+          options['position']['z'] if options['position']
+        end
+
+        def region_id
+          options['region_id']
+        end
+
+        def systems
+          options['systems']
+        end
+      end
+    end
+  end
+end