esi_client 0.4.7 → 0.7.6.1

data/lib/esi_client/models/get_wars_war_id_aggressor.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,36 +15,35 @@ require 'date'
 module ESIClient
   # The aggressor corporation or alliance that declared this war, only contains either corporation_id or alliance_id
   class GetWarsWarIdAggressor
-    # Alliance ID if and only if the aggressor is an alliance
-    attr_accessor :alliance_id
-
     # Corporation ID if and only if the aggressor is a corporation
     attr_accessor :corporation_id
 
-    # ISK value of ships the aggressor has destroyed
-    attr_accessor :isk_destroyed
+    # Alliance ID if and only if the aggressor is an alliance
+    attr_accessor :alliance_id
 
     # The number of ships the aggressor has killed
     attr_accessor :ships_killed
 
+    # ISK value of ships the aggressor has destroyed
+    attr_accessor :isk_destroyed
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_id' => :'alliance_id',
         :'corporation_id' => :'corporation_id',
-        :'isk_destroyed' => :'isk_destroyed',
-        :'ships_killed' => :'ships_killed'
+        :'alliance_id' => :'alliance_id',
+        :'ships_killed' => :'ships_killed',
+        :'isk_destroyed' => :'isk_destroyed'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_id' => :'Integer',
         :'corporation_id' => :'Integer',
-        :'isk_destroyed' => :'Float',
-        :'ships_killed' => :'Integer'
+        :'alliance_id' => :'Integer',
+        :'ships_killed' => :'Integer',
+        :'isk_destroyed' => :'Float'
       }
     end
 
@@ -53,47 +53,46 @@ 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?(:'corporation_id')
         self.corporation_id = attributes[:'corporation_id']
       end
 
-      if attributes.has_key?(:'isk_destroyed')
-        self.isk_destroyed = attributes[:'isk_destroyed']
+      if attributes.has_key?(:'alliance_id')
+        self.alliance_id = attributes[:'alliance_id']
       end
 
       if attributes.has_key?(:'ships_killed')
         self.ships_killed = attributes[:'ships_killed']
       end
 
+      if attributes.has_key?(:'isk_destroyed')
+        self.isk_destroyed = attributes[:'isk_destroyed']
+      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 @isk_destroyed.nil?
-        invalid_properties.push("invalid value for 'isk_destroyed', isk_destroyed cannot be nil.")
+      if @ships_killed.nil?
+        invalid_properties.push('invalid value for "ships_killed", ships_killed cannot be nil.')
       end
 
-      if @ships_killed.nil?
-        invalid_properties.push("invalid value for 'ships_killed', ships_killed cannot be nil.")
+      if @isk_destroyed.nil?
+        invalid_properties.push('invalid value for "isk_destroyed", isk_destroyed 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 @isk_destroyed.nil?
       return false if @ships_killed.nil?
-      return true
+      return false if @isk_destroyed.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -101,10 +100,10 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_id == o.alliance_id &&
           corporation_id == o.corporation_id &&
-          isk_destroyed == o.isk_destroyed &&
-          ships_killed == o.ships_killed
+          alliance_id == o.alliance_id &&
+          ships_killed == o.ships_killed &&
+          isk_destroyed == o.isk_destroyed
     end
 
     # @see the `==` method
@@ -116,7 +115,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_id, corporation_id, isk_destroyed, ships_killed].hash
+      [corporation_id, alliance_id, ships_killed, isk_destroyed].hash
     end
 
     # Builds the object from hash
@@ -129,7 +128,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]]))
@@ -211,7 +210,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) }
@@ -222,7 +221,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_wars_war_id_ally.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,26 +15,25 @@ require 'date'
 module ESIClient
   # ally object
   class GetWarsWarIdAlly
-    # Alliance ID if and only if this ally is an alliance
-    attr_accessor :alliance_id
-
     # Corporation ID if and only if this ally is a corporation
     attr_accessor :corporation_id
 
+    # Alliance ID if and only if this ally is an alliance
+    attr_accessor :alliance_id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_id' => :'alliance_id',
-        :'corporation_id' => :'corporation_id'
+        :'corporation_id' => :'corporation_id',
+        :'alliance_id' => :'alliance_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_id' => :'Integer',
-        :'corporation_id' => :'Integer'
+        :'corporation_id' => :'Integer',
+        :'alliance_id' => :'Integer'
       }
     end
 
@@ -43,29 +43,28 @@ 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?(:'corporation_id')
         self.corporation_id = attributes[:'corporation_id']
       end
 
+      if attributes.has_key?(:'alliance_id')
+        self.alliance_id = attributes[:'alliance_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
-      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.
@@ -73,8 +72,8 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_id == o.alliance_id &&
-          corporation_id == o.corporation_id
+          corporation_id == o.corporation_id &&
+          alliance_id == o.alliance_id
     end
 
     # @see the `==` method
@@ -86,7 +85,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_id, corporation_id].hash
+      [corporation_id, alliance_id].hash
     end
 
     # Builds the object from hash
@@ -99,7 +98,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]]))
@@ -181,7 +180,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) }
@@ -192,7 +191,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_wars_war_id_defender.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,36 +15,35 @@ require 'date'
 module ESIClient
   # The defending corporation or alliance that declared this war, only contains either corporation_id or alliance_id
   class GetWarsWarIdDefender
-    # Alliance ID if and only if the defender is an alliance
-    attr_accessor :alliance_id
-
     # Corporation ID if and only if the defender is a corporation
     attr_accessor :corporation_id
 
