eve_online 0.23.0 → 0.24.0

data/lib/eve_online/esi/character_wallet.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterWallet < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/characters/%<character_id>s/wallet/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/wallet/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
@@ -28,7 +28,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterWalletJournal < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v5/characters/%<character_id>s/wallet/journal/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v5/characters/%<character_id>s/wallet/journal/?datasource=%<datasource>s&page=%<page>s'
 
       attr_reader :character_id, :page
 
@@ -30,7 +30,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id, datasource: datasource, page: page)
+        format("#{ API_HOST }#{ API_PATH }", 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.evetech.net/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
 
       attr_reader :corporation_id
 
@@ -29,7 +29,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", corporation_id: corporation_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/corporation_blueprints.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CorporationBlueprints < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v2/corporations/%<corporation_id>s/blueprints/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v2/corporations/%<corporation_id>s/blueprints/?datasource=%<datasource>s&page=%<page>s'
 
       attr_reader :corporation_id, :page
 
@@ -30,7 +30,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
+        format("#{ API_HOST }#{ API_PATH }", corporation_id: corporation_id, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation_industry_jobs.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CorporationIndustryJobs < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s&page=%<page>s'
+      API_PATH = '/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s&page=%<page>s'
 
       attr_reader :corporation_id, :include_completed, :page
 
@@ -31,7 +31,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, include_completed: include_completed, datasource: datasource, page: page)
+        format("#{ API_HOST }#{ API_PATH }", corporation_id: corporation_id, include_completed: include_completed, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation_killmails_recent.rb

@@ -3,7 +3,7 @@
 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'
+      API_PATH = '/v1/corporations/%<corporation_id>s/killmails/recent/?datasource=%<datasource>s&page=%<page>s'
 
       attr_reader :corporation_id, :page
 
@@ -30,7 +30,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
+        format("#{ API_HOST }#{ API_PATH }", corporation_id: corporation_id, datasource: datasource, page: page)
       end
     end
   end

data/lib/eve_online/esi/corporation_orders.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CorporationOrders < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v3/corporations/%<corporation_id>s/orders/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v3/corporations/%<corporation_id>s/orders/?datasource=%<datasource>s&page=%<page>s'
 
       attr_reader :corporation_id, :page
 
@@ -35,7 +35,7 @@ module EveOnline
       # end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource, page: page)
+        format("#{ API_HOST }#{ API_PATH }", 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.evetech.net/v1/dogma/attributes/%<attribute_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v1/dogma/attributes/%<attribute_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 
@@ -28,7 +28,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, attribute_id: id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", attribute_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/dogma_attributes.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class DogmaAttributes < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/attributes/?datasource=%<datasource>s'
+      API_PATH = '/v1/dogma/attributes/?datasource=%<datasource>s'
 
       def attribute_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/dogma_effect.rb

@@ -7,7 +7,7 @@ module EveOnline
     class DogmaEffect < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v2/dogma/effects/%<effect_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v2/dogma/effects/%<effect_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 
@@ -33,7 +33,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, effect_id: id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", effect_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/dogma_effects.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class DogmaEffects < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/dogma/effects/?datasource=%<datasource>s'
+      API_PATH = '/v1/dogma/effects/?datasource=%<datasource>s'
 
       def effect_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/market_history.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class MarketHistory < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/markets/%<region_id>s/history/?datasource=%<datasource>s&type_id=%<type_id>s'
+      API_PATH = '/v1/markets/%<region_id>s/history/?datasource=%<datasource>s&type_id=%<type_id>s'
 
       attr_reader :region_id, :type_id
 
@@ -28,7 +28,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, region_id: region_id, type_id: type_id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", region_id: region_id, type_id: type_id, datasource: datasource)
       end
     end
   end

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

@@ -7,9 +7,6 @@ module EveOnline
         def as_json
           {
             bookmark_id: bookmark_id,
-            coordinate_x: coordinate_x,
-            coordinate_y: coordinate_y,
-            coordinate_z: coordinate_z,
             created: created,
             creator_id: creator_id,
             folder_id: folder_id,
@@ -25,18 +22,6 @@ module EveOnline
           options['bookmark_id']
         end
 
-        def coordinate_x
-          options['coordinates']['x'] if options['coordinates']
-        end
-
-        def coordinate_y
-          options['coordinates']['y'] if options['coordinates']
-        end
-
-        def coordinate_z
-          options['coordinates']['z'] if options['coordinates']
-        end
-
         def created
           created = options['created']
 
@@ -51,6 +36,7 @@ module EveOnline
           options['folder_id']
         end
 
+        # TODO: extract to class Item
         def item_id
           options['item']['item_id'] if options['item']
         end
@@ -70,6 +56,10 @@ module EveOnline
         def notes
           options['notes']
         end
+
+        def coordinates
+          @coordinates ||= Coordinates.new(options['coordinates'])
+        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class Coordinates < Base
+        def as_json
+          {
+            x: x,
+            y: y,
+            z: z
+          }
+        end
+
+        # TODO: check 'options && '
+        def x
+          options && options['x']
+        end
+
+        def y
+          options && options['y']
+        end
+
+        def z
+          options && options['z']
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,6 @@ module EveOnline
       class JumpClone < Base
         def as_json
           {
-            implants: implants,
             jump_clone_id: jump_clone_id,
             location_id: location_id,
             location_type: location_type,
@@ -14,7 +13,7 @@ module EveOnline
           }
         end
 
-        def implants
+        def implant_ids
           options['implants']
         end
 

data/lib/eve_online/esi/server_status.rb

@@ -7,7 +7,7 @@ module EveOnline
     class ServerStatus < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v1/status/?datasource=%<datasource>s'
+      API_PATH = '/v1/status/?datasource=%<datasource>s'
 
       def_delegators :model, :as_json, :players, :server_version, :start_time, :vip
 
@@ -18,7 +18,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_ancestries.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class UniverseAncestries < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/ancestries/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/ancestries/?datasource=%<datasource>s'
 
       def ancestries
         @ancestries ||=
@@ -19,7 +19,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_asteroid_belt.rb

@@ -7,7 +7,7 @@ module EveOnline
     class UniverseAsteroidBelt < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/asteroid_belts/%<asteroid_belt_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/asteroid_belts/%<asteroid_belt_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 
@@ -26,7 +26,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, asteroid_belt_id: id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", asteroid_belt_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_bloodlines.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class UniverseBloodlines < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/bloodlines/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/bloodlines/?datasource=%<datasource>s'
 
       def bloodlines
         @bloodlines ||=
@@ -19,7 +19,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_categories.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class UniverseCategories < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/categories/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/categories/?datasource=%<datasource>s'
 
       def category_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_category.rb

@@ -7,7 +7,7 @@ module EveOnline
     class UniverseCategory < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/categories/%<category_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/categories/%<category_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 
@@ -27,7 +27,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, category_id: id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", category_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_constellation.rb

@@ -7,7 +7,7 @@ module EveOnline
     class UniverseConstellation < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/constellations/%<constellation_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/constellations/%<constellation_id>s/?datasource=%<datasource>s'
 
       attr_reader :id
 
@@ -27,7 +27,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, constellation_id: id, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", constellation_id: id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/universe_constellations.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class UniverseConstellations < Base
-      API_ENDPOINT = 'https://esi.evetech.net/v1/universe/constellations/?datasource=%<datasource>s'
+      API_PATH = '/v1/universe/constellations/?datasource=%<datasource>s'
 
       def constellation_ids
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, datasource: datasource)
+        format("#{ API_HOST }#{ API_PATH }", datasource: datasource)
       end
     end
   end