eve_online 0.16.0 → 0.17.0

data/lib/eve_online/esi/corporation_orders.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CorporationOrders < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/corporations/%<corporation_id>s/orders/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/corporations/%<corporation_id>s/orders/?datasource=%<datasource>s&page=1'
 
       attr_reader :corporation_id
 
       def initialize(options)
         super
 
-        @corporation_id = options[:corporation_id]
+        @corporation_id = options.fetch(:corporation_id)
       end
 
       def orders
@@ -32,7 +32,7 @@ module EveOnline
       # end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id)
+        format(API_ENDPOINT, corporation_id: corporation_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/dogma_attribute.rb

@@ -7,19 +7,19 @@ module EveOnline
     class DogmaAttribute < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/dogma/attributes/%<attribute_id>s/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/dogma/attributes/%<attribute_id>s/?datasource=%<datasource>s'
 
-      attr_reader :attribute_id
+      attr_reader :id
 
       def initialize(options)
         super
 
-        @attribute_id = options[:attribute_id]
+        @id = options.fetch(:id)
       end
 
-      def_delegators :model, :as_json, :id, :name, :description, :icon_id,
-                     :default_value, :published, :display_name, :unit_id,
-                     :stackable, :high_is_good
+      def_delegators :model, :as_json, :attribute_id, :default_value,
+                     :description, :display_name, :high_is_good, :icon_id,
+                     :name, :published, :stackable, :unit_id
 
       def model
         Models::DogmaAttribute.new(response)
@@ -29,7 +29,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, attribute_id: attribute_id)
+        format(API_ENDPOINT, 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.tech.ccp.is/v1/dogma/attributes/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/dogma/attributes/?datasource=%<datasource>s'
 
       def attributes
         response
@@ -12,7 +12,7 @@ module EveOnline
       def scope; end
 
       def url
-        API_ENDPOINT
+        format(API_ENDPOINT, datasource: datasource)
       end
     end
   end

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=tranquility&language=en-us'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/universe/factions/?datasource=%<datasource>s&language=en-us'
 
       def factions
         output = []
@@ -17,7 +17,7 @@ module EveOnline
       def scope; end
 
       def url
-        API_ENDPOINT
+        format(API_ENDPOINT, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/market_history.rb

@@ -3,15 +3,15 @@
 module EveOnline
   module ESI
     class MarketHistory < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/markets/%<region_id>s/history/?datasource=tranquility&type_id=%<type_id>s'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/markets/%<region_id>s/history/?datasource=%<datasource>s&type_id=%<type_id>s'
 
       attr_reader :region_id, :type_id
 
       def initialize(options)
         super
 
-        @region_id = options[:region_id]
-        @type_id = options[:type_id]
+        @region_id = options.fetch(:region_id)
+        @type_id = options.fetch(:type_id)
       end
 
       def history
@@ -26,7 +26,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, region_id: region_id, type_id: type_id)
+        format(API_ENDPOINT, region_id: region_id, type_id: type_id, datasource: datasource)
       end
     end
   end

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

@@ -6,44 +6,44 @@ module EveOnline
       class Alliance < Base
         def as_json
           {
-            name: name,
-            ticker: ticker,
-            creator_id: creator_id,
             creator_corporation_id: creator_corporation_id,
-            executor_corporation_id: executor_corporation_id,
+            creator_id: creator_id,
             date_founded: date_founded,
-            faction_id: faction_id
+            executor_corporation_id: executor_corporation_id,
+            faction_id: faction_id,
+            name: name,
+            ticker: ticker
           }
         end
 
-        def name
-          options['name']
-        end
-
-        def ticker
-          options['ticker']
+        def creator_corporation_id
+          options['creator_corporation_id']
         end
 
         def creator_id
           options['creator_id']
         end
 
-        def creator_corporation_id
-          options['creator_corporation_id']
+        def date_founded
+          date_founded = options['date_founded']
+
+          parse_datetime_with_timezone(date_founded) if date_founded
         end
 
         def executor_corporation_id
           options['executor_corporation_id']
         end
 
-        def date_founded
-          date_founded = options['date_founded']
+        def faction_id
+          options['faction_id']
+        end
 
-          parse_datetime_with_timezone(date_founded) if date_founded
+        def name
+          options['name']
         end
 
-        def faction_id
-          options['faction_id']
+        def ticker
+          options['ticker']
         end
       end
     end

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

@@ -6,18 +6,18 @@ module EveOnline
       class AllianceIcon < Base
         def as_json
           {
+            icon_medium: icon_medium,
             icon_small: icon_small,
-            icon_medium: icon_medium
           }
         end
 
-        def icon_small
-          options['px64x64']
-        end
-
         def icon_medium
           options['px128x128']
         end
+
+        def icon_small
+          options['px64x64']
+        end
       end
     end
   end

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

@@ -6,23 +6,15 @@ module EveOnline
       class Ancestry < Base
         def as_json
           {
-            ancestry_id: ancestry_id,
-            name: name,
             bloodline_id: bloodline_id,
             description: description,
-            short_description: short_description,
-            icon_id: icon_id
+            icon_id: icon_id,
+            ancestry_id: ancestry_id,
+            name: name,
+            short_description: short_description
           }
         end
 
-        def ancestry_id
-          options['id']
-        end
-
-        def name
-          options['name']
-        end
-
         def bloodline_id
           options['bloodline_id']
         end
@@ -31,13 +23,21 @@ module EveOnline
           options['description']
         end
 
-        def short_description
-          options['short_description']
-        end
-
         def icon_id
           options['icon_id']
         end
+
+        def ancestry_id
+          options['id']
+        end
+
+        def name
+          options['name']
+        end
+
+        def short_description
+          options['short_description']
+        end
       end
     end
   end

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

@@ -6,22 +6,31 @@ module EveOnline
       class Asset < Base
         def as_json
           {
-            type_id: type_id,
-            quantity: quantity,
-            location_id: location_id,
-            location_type: location_type,
+            is_blueprint_copy: is_blueprint_copy,
+            is_singleton: is_singleton,
             item_id: item_id,
             location_flag: location_flag,
-            is_singleton: is_singleton
+            location_id: location_id,
+            location_type: location_type,
+            quantity: quantity,
+            type_id: type_id
           }
         end
 
-        def type_id
-          options['type_id']
+        def is_blueprint_copy
+          options['is_blueprint_copy']
         end
 
-        def quantity
-          options['quantity']
+        def is_singleton
+          options['is_singleton']
+        end
+
+        def item_id
+          options['item_id']
+        end
+
+        def location_flag
+          options['location_flag']
         end
 
         def location_id
@@ -32,16 +41,12 @@ module EveOnline
           options['location_type']
         end
 
-        def item_id
-          options['item_id']
-        end
-
-        def location_flag
-          options['location_flag']
+        def quantity
+          options['quantity']
         end
 
-        def is_singleton
-          options['is_singleton']
+        def type_id
+          options['type_id']
         end
       end
     end

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

@@ -6,17 +6,27 @@ module EveOnline
       class Attributes < Base
         def as_json
           {
+            accrued_remap_cooldown_date: accrued_remap_cooldown_date,
+            bonus_remaps: bonus_remaps,
             charisma: charisma,
             intelligence: intelligence,
+            last_remap_date: last_remap_date,
             memory: memory,
             perception: perception,
-            willpower: willpower,
-            bonus_remaps: bonus_remaps,
-            last_remap_date: last_remap_date,
-            accrued_remap_cooldown_date: accrued_remap_cooldown_date
+            willpower: willpower
           }
         end
 
+        def accrued_remap_cooldown_date
+          accrued_remap_cooldown_date = options['accrued_remap_cooldown_date']
+
+          parse_datetime_with_timezone(accrued_remap_cooldown_date) if accrued_remap_cooldown_date
+        end
+
+        def bonus_remaps
+          options['bonus_remaps']
+        end
+
         def charisma
           options['charisma']
         end
@@ -25,6 +35,12 @@ module EveOnline
           options['intelligence']
         end
 
+        def last_remap_date
+          last_remap_date = options['last_remap_date']
+
+          parse_datetime_with_timezone(last_remap_date) if last_remap_date
+        end
+
         def memory
           options['memory']
         end
@@ -36,22 +52,6 @@ module EveOnline
         def willpower
           options['willpower']
         end
-
-        def bonus_remaps
-          options['bonus_remaps']
-        end
-
-        def last_remap_date
-          last_remap_date = options['last_remap_date']
-
-          parse_datetime_with_timezone(last_remap_date) if last_remap_date
-        end
-
-        def accrued_remap_cooldown_date
-          accrued_remap_cooldown_date = options['accrued_remap_cooldown_date']
-
-          parse_datetime_with_timezone(accrued_remap_cooldown_date) if accrued_remap_cooldown_date
-        end
       end
     end
   end

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

@@ -7,16 +7,16 @@ module EveOnline
         def as_json
           {
             bloodline_id: bloodline_id,
-            name: name,
+            charisma: charisma,
+            corporation_id: corporation_id,
             description: description,
+            intelligence: intelligence,
+            memory: memory,
+            name: name,
+            perception: perception,
             race_id: race_id,
             ship_type_id: ship_type_id,
-            corporation_id: corporation_id,
-            perception: perception,
-            willpower: willpower,
-            charisma: charisma,
-            memory: memory,
-            intelligence: intelligence
+            willpower: willpower
           }
         end
 
@@ -24,44 +24,44 @@ module EveOnline
           options['bloodline_id']
         end
 
-        def name
-          options['name']
+        def charisma
+          options['charisma']
+        end
+
+        def corporation_id
+          options['corporation_id']
         end
 
         def description
           options['description']
         end
 
-        def race_id
-          options['race_id']
+        def intelligence
+          options['intelligence']
         end
 
-        def ship_type_id
-          options['ship_type_id']
+        def memory
+          options['memory']
         end
 
-        def corporation_id
-          options['corporation_id']
+        def name
+          options['name']
         end
 
         def perception
           options['perception']
         end
 
-        def willpower
-          options['willpower']
-        end
-
-        def charisma
-          options['charisma']
+        def race_id
+          options['race_id']
         end
 
-        def memory
-          options['memory']
+        def ship_type_id
+          options['ship_type_id']
         end
 
-        def intelligence
-          options['intelligence']
+        def willpower
+          options['willpower']
         end
       end
     end