eve_online 0.16.0 → 0.17.0

data/lib/eve_online/esi/character_implants.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterImplants < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/implants/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/implants/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def implants
@@ -22,7 +22,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_industry_jobs.rb

@@ -3,21 +3,21 @@
 module EveOnline
   module ESI
     class CharacterIndustryJobs < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/industry/jobs/?datasource=tranquility&include_completed=%<include_completed>s'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s'
 
       attr_reader :character_id, :include_completed
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
-        @include_completed = options[:include_completed] ? true : false
+        @character_id = options.fetch(:character_id)
+        @include_completed = options.fetch(:include_completed, false)
       end
 
       def jobs
         output = []
         response.each do |job|
-          output << Models::IndustryJob.new(job)
+          output << Models::CharacterIndustryJob.new(job)
         end
         output
       end
@@ -28,7 +28,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id, include_completed: include_completed)
+        format(API_ENDPOINT, character_id: character_id, include_completed: include_completed, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_loyalty_points.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterLoyaltyPoints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/loyalty/points/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/loyalty/points/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def loyalty_points
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_notifications.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterNotifications < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/notifications/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/notifications/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def notifications
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_online.rb

@@ -7,18 +7,18 @@ module EveOnline
     class CharacterOnline < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/online/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/online/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
-      def_delegators :model, :as_json, :online, :last_login, :last_logout,
-                     :logins
+      def_delegators :model, :as_json, :last_login, :last_logout, :logins,
+                     :online
 
       def model
         Models::Online.new(response)
@@ -30,7 +30,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_orders.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterOrders < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/orders/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/orders/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def orders
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_portrait.rb

@@ -7,18 +7,17 @@ module EveOnline
     class CharacterPortrait < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/portrait/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/portrait/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
-      def_delegators :model, :as_json, :tiny, :small, :medium, :large, :huge,
-                     :gigantic
+      def_delegators :model, :as_json, :medium, :large, :huge, :small
 
       def model
         Models::CharacterPortrait.new(response)
@@ -28,7 +27,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_skill_queue.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterSkillQueue < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/skillqueue/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/skillqueue/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def skills
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_skills.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterSkills < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/skills/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/skills/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def as_json
@@ -20,14 +20,6 @@ module EveOnline
         }
       end
 
-      def total_sp
-        response['total_sp']
-      end
-
-      def unallocated_sp
-        response['unallocated_sp']
-      end
-
       def skills
         output = []
         response.fetch('skills').each do |skill|
@@ -37,12 +29,20 @@ module EveOnline
       end
       memoize :skills
 
+      def total_sp
+        response['total_sp']
+      end
+
+      def unallocated_sp
+        response['unallocated_sp']
+      end
+
       def scope
         'esi-skills.read_skills.v1'
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_standings.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterStandings < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/standings/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/standings/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def standings
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_wallet.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterWallet < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/wallet/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/wallet/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def as_json
@@ -28,7 +28,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterWalletJournal < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/characters/%<character_id>s/wallet/journal/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/wallet/journal/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def wallet_journal_entries
@@ -27,7 +27,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, character_id: character_id)
+        format(API_ENDPOINT, character_id: character_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/corporation.rb

@@ -7,20 +7,20 @@ module EveOnline
     class Corporation < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/corporations/%<corporation_id>s/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
 
       attr_reader :corporation_id
 
       def initialize(options)
         super
 
-        @corporation_id = options[:corporation_id]
+        @corporation_id = options.fetch(:corporation_id)
       end
 
-      def_delegators :model, :as_json, :name, :ticker, :member_count, :ceo_id,
-                     :alliance_id, :description, :tax_rate, :date_founded,
-                     :creator_id, :corporation_url, :faction_id,
-                     :home_station_id, :shares
+      def_delegators :model, :as_json, :alliance_id, :ceo_id, :creator_id,
+                     :date_founded, :description, :faction_id,
+                     :home_station_id, :member_count, :name, :shares,
+                     :tax_rate, :ticker, :corporation_url
 
       def model
         Models::Corporation.new(response)
@@ -30,7 +30,7 @@ module EveOnline
       def scope; 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/corporation_blueprints.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CorporationBlueprints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/corporations/%<corporation_id>s/blueprints/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/corporations/%<corporation_id>s/blueprints/?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 blueprints
@@ -27,7 +27,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/corporation_industry_jobs.rb

@@ -3,21 +3,21 @@
 module EveOnline
   module ESI
     class CorporationIndustryJobs < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=tranquility&include_completed=%<include_completed>s'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/corporations/%<corporation_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s'
 
       attr_reader :corporation_id, :include_completed
 
       def initialize(options)
         super
 
-        @corporation_id = options[:corporation_id]
-        @include_completed = options[:include_completed] ? true : false
+        @corporation_id = options.fetch(:corporation_id)
+        @include_completed = options.fetch(:include_completed, false)
       end
 
       def jobs
         output = []
         response.each do |job|
-          output << Models::IndustryJob.new(job)
+          output << Models::CorporationIndustryJob.new(job)
         end
         output
       end
@@ -28,7 +28,7 @@ module EveOnline
       end
 
       def url
-        format(API_ENDPOINT, corporation_id: corporation_id, include_completed: include_completed)
+        format(API_ENDPOINT, corporation_id: corporation_id, include_completed: include_completed, datasource: datasource)
       end
     end
   end