eve_online 0.20.0 → 0.21.0

data/lib/eve_online/esi/character_location.rb

@@ -21,9 +21,8 @@ module EveOnline
                      :structure_id
 
       def model
-        Models::CharacterLocation.new(response)
+        @model ||= Models::CharacterLocation.new(response)
       end
-      memoize :model
 
       def scope
         'esi-location.read_location.v1'

data/lib/eve_online/esi/character_loyalty_points.rb

@@ -14,13 +14,15 @@ module EveOnline
       end
 
       def loyalty_points
-        output = []
-        response.each do |lp|
-          output << Models::LoyaltyPoint.new(lp)
-        end
-        output
+        @loyalty_points ||=
+          begin
+            output = []
+            response.each do |lp|
+              output << Models::LoyaltyPoint.new(lp)
+            end
+            output
+          end
       end
-      memoize :loyalty_points
 
       def scope
         'esi-characters.read_loyalty.v1'

data/lib/eve_online/esi/character_notifications.rb

@@ -3,6 +3,7 @@
 module EveOnline
   module ESI
     class CharacterNotifications < Base
+      # TODO: migrate to v3 or v4
       API_ENDPOINT = 'https://esi.evetech.net/v2/characters/%<character_id>s/notifications/?datasource=%<datasource>s'
 
       attr_reader :character_id
@@ -14,13 +15,15 @@ module EveOnline
       end
 
       def notifications
-        output = []
-        response.each do |notification|
-          output << Models::Notification.new(notification)
-        end
-        output
+        @notifications ||=
+          begin
+            output = []
+            response.each do |notification|
+              output << Models::Notification.new(notification)
+            end
+            output
+          end
       end
-      memoize :notifications
 
       def scope
         'esi-characters.read_notifications.v1'

data/lib/eve_online/esi/character_online.rb

@@ -21,9 +21,8 @@ module EveOnline
                      :online
 
       def model
-        Models::Online.new(response)
+        @model ||= Models::Online.new(response)
       end
-      memoize :model
 
       def scope
         'esi-location.read_online.v1'

data/lib/eve_online/esi/character_orders.rb

@@ -14,13 +14,15 @@ module EveOnline
       end
 
       def orders
-        output = []
-        response.each do |order|
-          output << Models::CharacterOrder.new(order)
-        end
-        output
+        @orders ||=
+          begin
+            output = []
+            response.each do |order|
+              output << Models::CharacterOrder.new(order)
+            end
+            output
+          end
       end
-      memoize :orders
 
       def scope
         'esi-markets.read_character_orders.v1'

data/lib/eve_online/esi/character_portrait.rb

@@ -20,9 +20,8 @@ module EveOnline
       def_delegators :model, :as_json, :medium, :large, :huge, :small
 
       def model
-        Models::CharacterPortrait.new(response)
+        @model ||= Models::CharacterPortrait.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/character_ship.rb

@@ -20,9 +20,8 @@ module EveOnline
       def_delegators :model, :as_json, :ship_item_id, :ship_name, :ship_type_id
 
       def model
-        Models::CharacterShip.new(response)
+        @model ||= Models::CharacterShip.new(response)
       end
-      memoize :model
 
       def scope
         'esi-location.read_ship_type.v1'

data/lib/eve_online/esi/character_skill_queue.rb

@@ -14,13 +14,15 @@ module EveOnline
       end
 
       def skills
-        output = []
-        response.each do |skill|
-          output << Models::SkillQueueEntry.new(skill)
-        end
-        output
+        @skills ||=
+          begin
+            output = []
+            response.each do |skill|
+              output << Models::SkillQueueEntry.new(skill)
+            end
+            output
+          end
       end
-      memoize :skills
 
       def scope
         'esi-skills.read_skillqueue.v1'

data/lib/eve_online/esi/character_skills.rb

@@ -21,13 +21,15 @@ module EveOnline
       end
 
       def skills
-        output = []
-        response.fetch('skills').each do |skill|
-          output << Models::Skill.new(skill)
-        end
-        output
+        @skills ||=
+          begin
+            output = []
+            response.fetch('skills').each do |skill|
+              output << Models::Skill.new(skill)
+            end
+            output
+          end
       end
-      memoize :skills
 
       def total_sp
         response['total_sp']

data/lib/eve_online/esi/character_standings.rb

@@ -14,13 +14,15 @@ module EveOnline
       end
 
       def standings
-        output = []
-        response.each do |standing|
-          output << Models::Standing.new(standing)
-        end
-        output
+        @standings ||=
+          begin
+            output = []
+            response.each do |standing|
+              output << Models::Standing.new(standing)
+            end
+            output
+          end
       end
-      memoize :standings
 
       def scope
         'esi-characters.read_standings.v1'

data/lib/eve_online/esi/character_wallet_journal.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def wallet_journal_entries
-        output = []
-        response.each do |wallet_journal_entry|
-          output << Models::WalletJournalEntry.new(wallet_journal_entry)
-        end
-        output
+        @wallet_journal_entries ||=
+          begin
+            output = []
+            response.each do |wallet_journal_entry|
+              output << Models::WalletJournalEntry.new(wallet_journal_entry)
+            end
+            output
+          end
       end
