eve_online 0.27.0 → 0.28.0

data/lib/eve_online/esi/character_bookmark_folders.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterBookmarkFolders < Base
-      API_PATH = '/v2/characters/%<character_id>s/bookmarks/folders/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v2/characters/%<character_id>s/bookmarks/folders/'
 
       attr_reader :character_id, :page
 
@@ -29,8 +29,12 @@ module EveOnline
         'esi-bookmarks.read_character_bookmarks.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource, page: page)
+      def additation_query_params
+        [:page]
+      end
+
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_bookmarks.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterBookmarks < Base
-      API_PATH = '/v2/characters/%<character_id>s/bookmarks/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v2/characters/%<character_id>s/bookmarks/'
 
       attr_reader :character_id, :page
 
@@ -29,8 +29,12 @@ module EveOnline
         'esi-bookmarks.read_character_bookmarks.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource, page: page)
+      def additation_query_params
+        [:page]
+      end
+
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_calendar.rb

@@ -3,16 +3,15 @@
 module EveOnline
   module ESI
     class CharacterCalendar < Base
-      API_PATH = '/v1/characters/%<character_id>s/calendar/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/calendar/'
 
-      attr_reader :character_id
+      attr_reader :character_id, :from_event
 
       def initialize(options)
         super
 
         @character_id = options.fetch(:character_id)
-        # TODO:
-        # @from_event =
+        @from_event = options.fetch(:from_event, nil)
       end
 
       def events
@@ -30,8 +29,12 @@ module EveOnline
         'esi-calendar.read_calendar_events.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def additation_query_params
+        [:from_event]
+      end
+
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_calendar_event.rb

@@ -5,7 +5,7 @@ module EveOnline
     class CharacterCalendarEvent < Base
       extend Forwardable
 
-      API_PATH = '/v3/characters/%<character_id>s/calendar/%<event_id>s/?datasource=%<datasource>s'
+      API_PATH = '/v3/characters/%<character_id>s/calendar/%<event_id>s/'
 
       attr_reader :character_id, :event_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-calendar.read_calendar_events.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, event_id: event_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id, event_id: event_id)
       end
     end
   end

data/lib/eve_online/esi/character_clones.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterClones < Base
-      API_PATH = '/v3/characters/%<character_id>s/clones/?datasource=%<datasource>s'
+      API_PATH = '/v3/characters/%<character_id>s/clones/'
 
       attr_reader :character_id
 
@@ -44,8 +44,8 @@ module EveOnline
         'esi-clones.read_clones.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_corporation_history.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterCorporationHistory < Base
-      API_PATH = '/v1/characters/%<character_id>s/corporationhistory/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/corporationhistory/'
 
       attr_reader :character_id
 
@@ -26,8 +26,8 @@ module EveOnline
 
       def scope; end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_fatigue.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterFatigue < Base
       extend Forwardable
 
-      API_PATH = '/v1/characters/%<character_id>s/fatigue/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/fatigue/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-characters.read_fatigue.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_implants.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterImplants < Base
-      API_PATH = '/v1/characters/%<character_id>s/implants/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/implants/'
 
       attr_reader :character_id
 
@@ -21,8 +21,8 @@ module EveOnline
         'esi-clones.read_implants.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_industry_jobs.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterIndustryJobs < Base
-      API_PATH = '/v1/characters/%<character_id>s/industry/jobs/?datasource=%<datasource>s&include_completed=%<include_completed>s'
+      API_PATH = '/v1/characters/%<character_id>s/industry/jobs/'
 
       attr_reader :character_id, :include_completed
 
@@ -11,7 +11,7 @@ module EveOnline
         super
 
         @character_id = options.fetch(:character_id)
-        @include_completed = options.fetch(:include_completed, false)
+        @include_completed = options.fetch(:include_completed, nil)
       end
 
       def jobs
@@ -29,8 +29,12 @@ module EveOnline
         'esi-industry.read_character_jobs.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, include_completed: include_completed, datasource: datasource)
+      def additation_query_params
+        [:include_completed]
+      end
+
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_killmails_recent.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterKillmailsRecent < Base
-      API_PATH = '/v1/characters/%<character_id>s/killmails/recent/?datasource=%<datasource>s&page=%<page>s'
+      API_PATH = '/v1/characters/%<character_id>s/killmails/recent/'
 
       attr_reader :character_id, :page
 
@@ -29,8 +29,12 @@ module EveOnline
         'esi-killmails.read_killmails.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource, page: page)
+      def additation_query_params
+        [:page]
+      end
+
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_location.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterLocation < Base
       extend Forwardable
 
-      API_PATH = '/v1/characters/%<character_id>s/location/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/location/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-location.read_location.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_loyalty_points.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterLoyaltyPoints < Base
-      API_PATH = '/v1/characters/%<character_id>s/loyalty/points/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/loyalty/points/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-characters.read_loyalty.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_notifications.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterNotifications < Base
-      API_PATH = '/v5/characters/%<character_id>s/notifications/?datasource=%<datasource>s'
+      API_PATH = '/v5/characters/%<character_id>s/notifications/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-characters.read_notifications.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_online.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterOnline < Base
       extend Forwardable
 
-      API_PATH = '/v2/characters/%<character_id>s/online/?datasource=%<datasource>s'
+      API_PATH = '/v2/characters/%<character_id>s/online/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-location.read_online.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_orders.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterOrders < Base
-      API_PATH = '/v2/characters/%<character_id>s/orders/?datasource=%<datasource>s'
+      API_PATH = '/v2/characters/%<character_id>s/orders/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-markets.read_character_orders.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_portrait.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterPortrait < Base
       extend Forwardable
 
-      API_PATH = '/v2/characters/%<character_id>s/portrait/?datasource=%<datasource>s'
+      API_PATH = '/v2/characters/%<character_id>s/portrait/'
 
       attr_reader :character_id
 
@@ -25,8 +25,8 @@ module EveOnline
 
       def scope; end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_ship.rb

@@ -7,7 +7,7 @@ module EveOnline
     class CharacterShip < Base
       extend Forwardable
 
-      API_PATH = '/v1/characters/%<character_id>s/ship/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/ship/'
 
       attr_reader :character_id
 
@@ -27,8 +27,8 @@ module EveOnline
         'esi-location.read_ship_type.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_skill_queue.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterSkillQueue < Base
-      API_PATH = '/v2/characters/%<character_id>s/skillqueue/?datasource=%<datasource>s'
+      API_PATH = '/v2/characters/%<character_id>s/skillqueue/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-skills.read_skillqueue.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_skills.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterSkills < Base
-      API_PATH = '/v4/characters/%<character_id>s/skills/?datasource=%<datasource>s'
+      API_PATH = '/v4/characters/%<character_id>s/skills/'
 
       attr_reader :character_id
 
@@ -43,8 +43,8 @@ module EveOnline
         'esi-skills.read_skills.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_standings.rb

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     class CharacterStandings < Base
-      API_PATH = '/v1/characters/%<character_id>s/standings/?datasource=%<datasource>s'
+      API_PATH = '/v1/characters/%<character_id>s/standings/'
 
       attr_reader :character_id
 
@@ -28,8 +28,8 @@ module EveOnline
         'esi-characters.read_standings.v1'
       end
 
-      def url
-        format("#{ API_HOST }#{ API_PATH }", character_id: character_id, datasource: datasource)
+      def path
+        format("#{ API_PATH }", character_id: character_id)
       end
     end
   end

data/lib/eve_online/esi/character_wallet.rb

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