eve_online 0.30.0 → 0.35.0

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

@@ -12,7 +12,7 @@ module EveOnline
             sender_type: sender_type,
             text: text,
             timestamp: timestamp,
-            type: type,
+            type: type
           }
         end
 

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

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             quantity: quantity,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

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

@@ -9,7 +9,7 @@ module EveOnline
             last_login: last_login,
             last_logout: last_logout,
             logins: logins,
-            online: online,
+            online: online
           }
         end
 

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

@@ -9,7 +9,7 @@ module EveOnline
             name: name,
             planet_id: planet_id,
             system_id: system_id,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

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

@@ -6,7 +6,7 @@ module EveOnline
       class PlanetShort < Base
         def as_json
           {
-            planet_id: planet_id,
+            planet_id: planet_id
           }
         end
 

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

@@ -8,7 +8,7 @@ module EveOnline
           {
             x: x,
             y: y,
-            z: z,
+            z: z
           }
         end
 

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class PublicContract < Base
+        def as_json
+          {
+            buyout: buyout,
+            collateral: collateral,
+            contract_id: contract_id,
+            date_expired: date_expired,
+            date_issued: date_issued,
+            days_to_complete: days_to_complete,
+            end_location_id: end_location_id,
+            for_corporation: for_corporation,
+            issuer_corporation_id: issuer_corporation_id,
+            issuer_id: issuer_id,
+            price: price,
+            reward: reward,
+            start_location_id: start_location_id,
+            title: title,
+            type: type,
+            volume: volume
+          }
+        end
+
+        def buyout
+          options["buyout"]
+        end
+
+        def collateral
+          options["collateral"]
+        end
+
+        def contract_id
+          options["contract_id"]
+        end
+
+        def date_expired
+          date_expired = options["date_expired"]
+
+          parse_datetime_with_timezone(date_expired) if date_expired
+        end
+
+        def date_issued
+          date_issued = options["date_issued"]
+
+          parse_datetime_with_timezone(date_issued) if date_issued
+        end
+
+        def days_to_complete
+          options["days_to_complete"]
+        end
+
+        def end_location_id
+          options["end_location_id"]
+        end
+
+        def for_corporation
+          options["for_corporation"]
+        end
+
+        def issuer_corporation_id
+          options["issuer_corporation_id"]
+        end
+
+        def issuer_id
+          options["issuer_id"]
+        end
+
+        def price
+          options["price"]
+        end
+
+        def reward
+          options["reward"]
+        end
+
+        def start_location_id
+          options["start_location_id"]
+        end
+
+        def title
+          options["title"]
+        end
+
+        def type
+          options["type"]
+        end
+
+        def volume
+          options["volume"]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class PublicContractItem < Base
+        def as_json
+          {
+            is_blueprint_copy: is_blueprint_copy,
+            is_included: is_included,
+            item_id: item_id,
+            material_efficiency: material_efficiency,
+            quantity: quantity,
+            record_id: record_id,
+            runs: runs,
+            time_efficiency: time_efficiency,
+            type_id: type_id
+          }
+        end
+
+        def is_blueprint_copy
+          options["is_blueprint_copy"]
+        end
+
+        def is_included
+          options["is_included"]
+        end
+
+        def item_id
+          options["item_id"]
+        end
+
+        def material_efficiency
+          options["material_efficiency"]
+        end
+
+        def quantity
+          options["quantity"]
+        end
+
+        def record_id
+          options["record_id"]
+        end
+
+        def runs
+          options["runs"]
+        end
+
+        def time_efficiency
+          options["time_efficiency"]
+        end
+
+        def type_id
+          options["type_id"]
+        end
+      end
+    end
+  end
+end

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

@@ -6,14 +6,14 @@ module EveOnline
       class Race < Base
         def as_json
           {
-            alliance_id: alliance_id,
+            faction_id: faction_id,
             description: description,
             name: name,
-            race_id: race_id,
+            race_id: race_id
           }
         end
 
-        def alliance_id
+        def faction_id
           options["alliance_id"]
         end
 

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

@@ -6,17 +6,12 @@ module EveOnline
       class Region < Base
         def as_json
           {
-            constellations: constellations, # TODO: rename constellations -> constellation_ids and remove from as_json
             description: description,
             name: name,
-            region_id: region_id,
+            region_id: region_id
           }
         end
 
-        def constellations
-          options["constellations"]
-        end
-
         def description
           options["description"]
         end
