eve_online 0.16.0 → 0.17.0

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

@@ -7,13 +7,13 @@ module EveOnline
         def as_json
           {
             item_id: item_id,
-            type_id: type_id,
+            location_flag: location_flag,
             location_id: location_id,
-            quantity: quantity,
-            time_efficiency: time_efficiency,
             material_efficiency: material_efficiency,
+            quantity: quantity,
             runs: runs,
-            location_flag: location_flag
+            time_efficiency: time_efficiency,
+            type_id: type_id
           }
         end
 
@@ -21,32 +21,32 @@ module EveOnline
           options['item_id']
         end
 
-        def type_id
-          options['type_id']
+        def location_flag
+          options['location_flag']
         end
 
         def location_id
           options['location_id']
         end
 
-        def quantity
-          options['quantity']
-        end
-
-        def time_efficiency
-          options['time_efficiency']
-        end
-
         def material_efficiency
           options['material_efficiency']
         end
 
+        def quantity
+          options['quantity']
+        end
+
         def runs
           options['runs']
         end
 
-        def location_flag
-          options['location_flag']
+        def time_efficiency
+          options['time_efficiency']
+        end
+
+        def type_id
+          options['type_id']
         end
       end
     end

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

@@ -7,17 +7,17 @@ module EveOnline
         def as_json
           {
             bookmark_id: bookmark_id,
-            folder_id: folder_id,
+            coordinate_x: coordinate_x,
+            coordinate_y: coordinate_y,
+            coordinate_z: coordinate_z,
             created: created,
-            label: label,
-            notes: notes,
-            location_id: location_id,
             creator_id: creator_id,
+            folder_id: folder_id,
             item_id: item_id,
             item_type_id: item_type_id,
-            coordinate_x: coordinate_x,
-            coordinate_y: coordinate_y,
-            coordinate_z: coordinate_z
+            label: label,
+            location_id: location_id,
+            notes: notes
           }
         end
 
@@ -25,32 +25,32 @@ module EveOnline
           options['bookmark_id']
         end
 
-        def folder_id
-          options['folder_id']
+        def coordinate_x
+          options['coordinates']['x'] if options['coordinates']
         end
 
-        def created
-          created = options['created']
-
-          parse_datetime_with_timezone(created) if created
+        def coordinate_y
+          options['coordinates']['y'] if options['coordinates']
         end
 
-        def label
-          options['label']
+        def coordinate_z
+          options['coordinates']['z'] if options['coordinates']
         end
 
-        def notes
-          options['notes']
-        end
+        def created
+          created = options['created']
 
-        def location_id
-          options['location_id']
+          parse_datetime_with_timezone(created) if created
         end
 
         def creator_id
           options['creator_id']
         end
 
+        def folder_id
+          options['folder_id']
+        end
+
         def item_id
           options['item']['item_id'] if options['item']
         end
@@ -59,16 +59,16 @@ module EveOnline
           options['item']['type_id'] if options['item']
         end
 
-        def coordinate_x
-          options['coordinates']['x'] if options['coordinates']
+        def label
+          options['label']
         end
 
-        def coordinate_y
-          options['coordinates']['y'] if options['coordinates']
+        def location_id
+          options['location_id']
         end
 
-        def coordinate_z
-          options['coordinates']['z'] if options['coordinates']
+        def notes
+          options['notes']
         end
       end
     end

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

@@ -6,22 +6,26 @@ module EveOnline
       class Character < Base
         def as_json
           {
-            corporation_id: corporation_id,
+            alliance_id: alliance_id,
+            ancestry_id: ancestry_id,
             birthday: birthday,
-            name: name,
-            gender: gender,
-            race_id: race_id,
             bloodline_id: bloodline_id,
+            corporation_id: corporation_id,
             description: description,
-            alliance_id: alliance_id,
-            ancestry_id: ancestry_id,
-            security_status: security_status,
-            faction_id: faction_id
+            faction_id: faction_id,
+            gender: gender,
+            name: name,
+            race_id: race_id,
+            security_status: security_status
           }
         end
 
-        def corporation_id
-          options['corporation_id']
+        def alliance_id
+          options['alliance_id']
+        end
+
+        def ancestry_id
+          options['ancestry_id']
         end
 
         def birthday
@@ -30,41 +34,37 @@ module EveOnline
           parse_datetime_with_timezone(birthday) if birthday
         end
 
-        def name
-          options['name']
+        def bloodline_id
+          options['bloodline_id']
         end
 
-        def gender
-          options['gender']
+        def corporation_id
+          options['corporation_id']
         end
 
-        def race_id
-          options['race_id']
+        def description
+          options['description']
         end
 
-        def bloodline_id
-          options['bloodline_id']
+        def faction_id
+          options['faction_id']
         end
 
-        def description
-          options['description']
+        def gender
+          options['gender']
         end
 
-        def alliance_id
-          options['alliance_id']
+        def name
+          options['name']
         end
 
-        def ancestry_id
-          options['ancestry_id']
+        def race_id
+          options['race_id']
         end
 
         def security_status
           options['security_status']
         end
-
-        def faction_id
-          options['faction_id']
-        end
       end
     end
   end

data/lib/eve_online/esi/models/{industry_job.rb → character_industry_job.rb}

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     module Models
-      class IndustryJob < Base
+      class CharacterIndustryJob < Base
         def as_json
           {
             activity_id: activity_id,
@@ -28,7 +28,6 @@ module EveOnline
             station_id: station_id,
             status: status,
             successful_runs: successful_runs
-            # location_id WTF???
           }
         end
 

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

