esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_killmails_killmail_id_killmail_hash_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,36 +15,35 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetKillmailsKillmailIdKillmailHashOk
-    # attackers array
-    attr_accessor :attackers
-
     # ID of the killmail
     attr_accessor :killmail_id
 
     # Time that the victim was killed and the killmail generated 
     attr_accessor :killmail_time
 
-    # Moon if the kill took place at one
-    attr_accessor :moon_id
+    attr_accessor :victim
+
+    # attackers array
+    attr_accessor :attackers
 
     # Solar system that the kill took place in 
     attr_accessor :solar_system_id
 
-    attr_accessor :victim
+    # Moon if the kill took place at one
+    attr_accessor :moon_id
 
     # War if the killmail is generated in relation to an official war 
     attr_accessor :war_id
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'attackers' => :'attackers',
         :'killmail_id' => :'killmail_id',
         :'killmail_time' => :'killmail_time',
-        :'moon_id' => :'moon_id',
-        :'solar_system_id' => :'solar_system_id',
         :'victim' => :'victim',
+        :'attackers' => :'attackers',
+        :'solar_system_id' => :'solar_system_id',
+        :'moon_id' => :'moon_id',
         :'war_id' => :'war_id'
       }
     end
@@ -52,12 +51,12 @@ module ESIClient
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'attackers' => :'Array<GetKillmailsKillmailIdKillmailHashAttacker>',
         :'killmail_id' => :'Integer',
         :'killmail_time' => :'DateTime',
-        :'moon_id' => :'Integer',
-        :'solar_system_id' => :'Integer',
         :'victim' => :'GetKillmailsKillmailIdKillmailHashVictim',
+        :'attackers' => :'Array<GetKillmailsKillmailIdKillmailHashAttacker>',
+        :'solar_system_id' => :'Integer',
+        :'moon_id' => :'Integer',
         :'war_id' => :'Integer'
       }
     end
@@ -68,13 +67,7 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
-
-      if attributes.has_key?(:'attackers')
-        if (value = attributes[:'attackers']).is_a?(Array)
-          self.attackers = value
-        end
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'killmail_id')
         self.killmail_id = attributes[:'killmail_id']
@@ -84,55 +77,65 @@ module ESIClient
         self.killmail_time = attributes[:'killmail_time']
       end
 
-      if attributes.has_key?(:'moon_id')
-        self.moon_id = attributes[:'moon_id']
+      if attributes.has_key?(:'victim')
+        self.victim = attributes[:'victim']
+      end
+
+      if attributes.has_key?(:'attackers')
+        if (value = attributes[:'attackers']).is_a?(Array)
+          self.attackers = value
+        end
       end
 
       if attributes.has_key?(:'solar_system_id')
         self.solar_system_id = attributes[:'solar_system_id']
       end
 
-      if attributes.has_key?(:'victim')
-        self.victim = attributes[:'victim']
+      if attributes.has_key?(:'moon_id')
+        self.moon_id = attributes[:'moon_id']
       end
 
       if attributes.has_key?(:'war_id')
         self.war_id = attributes[:'war_id']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @attackers.nil?
-        invalid_properties.push("invalid value for 'attackers', attackers cannot be nil.")
-      end
-
       if @killmail_id.nil?
-        invalid_properties.push("invalid value for 'killmail_id', killmail_id cannot be nil.")
+        invalid_properties.push('invalid value for "killmail_id", killmail_id cannot be nil.')
       end
 
       if @killmail_time.nil?
-        invalid_properties.push("invalid value for 'killmail_time', killmail_time cannot be nil.")
+        invalid_properties.push('invalid value for "killmail_time", killmail_time cannot be nil.')
+      end
+
+      if @victim.nil?
+        invalid_properties.push('invalid value for "victim", victim cannot be nil.')
+      end
+
+      if @attackers.nil?
+        invalid_properties.push('invalid value for "attackers", attackers cannot be nil.')
       end
 
       if @solar_system_id.nil?
-        invalid_properties.push("invalid value for 'solar_system_id', solar_system_id cannot be nil.")
+        invalid_properties.push('invalid value for "solar_system_id", solar_system_id cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @attackers.nil?
       return false if @killmail_id.nil?
       return false if @killmail_time.nil?
+      return false if @victim.nil?
+      return false if @attackers.nil?
       return false if @solar_system_id.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -140,12 +143,12 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          attackers == o.attackers &&
           killmail_id == o.killmail_id &&
           killmail_time == o.killmail_time &&
-          moon_id == o.moon_id &&
-          solar_system_id == o.solar_system_id &&
           victim == o.victim &&
+          attackers == o.attackers &&
+          solar_system_id == o.solar_system_id &&
+          moon_id == o.moon_id &&
           war_id == o.war_id
     end
 
@@ -158,7 +161,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [attackers, killmail_id, killmail_time, moon_id, solar_system_id, victim, war_id].hash
+      [killmail_id, killmail_time, victim, attackers, solar_system_id, moon_id, war_id].hash
     end
 
     # Builds the object from hash
@@ -171,7 +174,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -253,7 +256,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -264,7 +267,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_killmails_killmail_id_killmail_hash_position.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -24,7 +24,6 @@ module ESIClient
     # z number
     attr_accessor :z
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -49,7 +48,7 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'x')
         self.x = attributes[:'x']
@@ -62,26 +61,25 @@ module ESIClient
       if attributes.has_key?(:'z')
         self.z = attributes[:'z']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
       if @x.nil?
-        invalid_properties.push("invalid value for 'x', x cannot be nil.")
+        invalid_properties.push('invalid value for "x", x cannot be nil.')
       end
 
       if @y.nil?
