eve_online 0.16.0 → 0.17.0

data/TODO.md

@@ -0,0 +1,4 @@
+# TODO
+
+* Fix MD024
+

data/eve_online.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'mdl'
 
   spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
   spec.add_runtime_dependency 'faraday'

data/lib/eve_online.rb

@@ -50,7 +50,6 @@ require 'eve_online/esi/alliances'
 require 'eve_online/esi/alliance'
 require 'eve_online/esi/alliance_corporations'
 require 'eve_online/esi/alliance_icon'
-require 'eve_online/esi/alliances_names'
 
 require 'eve_online/esi/dogma_attributes'
 require 'eve_online/esi/dogma_attribute'
@@ -71,7 +70,8 @@ require 'eve_online/esi/models/asset'
 require 'eve_online/esi/models/online'
 require 'eve_online/esi/models/attributes'
 require 'eve_online/esi/models/character'
-require 'eve_online/esi/models/industry_job'
+require 'eve_online/esi/models/character_industry_job'
+require 'eve_online/esi/models/corporation_industry_job'
 require 'eve_online/esi/models/character_portrait'
 require 'eve_online/esi/models/character_order'
 require 'eve_online/esi/models/blueprint'

data/lib/eve_online/esi/alliance.rb

@@ -7,19 +7,19 @@ module EveOnline
     class Alliance < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/alliances/%<alliance_id>s/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/alliances/%<alliance_id>s/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
       def initialize(options)
         super
 
-        @alliance_id = options[:alliance_id]
+        @alliance_id = options.fetch(:alliance_id)
       end
 
-      def_delegators :model, :as_json, :name, :ticker, :creator_id,
-                     :creator_corporation_id, :executor_corporation_id,
-                     :date_founded, :faction_id
+      def_delegators :model, :as_json, :creator_corporation_id, :creator_id,
+                     :date_founded, :executor_corporation_id, :faction_id,
+                     :name, :ticker
 
       def model
         Models::Alliance.new(response)
@@ -29,7 +29,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id)
+        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliance_corporations.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class AllianceCorporations < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/%<alliance_id>s/corporations/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/%<alliance_id>s/corporations/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
       def initialize(options)
         super
 
-        @alliance_id = options[:alliance_id]
+        @alliance_id = options.fetch(:alliance_id)
       end
 
       def corporations
@@ -20,7 +20,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id)
+        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliance_icon.rb

@@ -7,14 +7,14 @@ module EveOnline
     class AllianceIcon < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/%<alliance_id>s/icons/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/%<alliance_id>s/icons/?datasource=%<datasource>s'
 
       attr_reader :alliance_id
 
       def initialize(options)
         super
 
-        @alliance_id = options[:alliance_id]
+        @alliance_id = options.fetch(:alliance_id)
       end
 
       def_delegators :model, :as_json, :icon_small, :icon_medium
@@ -27,7 +27,7 @@ module EveOnline
       def scope; end
 
       def url
-        format(API_ENDPOINT, alliance_id: alliance_id)
+        format(API_ENDPOINT, alliance_id: alliance_id, datasource: datasource)
       end
     end
   end

data/lib/eve_online/esi/alliances.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Alliances < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/alliances/?datasource=%<datasource>s'
 
       def alliances
         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/ancestries.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Ancestries < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/ancestries/?datasource=tranquility&language=en-us'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/ancestries/?datasource=%<datasource>s&language=en-us'
 
       def ancestries
         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/base.rb

@@ -10,13 +10,14 @@ module EveOnline
     class Base
       extend Memoist
 
-      attr_reader :token, :parser, :_read_timeout, :_open_timeout
+      attr_reader :token, :parser, :_read_timeout, :_open_timeout, :datasource
 
       def initialize(options = {})
         @token = options[:token]
-        @parser = JSON
+        @parser = options[:parser] || JSON
         @_read_timeout = options[:read_timeout] || 60
         @_open_timeout = options[:open_timeout] || 60