@@ -6,59 +6,37 @@ module EveOnline
       class CharacterOrder < Base
         def as_json
           {
-            order_id: order_id,
-            type_id: type_id,
-            region_id: region_id,
-            location_id: location_id,
-            range: range,
+            duration: duration,
+            escrow: escrow,
             is_buy_order: is_buy_order,
-            price: price,
-            volume_total: volume_total,
-            volume_remain: volume_remain,
+            is_corporation: is_corporation,
             issued: issued,
-            state: state,
+            location_id: location_id,
             min_volume: min_volume,
-            account_id: account_id,
-            duration: duration,
-            is_corp: is_corp,
-            escrow: escrow
+            order_id: order_id,
+            price: price,
+            range: range,
+            region_id: region_id,
+            type_id: type_id,
+            volume_remain: volume_remain,
+            volume_total: volume_total
           }
         end
 
-        def order_id
-          options['order_id']
-        end
-
-        def type_id
-          options['type_id']
-        end
-
-        def region_id
-          options['region_id']
-        end
-
-        def location_id
-          options['location_id']
+        def duration
+          options['duration']
         end
 
-        def range
-          options['range']
+        def escrow
+          options['escrow']
         end
 
         def is_buy_order
           options['is_buy_order']
         end
 
-        def price
-          options['price']
-        end
-
-        def volume_total
-          options['volume_total']
-        end
-
-        def volume_remain
-          options['volume_remain']
+        def is_corporation
+          options['is_corporation']
         end
 
         def issued
@@ -67,28 +45,40 @@ module EveOnline
           parse_datetime_with_timezone(issued) if issued
         end
 
-        def state
-          options['state']
+        def location_id
+          options['location_id']
         end
 
         def min_volume
           options['min_volume']
         end
 
-        def account_id
-          options['account_id']
+        def order_id
+          options['order_id']
         end
 
-        def duration
-          options['duration']
+        def price
+          options['price']
         end
 
-        def is_corp
-          options['is_corp']
+        def range
+          options['range']
         end
 
-        def escrow
-          options['escrow']
+        def region_id
+          options['region_id']
+        end
+
+        def type_id
+          options['type_id']
+        end
+
+        def volume_remain
+          options['volume_remain']
+        end
+
+        def volume_total
+          options['volume_total']
         end
       end
     end

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

@@ -4,29 +4,15 @@ module EveOnline
   module ESI
     module Models
       class CharacterPortrait < Base
-        # https://eveonline-third-party-documentation.readthedocs.io/en/latest/imageserver/intro.html#character-images
-        # Available Sizes: 32, 64, 128, 256, 512, 1024
-        # https://nethackwiki.com/wiki/Physical_size
-        # Tiny = 0; Small = 1; Medium = 2; Large = 3; Huge = 4; Gigantic = 7.
         def as_json
           {
-            small: small,
             medium: medium,
             large: large,
-            huge: huge
+            huge: huge,
+            small: small
           }
         end
 
-        def tiny
-          # FIXME: https://github.com/ccpgames/esi-issues/issues/270
-          # FIXME: https://github.com/ccpgames/esi-issues/issues/131
-          raise NotImplementedError
-        end
-
-        def small
-          options['px64x64']
-        end
-
         def medium
           options['px128x128']
         end
@@ -39,10 +25,8 @@ module EveOnline
           options['px512x512']
         end
 
-        def gigantic
-          # FIXME: https://github.com/ccpgames/esi-issues/issues/270
-          # FIXME: https://github.com/ccpgames/esi-issues/issues/131
-          raise NotImplementedError
+        def small
+          options['px64x64']
         end
       end
     end

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

@@ -6,48 +6,32 @@ module EveOnline
       class Corporation < Base
         def as_json
           {
-            name: name,
-            ticker: ticker,
-            member_count: member_count,
-            ceo_id: ceo_id,
             alliance_id: alliance_id,
-            description: description,
-            tax_rate: tax_rate,
-            date_founded: date_founded,
+            ceo_id: ceo_id,
             creator_id: creator_id,
-            corporation_url: corporation_url,
+            date_founded: date_founded,
+            description: description,
             faction_id: faction_id,
             home_station_id: home_station_id,
-            shares: shares
+            member_count: member_count,
+            name: name,
+            shares: shares,
+            tax_rate: tax_rate,
+            ticker: ticker,
+            corporation_url: corporation_url
           }
         end
 
-        def name
-          options['name']
-        end
-
-        def ticker
-          options['ticker']
-        end
-
-        def member_count
-          options['member_count']
-        end
-
-        def ceo_id
-          options['ceo_id']
-        end
-
         def alliance_id
           options['alliance_id']
         end
 
-        def description
-          options['description']
+        def ceo_id
+          options['ceo_id']
         end
 
-        def tax_rate
-          options['tax_rate']
+        def creator_id
+          options['creator_id']
         end
 
         def date_founded
@@ -56,25 +40,41 @@ module EveOnline
           parse_datetime_with_timezone(date_founded) if date_founded
         end
 
-        def creator_id
-          options['creator_id']
+        def description
+          options['description']
         end
 
-        def corporation_url
-          options['url']
+        def faction_id
+          options['faction_id']
         end
 
         def home_station_id
           options['home_station_id']
         end
 
-        def faction_id
-          options['faction_id']
+        def member_count
+          options['member_count']
+        end
+
+        def name
+          options['name']
         end
 
         def shares
           options['shares']
         end
+
+        def tax_rate
+          options['tax_rate']
+        end
+
+        def ticker
+          options['ticker']
+        end
+
+        def corporation_url
+          options['url']
+        end
       end
     end
   end