-      memoize :wallet_journal_entries
 
       def scope
         'esi-wallet.read_character_wallet.v1'

data/lib/eve_online/esi/corporation.rb

@@ -7,6 +7,8 @@ module EveOnline
     class Corporation < Base
       extend Forwardable
 
+      include ResponseWithEtag
+
       API_ENDPOINT = 'https://esi.evetech.net/v4/corporations/%<corporation_id>s/?datasource=%<datasource>s'
 
       attr_reader :corporation_id
@@ -17,15 +19,15 @@ module EveOnline
         @corporation_id = options.fetch(:corporation_id)
       end
 
+      # TODO: war_eligible
       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
+                     :tax_rate, :ticker, :corporation_url, :etag
 
       def model
-        Models::Corporation.new(response)
+        @model ||= Models::Corporation.new(response_with_etag)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/corporation_blueprints.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def blueprints
-        output = []
-        response.each do |blueprint|
-          output << Models::Blueprint.new(blueprint)
-        end
-        output
+        @blueprints ||=
+          begin
+            output = []
+            response.each do |blueprint|
+              output << Models::Blueprint.new(blueprint)
+            end
+            output
+          end
       end
-      memoize :blueprints
 
       def scope
         'esi-corporations.read_blueprints.v1'

data/lib/eve_online/esi/corporation_industry_jobs.rb

@@ -16,13 +16,15 @@ module EveOnline
       end
 
       def jobs
-        output = []
-        response.each do |job|
-          output << Models::CorporationIndustryJob.new(job)
-        end
-        output
+        @jobs ||=
+          begin
+            output = []
+            response.each do |job|
+              output << Models::CorporationIndustryJob.new(job)
+            end
+            output
+          end
       end
-      memoize :jobs
 
       def scope
         'esi-industry.read_corporation_jobs.v1'

data/lib/eve_online/esi/corporation_killmails_recent.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def killmails
-        output = []
-        response.each do |killmail|
-          output << Models::KillmailShort.new(killmail)
-        end
-        output
+        @killmails ||=
+          begin
+            output = []
+            response.each do |killmail|
+              output << Models::KillmailShort.new(killmail)
+            end
+            output
+          end
       end
-      memoize :killmails
 
       def scope
         'esi-killmails.read_corporation_killmails.v1'

data/lib/eve_online/esi/corporation_orders.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def orders
-        output = []
-        response.each do |order|
-          output << Models::CorporationOrder.new(order)
-        end
-        output
+        @orders ||=
+          begin
+            output = []
+            response.each do |order|
+              output << Models::CorporationOrder.new(order)
+            end
+            output
+          end
       end
-      memoize :orders
 
       def scope
         'esi-markets.read_corporation_orders.v1'

data/lib/eve_online/esi/dogma_attribute.rb

@@ -22,9 +22,8 @@ module EveOnline
                      :name, :published, :stackable, :unit_id
 
       def model
-        Models::DogmaAttribute.new(response)
+        @model ||= Models::DogmaAttribute.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/dogma_effect.rb

@@ -27,9 +27,8 @@ module EveOnline
                      :tracking_speed_attribute_id, :modifiers
 
       def model
-        Models::DogmaEffect.new(response)
+        @model ||= Models::DogmaEffect.new(response)
       end
-      memoize :model
 
       def scope; end
 

data/lib/eve_online/esi/market_history.rb

@@ -15,13 +15,15 @@ module EveOnline
       end
 
       def history
-        output = []
-        response.each do |history|
-          output << Models::MarketHistory.new(history)
-        end
-        output
+        @history ||=
+          begin
+            output = []
+            response.each do |history|
+              output << Models::MarketHistory.new(history)
+            end
+            output
+          end
       end
-      memoize :history
 
       def scope; end
 

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

@@ -4,6 +4,8 @@ module EveOnline
   module ESI
     module Models
       class Alliance < Base
+        include ModelWithEtag
+
         def as_json
           {
             creator_corporation_id: creator_corporation_id,
@@ -12,7 +14,8 @@ module EveOnline
             executor_corporation_id: executor_corporation_id,
             faction_id: faction_id,
             name: name,
-            ticker: ticker
+            ticker: ticker,
+            etag: etag
           }
         end
 

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

@@ -4,6 +4,8 @@ module EveOnline
   module ESI
     module Models
       class Corporation < Base
+        include ModelWithEtag
+
         def as_json
           {
             alliance_id: alliance_id,
@@ -18,7 +20,8 @@ module EveOnline
             shares: shares,
             tax_rate: tax_rate,
             ticker: ticker,
-            corporation_url: corporation_url
+            corporation_url: corporation_url,
+            etag: etag
           }
         end
 

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      module ModelWithEtag
+        def etag
+          options['etag']
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module EveOnline
   module ESI
     module Models
       class Star < Base
+        include ModelWithEtag
+
         def as_json
           {
             age: age,
@@ -13,7 +15,8 @@ module EveOnline
             solar_system_id: solar_system_id,
             spectral_class: spectral_class,
             temperature: temperature,
-            type_id: type_id
+            type_id: type_id,
+            etag: etag
           }
         end