-    # ISK value of ships the defender has killed
-    attr_accessor :isk_destroyed
+    # Alliance ID if and only if the defender is an alliance
+    attr_accessor :alliance_id
 
     # The number of ships the defender has killed
     attr_accessor :ships_killed
 
+    # ISK value of ships the defender has killed
+    attr_accessor :isk_destroyed
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_id' => :'alliance_id',
         :'corporation_id' => :'corporation_id',
-        :'isk_destroyed' => :'isk_destroyed',
-        :'ships_killed' => :'ships_killed'
+        :'alliance_id' => :'alliance_id',
+        :'ships_killed' => :'ships_killed',
+        :'isk_destroyed' => :'isk_destroyed'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_id' => :'Integer',
         :'corporation_id' => :'Integer',
-        :'isk_destroyed' => :'Float',
-        :'ships_killed' => :'Integer'
+        :'alliance_id' => :'Integer',
+        :'ships_killed' => :'Integer',
+        :'isk_destroyed' => :'Float'
       }
     end
 
@@ -53,47 +53,46 @@ 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?(:'corporation_id')
         self.corporation_id = attributes[:'corporation_id']
       end
 
-      if attributes.has_key?(:'isk_destroyed')
-        self.isk_destroyed = attributes[:'isk_destroyed']
+      if attributes.has_key?(:'alliance_id')
+        self.alliance_id = attributes[:'alliance_id']
       end
 
       if attributes.has_key?(:'ships_killed')
         self.ships_killed = attributes[:'ships_killed']
       end
 
+      if attributes.has_key?(:'isk_destroyed')
+        self.isk_destroyed = attributes[:'isk_destroyed']
+      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 @isk_destroyed.nil?
-        invalid_properties.push("invalid value for 'isk_destroyed', isk_destroyed cannot be nil.")
+      if @ships_killed.nil?
+        invalid_properties.push('invalid value for "ships_killed", ships_killed cannot be nil.')
       end
 
-      if @ships_killed.nil?
-        invalid_properties.push("invalid value for 'ships_killed', ships_killed cannot be nil.")
+      if @isk_destroyed.nil?
+        invalid_properties.push('invalid value for "isk_destroyed", isk_destroyed 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 @isk_destroyed.nil?
       return false if @ships_killed.nil?
-      return true
+      return false if @isk_destroyed.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -101,10 +100,10 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_id == o.alliance_id &&
           corporation_id == o.corporation_id &&
-          isk_destroyed == o.isk_destroyed &&
-          ships_killed == o.ships_killed
+          alliance_id == o.alliance_id &&
+          ships_killed == o.ships_killed &&
+          isk_destroyed == o.isk_destroyed
     end
 
     # @see the `==` method
@@ -116,7 +115,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_id, corporation_id, isk_destroyed, ships_killed].hash
+      [corporation_id, alliance_id, ships_killed, isk_destroyed].hash
     end
 
     # Builds the object from hash
@@ -129,7 +128,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]]))
@@ -211,7 +210,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) }
@@ -222,7 +221,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_wars_war_id_internal_server_error.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.5.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 

data/lib/esi_client/models/get_wars_war_id_killmails_200_ok.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,26 +15,25 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetWarsWarIdKillmails200Ok
-    # A hash of this killmail
-    attr_accessor :killmail_hash
-
     # ID of this killmail
     attr_accessor :killmail_id
 
+    # A hash of this killmail
+    attr_accessor :killmail_hash
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'killmail_hash' => :'killmail_hash',
-        :'killmail_id' => :'killmail_id'
+        :'killmail_id' => :'killmail_id',
+        :'killmail_hash' => :'killmail_hash'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'killmail_hash' => :'String',
-        :'killmail_id' => :'Integer'
+        :'killmail_id' => :'Integer',
+        :'killmail_hash' => :'String'
       }
     end
 
@@ -43,39 +43,38 @@ 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?(:'killmail_hash')
-        self.killmail_hash = attributes[:'killmail_hash']
-      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']
       end
 
+      if attributes.has_key?(:'killmail_hash')
+        self.killmail_hash = attributes[:'killmail_hash']
+      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 @killmail_hash.nil?
-        invalid_properties.push("invalid value for 'killmail_hash', killmail_hash cannot be nil.")
+      if @killmail_id.nil?
+        invalid_properties.push('invalid value for "killmail_id", killmail_id cannot be nil.')
       end
 
-      if @killmail_id.nil?
-        invalid_properties.push("invalid value for 'killmail_id', killmail_id cannot be nil.")
+      if @killmail_hash.nil?
+        invalid_properties.push('invalid value for "killmail_hash", killmail_hash 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 @killmail_hash.nil?
       return false if @killmail_id.nil?
-      return true
+      return false if @killmail_hash.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -83,8 +82,8 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          killmail_hash == o.killmail_hash &&
-          killmail_id == o.killmail_id
+          killmail_id == o.killmail_id &&
+          killmail_hash == o.killmail_hash
     end
 
     # @see the `==` method
@@ -96,7 +95,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [killmail_hash, killmail_id].hash
+      [killmail_id, killmail_hash].hash
     end
 
     # Builds the object from hash
@@ -109,7 +108,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]]))
@@ -191,7 +190,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) }
@@ -202,7 +201,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_wars_war_id_killmails_internal_server_error.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.5.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git