eve_online 0.16.0 → 0.17.0

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

@@ -6,20 +6,20 @@ module EveOnline
       class JumpClone < Base
         def as_json
           {
+            implants: implants,
             jump_clone_id: jump_clone_id,
-            name: name,
             location_id: location_id,
             location_type: location_type,
-            implants: implants
+            name: name
           }
         end
 
-        def jump_clone_id
-          options['jump_clone_id']
+        def implants
+          options['implants']
         end
 
-        def name
-          options['name']
+        def jump_clone_id
+          options['jump_clone_id']
         end
 
         def location_id
@@ -30,8 +30,8 @@ module EveOnline
           options['location_type']
         end
 
-        def implants
-          options['implants']
+        def name
+          options['name']
         end
       end
     end

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

@@ -6,40 +6,40 @@ module EveOnline
       class MarketHistory < Base
         def as_json
           {
+            average: average,
             date: date,
-            order_count: order_count,
-            volume: volume,
             highest: highest,
-            average: average,
-            lowest: lowest
+            lowest: lowest,
+            order_count: order_count,
+            volume: volume
           }
         end
 
+        def average
+          options['average']
+        end
+
         def date
           date = options['date']
 
           parse_datetime_with_timezone(date) if date
         end
 
-        def order_count
-          options['order_count']
-        end
-
-        def volume
-          options['volume']
-        end
-
         def highest
           options['highest']
         end
 
-        def average
-          options['average']
-        end
-
         def lowest
           options['lowest']
         end
+
+        def order_count
+          options['order_count']
+        end
+
+        def volume
+          options['volume']
+        end
       end
     end
   end

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

@@ -6,16 +6,20 @@ module EveOnline
       class Notification < Base
         def as_json
           {
+            is_read: is_read,
             notification_id: notification_id,
             sender_id: sender_id,
             sender_type: sender_type,
-            timestamp: timestamp,
-            is_read: is_read,
             text: text,
+            timestamp: timestamp,
             type: type
           }
         end
 
+        def is_read
+          options['is_read']
+        end
+
         def notification_id
           options['notification_id']
         end
@@ -28,20 +32,16 @@ module EveOnline
           options['sender_type']
         end
 
+        def text
+          options['text']
+        end
+
         def timestamp
           timestamp = options['timestamp']
 
           parse_datetime_with_timezone(timestamp) if timestamp
         end
 
-        def is_read
-          options['is_read']
-        end
-
-        def text
-          options['text']
-        end
-
         def type
           options['type']
         end

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

@@ -6,17 +6,13 @@ module EveOnline
       class Online < Base
         def as_json
           {
-            online: online,
             last_login: last_login,
             last_logout: last_logout,
-            logins: logins
+            logins: logins,
+            online: online
           }
         end
 
-        def online
-          options['online']
-        end
-
         def last_login
           last_login = options['last_login']
 
@@ -32,6 +28,10 @@ module EveOnline
         def logins
           options['logins']
         end
+
+        def online
+          options['online']
+        end
       end
     end
   end

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

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

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

@@ -6,19 +6,13 @@ module EveOnline
       class ServerStatus < Base
         def as_json
           {
-            start_time: start_time,
             players: players,
             server_version: server_version,
+            start_time: start_time,
             vip: vip
           }
         end
 
-        def start_time
-          start_time = options['start_time']
-
-          parse_datetime_with_timezone(start_time) if start_time
-        end
-
         def players
           options['players']
         end
@@ -27,6 +21,12 @@ module EveOnline
           options['server_version']
         end
 
+        def start_time
+          start_time = options['start_time']
+
+          parse_datetime_with_timezone(start_time) if start_time
+        end
+
         def vip
           options['vip']
         end

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

@@ -6,13 +6,17 @@ module EveOnline
       class Skill < Base
         def as_json
           {
+            active_skill_level: active_skill_level,
             skill_id: skill_id,
             skillpoints_in_skill: skillpoints_in_skill,
-            trained_skill_level: trained_skill_level,
-            active_skill_level: active_skill_level
+            trained_skill_level: trained_skill_level
           }
         end
 