@@ -28,6 +23,10 @@ module EveOnline
         def region_id
           options["region_id"]
         end
+
+        def constellation_ids
+          options["constellations"]
+        end
       end
     end
   end

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

@@ -9,7 +9,7 @@ module EveOnline
             players: players,
             server_version: server_version,
             start_time: start_time,
-            vip: vip,
+            vip: vip
           }
         end
 

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

@@ -9,7 +9,7 @@ module EveOnline
             active_skill_level: active_skill_level,
             skill_id: skill_id,
             skillpoints_in_skill: skillpoints_in_skill,
-            trained_skill_level: trained_skill_level,
+            trained_skill_level: trained_skill_level
           }
         end
 

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

@@ -13,7 +13,7 @@ module EveOnline
             queue_position: queue_position,
             skill_id: skill_id,
             start_date: start_date,
-            training_start_sp: training_start_sp,
+            training_start_sp: training_start_sp
           }
         end
 

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

@@ -8,7 +8,7 @@ module EveOnline
           {
             from_id: from_id,
             from_type: from_type,
-            standing: standing,
+            standing: standing
           }
         end
 

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

@@ -13,7 +13,7 @@ module EveOnline
             solar_system_id: solar_system_id,
             spectral_class: spectral_class,
             temperature: temperature,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

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

@@ -10,6 +10,8 @@ module EveOnline
             stargate_id: stargate_id,
             system_id: system_id,
             type_id: type_id,
+            destination_stargate_id: destination_stargate_id,
+            destination_system_id: destination_system_id
           }
         end
 
@@ -29,8 +31,12 @@ module EveOnline
           options["type_id"]
         end
 
-        def destination
-          @destination ||= StargateDestination.new(options["destination"])
+        def destination_stargate_id
+          options.dig("destination", "stargate_id")
+        end
+
+        def destination_system_id
+          options.dig("destination", "system_id")
         end
 
         def position

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

@@ -16,7 +16,7 @@ module EveOnline
             services: services,
             station_id: station_id,
             system_id: system_id,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

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

@@ -11,7 +11,7 @@ module EveOnline
             security_class: security_class,
             security_status: security_status,
             star_id: star_id,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

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

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             ship_jumps: ship_jumps,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

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

@@ -9,7 +9,7 @@ module EveOnline
             npc_kills: npc_kills,
             pod_kills: pod_kills,
             ship_kills: ship_kills,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

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

@@ -19,7 +19,7 @@ module EveOnline
             published: published,
             radius: radius,
             type_id: type_id,
-            volume: volume,
+            volume: volume
           }
         end
 

data/lib/eve_online/esi/models/{wallet_journal_entry.rb → wallet_journal.rb}

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     module Models
-      class WalletJournalEntry < Base
+      class WalletJournal < Base
         def as_json
           {
             amount: amount,
@@ -13,12 +13,12 @@ module EveOnline
             date: date,
             description: description,
             first_party_id: first_party_id,
-            id: id,
+            wallet_journal_id: wallet_journal_id,
             reason: reason,
             ref_type: ref_type,
             second_party_id: second_party_id,
             tax: tax,
-            tax_receiver_id: tax_receiver_id,
+            tax_receiver_id: tax_receiver_id
           }
         end
 
@@ -52,7 +52,7 @@ module EveOnline
           options["first_party_id"]
         end
 
-        def id
+        def wallet_journal_id
           options["id"]
         end
 

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class WalletTransaction < Base
+        def as_json
+          {
+            client_id: client_id,
+            date: date,
+            is_buy: is_buy,
+            is_personal: is_personal,
+            journal_ref_id: journal_ref_id,
+            location_id: location_id,
+            quantity: quantity,
+            transaction_id: transaction_id,
+            type_id: type_id,
+            unit_price: unit_price
+          }
+        end
+
+        def client_id
+          options["client_id"]
+        end
+
+        def date
+          date = options["date"]
+
+          parse_datetime_with_timezone(date) if date
+        end
+
+        def is_buy
+          options["is_buy"]
+        end
+
+        def is_personal
+          options["is_personal"]
+        end
+
+        def journal_ref_id
+          options["journal_ref_id"]
+        end
+
+        def location_id
+          options["location_id"]
+        end
+
+        def quantity
+          options["quantity"]
+        end
+
+        def transaction_id
+          options["transaction_id"]
+        end
+
+        def type_id
+          options["type_id"]
+        end
+
+        def unit_price
+          options["unit_price"]
+        end
+      end
+    end
+  end
+end