-        invalid_properties.push("invalid value for 'y', y cannot be nil.")
+        invalid_properties.push('invalid value for "y", y cannot be nil.')
       end
 
       if @z.nil?
-        invalid_properties.push("invalid value for 'z', z cannot be nil.")
+        invalid_properties.push('invalid value for "z", z cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
@@ -90,7 +88,7 @@ module ESIClient
       return false if @x.nil?
       return false if @y.nil?
       return false if @z.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -125,7 +123,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -207,7 +205,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -218,7 +216,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_killmails_killmail_id_killmail_hash_unprocessable_entity.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -18,7 +18,6 @@ module ESIClient
     # Unprocessable entity message
     attr_accessor :error
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -39,25 +38,24 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'error')
         self.error = attributes[:'error']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -90,7 +88,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -172,7 +170,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -183,7 +181,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_killmails_killmail_id_killmail_hash_victim.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,55 +15,54 @@ require 'date'
 module ESIClient
   # victim object
   class GetKillmailsKillmailIdKillmailHashVictim
-    # alliance_id integer
-    attr_accessor :alliance_id
-
     # character_id integer
     attr_accessor :character_id
 
     # corporation_id integer
     attr_accessor :corporation_id
 
-    # How much total damage was taken by the victim 
-    attr_accessor :damage_taken
+    # alliance_id integer
+    attr_accessor :alliance_id
 
     # faction_id integer
     attr_accessor :faction_id
 
-    # items array
-    attr_accessor :items
-
-    attr_accessor :position
+    # How much total damage was taken by the victim 
+    attr_accessor :damage_taken
 
     # The ship that the victim was piloting and was destroyed 
     attr_accessor :ship_type_id
 
+    # items array
+    attr_accessor :items
+
+    attr_accessor :position
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_id' => :'alliance_id',
         :'character_id' => :'character_id',
         :'corporation_id' => :'corporation_id',
-        :'damage_taken' => :'damage_taken',
+        :'alliance_id' => :'alliance_id',
         :'faction_id' => :'faction_id',
+        :'damage_taken' => :'damage_taken',
+        :'ship_type_id' => :'ship_type_id',
         :'items' => :'items',
-        :'position' => :'position',
-        :'ship_type_id' => :'ship_type_id'
+        :'position' => :'position'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_id' => :'Integer',
         :'character_id' => :'Integer',
         :'corporation_id' => :'Integer',
-        :'damage_taken' => :'Integer',
+        :'alliance_id' => :'Integer',
         :'faction_id' => :'Integer',
+        :'damage_taken' => :'Integer',
+        :'ship_type_id' => :'Integer',
         :'items' => :'Array<GetKillmailsKillmailIdKillmailHashItem1>',
-        :'position' => :'GetKillmailsKillmailIdKillmailHashPosition',
-        :'ship_type_id' => :'Integer'
+        :'position' => :'GetKillmailsKillmailIdKillmailHashPosition'
       }
     end
 
@@ -73,11 +72,7 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
-
-      if attributes.has_key?(:'alliance_id')
-        self.alliance_id = attributes[:'alliance_id']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'character_id')
         self.character_id = attributes[:'character_id']
@@ -87,14 +82,22 @@ module ESIClient
         self.corporation_id = attributes[:'corporation_id']
       end
 
-      if attributes.has_key?(:'damage_taken')
-        self.damage_taken = attributes[:'damage_taken']
+      if attributes.has_key?(:'alliance_id')
+        self.alliance_id = attributes[:'alliance_id']
       end
 
       if attributes.has_key?(:'faction_id')
         self.faction_id = attributes[:'faction_id']
       end
 
+      if attributes.has_key?(:'damage_taken')
+        self.damage_taken = attributes[:'damage_taken']
+      end
+
+      if attributes.has_key?(:'ship_type_id')
+        self.ship_type_id = attributes[:'ship_type_id']
+      end
+
       if attributes.has_key?(:'items')
         if (value = attributes[:'items']).is_a?(Array)
           self.items = value
@@ -104,26 +107,21 @@ module ESIClient
       if attributes.has_key?(:'position')
         self.position = attributes[:'position']
       end
-
-      if attributes.has_key?(:'ship_type_id')
-        self.ship_type_id = attributes[:'ship_type_id']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
       if @damage_taken.nil?
-        invalid_properties.push("invalid value for 'damage_taken', damage_taken cannot be nil.")
+        invalid_properties.push('invalid value for "damage_taken", damage_taken cannot be nil.')
       end
 
       if @ship_type_id.nil?
-        invalid_properties.push("invalid value for 'ship_type_id', ship_type_id cannot be nil.")
+        invalid_properties.push('invalid value for "ship_type_id", ship_type_id cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
@@ -131,7 +129,7 @@ module ESIClient
     def valid?
       return false if @damage_taken.nil?
       return false if @ship_type_id.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -139,14 +137,14 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_id == o.alliance_id &&
           character_id == o.character_id &&
           corporation_id == o.corporation_id &&
-          damage_taken == o.damage_taken &&
+          alliance_id == o.alliance_id &&
           faction_id == o.faction_id &&
+          damage_taken == o.damage_taken &&
+          ship_type_id == o.ship_type_id &&
           items == o.items &&
-          position == o.position &&
-          ship_type_id == o.ship_type_id
+          position == o.position
     end
 
     # @see the `==` method
@@ -158,7 +156,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_id, character_id, corporation_id, damage_taken, faction_id, items, position, ship_type_id].hash
+      [character_id, corporation_id, alliance_id, faction_id, damage_taken, ship_type_id, items, position].hash
     end
 
     # Builds the object from hash
@@ -171,7 +169,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -253,7 +251,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -264,7 +262,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end