+        @datasource = options[:datasource] || 'tranquility'
       end
 
       def url

data/lib/eve_online/esi/bloodlines.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class Bloodlines < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/bloodlines/?datasource=tranquility&language=en-us'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/universe/bloodlines/?datasource=%<datasource>s&language=en-us'
 
       def bloodlines
         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/character.rb

@@ -7,19 +7,19 @@ module EveOnline
     class Character < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v4/characters/%<character_id>s/?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, :corporation_id, :birthday, :name,
-                     :gender, :race_id, :bloodline_id, :description,
-                     :alliance_id, :ancestry_id, :security_status, :faction_id
+      def_delegators :model, :as_json, :alliance_id, :ancestry_id, :birthday,
+                     :bloodline_id, :corporation_id, :description, :faction_id,
+                     :gender, :name, :race_id, :security_status
 
       def model
         Models::Character.new(response)
@@ -29,7 +29,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_assets.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterAssets < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/characters/%<character_id>s/assets/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/characters/%<character_id>s/assets/?datasource=%<datasource>s&page=1'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def assets
@@ -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_attributes.rb

@@ -7,19 +7,19 @@ module EveOnline
     class CharacterAttributes < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/attributes/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/attributes/?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, :charisma, :intelligence, :memory,
-                     :perception, :willpower, :bonus_remaps,
-                     :last_remap_date, :accrued_remap_cooldown_date
+      def_delegators :model, :as_json, :accrued_remap_cooldown_date,
+                     :bonus_remaps, :charisma, :intelligence, :last_remap_date,
+                     :memory, :perception, :willpower
 
       def model
         Models::Attributes.new(response)
@@ -31,7 +31,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_blueprints.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterBlueprints < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/blueprints/?datasource=tranquility&page=1'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/blueprints/?datasource=%<datasource>s&page=1'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def blueprints
@@ -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_bookmark_folders.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterBookmarkFolders < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/bookmarks/folders/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/bookmarks/folders/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def bookmark_folders
@@ -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_bookmarks.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterBookmarks < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/bookmarks/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v2/characters/%<character_id>s/bookmarks/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def bookmarks
@@ -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_calendar.rb

@@ -3,14 +3,14 @@
 module EveOnline
   module ESI
     class CharacterCalendar < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/calendar/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/calendar/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
+        @character_id = options.fetch(:character_id)
       end
 
       def events
@@ -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_clones.rb

@@ -3,20 +3,14 @@
 module EveOnline
   module ESI
     class CharacterClones < Base
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/characters/%<character_id>s/clones/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v3/characters/%<character_id>s/clones/?datasource=%<datasource>s'
 
       attr_reader :character_id
 
       def initialize(options)
         super
 
-        @character_id = options[:character_id]
-      end
-
-      def last_clone_jump_date
-        last_clone_jump_date = response['last_clone_jump_date']
-
-        parse_datetime_with_timezone(last_clone_jump_date) if last_clone_jump_date
+        @character_id = options.fetch(:character_id)
       end
 
       def home_location
@@ -33,6 +27,12 @@ module EveOnline
       end
       memoize :jump_clones
 
+      def last_clone_jump_date
+        last_clone_jump_date = response['last_clone_jump_date']
+
+        parse_datetime_with_timezone(last_clone_jump_date) if last_clone_jump_date
+      end
+
       def last_station_change_date
         last_station_change_date = response['last_station_change_date']
 
@@ -44,7 +44,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_fatigue.rb

@@ -7,14 +7,14 @@ module EveOnline
     class CharacterFatigue < Base
       extend Forwardable
 
-      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/fatigue/?datasource=tranquility'
+      API_ENDPOINT = 'https://esi.tech.ccp.is/v1/characters/%<character_id>s/fatigue/?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, :jump_fatigue_expire_date,
@@ -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