+        def active_skill_level
+          options['active_skill_level']
+        end
+
         def skill_id
           options['skill_id']
         end
@@ -24,10 +28,6 @@ module EveOnline
         def trained_skill_level
           options['trained_skill_level']
         end
-
-        def active_skill_level
-          options['active_skill_level']
-        end
       end
     end
   end

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

@@ -6,33 +6,41 @@ module EveOnline
       class SkillQueueEntry < Base
         def as_json
           {
-            skill_id: skill_id,
+            finish_date: finish_date,
             finished_level: finished_level,
+            level_end_sp: level_end_sp,
+            level_start_sp: level_start_sp,
             queue_position: queue_position,
-            finish_date: finish_date,
+            skill_id: skill_id,
             start_date: start_date,
-            training_start_sp: training_start_sp,
-            level_end_sp: level_end_sp,
-            level_start_sp: level_start_sp
+            training_start_sp: training_start_sp
           }
         end
 
-        def skill_id
-          options['skill_id']
+        def finish_date
+          finish_date = options['finish_date']
+
+          parse_datetime_with_timezone(finish_date) if finish_date
         end
 
         def finished_level
           options['finished_level']
         end
 
+        def level_end_sp
+          options['level_end_sp']
+        end
+
+        def level_start_sp
+          options['level_start_sp']
+        end
+
         def queue_position
           options['queue_position']
         end
 
-        def finish_date
-          finish_date = options['finish_date']
-
-          parse_datetime_with_timezone(finish_date) if finish_date
+        def skill_id
+          options['skill_id']
         end
 
         def start_date
@@ -44,14 +52,6 @@ module EveOnline
         def training_start_sp
           options['training_start_sp']
         end
-
-        def level_end_sp
-          options['level_end_sp']
-        end
-
-        def level_start_sp
-          options['level_start_sp']
-        end
       end
     end
   end

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

@@ -6,79 +6,79 @@ module EveOnline
       class Type < Base
         def as_json
           {
-            type_id: type_id,
-            name: name,
+            capacity: capacity,
             description: description,
-            published: published,
+            # TODO: dogma_attributes
+            # TODO: dogma_effects
+            graphic_id: graphic_id,
             group_id: group_id,
+            icon_id: icon_id,
             market_group_id: market_group_id,
-            radius: radius,
-            volume: volume,
+            mass: mass,
+            name: name,
             packaged_volume: packaged_volume,
-            icon_id: icon_id,
-            capacity: capacity,
             portion_size: portion_size,
-            mass: mass,
-            graphic_id: graphic_id
-            # TODO: dogma_attributes
-            # TODO: dogma_effects
+            published: published,
+            radius: radius,
+            type_id: type_id,
+            volume: volume
           }
         end
 
-        def type_id
-          options['type_id']
-        end
-
-        def name
-          options['name']
+        def capacity
+          options['capacity']
         end
 
         def description
           options['description']
         end
 
-        def published
-          options['published']
+        def graphic_id
+          options['graphic_id']
         end
 
         def group_id
           options['group_id']
         end
 
+        def icon_id
+          options['icon_id']
+        end
+
         def market_group_id
           options['market_group_id']
         end
 
-        def radius
-          options['radius']
+        def mass
+          options['mass']
         end
 
-        def volume
-          options['volume']
+        def name
+          options['name']
         end
 
         def packaged_volume
           options['packaged_volume']
         end
 
-        def icon_id
-          options['icon_id']
+        def portion_size
+          options['portion_size']
         end
 
-        def capacity
-          options['capacity']
+        def published
+          options['published']
         end
 
-        def portion_size
-          options['portion_size']
+        def radius
+          options['radius']
         end
 
-        def mass
-          options['mass']
+        def type_id
+          options['type_id']
         end
 
-        def graphic_id
-          options['graphic_id']
+        def volume
+          options['volume']
         end
       end
     end