esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_universe_types_type_id_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,96 +15,95 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetUniverseTypesTypeIdOk
-    # capacity number
-    attr_accessor :capacity
+    # type_id integer
+    attr_accessor :type_id
+
+    # name string
+    attr_accessor :name
 
     # description string
     attr_accessor :description
 
-    # dogma_attributes array
-    attr_accessor :dogma_attributes
-
-    # dogma_effects array
-    attr_accessor :dogma_effects
-
-    # graphic_id integer
-    attr_accessor :graphic_id
+    # published boolean
+    attr_accessor :published
 
     # group_id integer
     attr_accessor :group_id
 
-    # icon_id integer
-    attr_accessor :icon_id
-
     # This only exists for types that can be put on the market
     attr_accessor :market_group_id
 
-    # mass number
-    attr_accessor :mass
+    # radius number
+    attr_accessor :radius
 
-    # name string
-    attr_accessor :name
+    # volume number
+    attr_accessor :volume
 
     # packaged_volume number
     attr_accessor :packaged_volume
 
+    # icon_id integer
+    attr_accessor :icon_id
+
+    # capacity number
+    attr_accessor :capacity
+
     # portion_size integer
     attr_accessor :portion_size
 
-    # published boolean
-    attr_accessor :published
-
-    # radius number
-    attr_accessor :radius
+    # mass number
+    attr_accessor :mass
 
-    # type_id integer
-    attr_accessor :type_id
+    # graphic_id integer
+    attr_accessor :graphic_id
 
-    # volume number
-    attr_accessor :volume
+    # dogma_attributes array
+    attr_accessor :dogma_attributes
 
+    # dogma_effects array
+    attr_accessor :dogma_effects
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'capacity' => :'capacity',
+        :'type_id' => :'type_id',
+        :'name' => :'name',
         :'description' => :'description',
-        :'dogma_attributes' => :'dogma_attributes',
-        :'dogma_effects' => :'dogma_effects',
-        :'graphic_id' => :'graphic_id',
+        :'published' => :'published',
         :'group_id' => :'group_id',
-        :'icon_id' => :'icon_id',
         :'market_group_id' => :'market_group_id',
-        :'mass' => :'mass',
-        :'name' => :'name',
+        :'radius' => :'radius',
+        :'volume' => :'volume',
         :'packaged_volume' => :'packaged_volume',
+        :'icon_id' => :'icon_id',
+        :'capacity' => :'capacity',
         :'portion_size' => :'portion_size',
-        :'published' => :'published',
-        :'radius' => :'radius',
-        :'type_id' => :'type_id',
-        :'volume' => :'volume'
+        :'mass' => :'mass',
+        :'graphic_id' => :'graphic_id',
+        :'dogma_attributes' => :'dogma_attributes',
+        :'dogma_effects' => :'dogma_effects'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'capacity' => :'Float',
+        :'type_id' => :'Integer',
+        :'name' => :'String',
         :'description' => :'String',
-        :'dogma_attributes' => :'Array<GetUniverseTypesTypeIdDogmaAttribute>',
-        :'dogma_effects' => :'Array<GetUniverseTypesTypeIdDogmaEffect>',
-        :'graphic_id' => :'Integer',
+        :'published' => :'BOOLEAN',
         :'group_id' => :'Integer',
-        :'icon_id' => :'Integer',
         :'market_group_id' => :'Integer',
-        :'mass' => :'Float',
-        :'name' => :'String',
+        :'radius' => :'Float',
+        :'volume' => :'Float',
         :'packaged_volume' => :'Float',
+        :'icon_id' => :'Integer',
+        :'capacity' => :'Float',
         :'portion_size' => :'Integer',
-        :'published' => :'BOOLEAN',
-        :'radius' => :'Float',
-        :'type_id' => :'Integer',
-        :'volume' => :'Float'
+        :'mass' => :'Float',
+        :'graphic_id' => :'Integer',
+        :'dogma_attributes' => :'Array<GetUniverseTypesTypeIdDogmaAttribute>',
+        :'dogma_effects' => :'Array<GetUniverseTypesTypeIdDogmaEffect>'
       }
     end
 
@@ -114,114 +113,113 @@ 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?(:'capacity')
-        self.capacity = attributes[:'capacity']
-      end
-
-      if attributes.has_key?(:'description')
-        self.description = attributes[:'description']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
-      if attributes.has_key?(:'dogma_attributes')
-        if (value = attributes[:'dogma_attributes']).is_a?(Array)
-          self.dogma_attributes = value
-        end
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'dogma_effects')
-        if (value = attributes[:'dogma_effects']).is_a?(Array)
-          self.dogma_effects = value
-        end
+      if attributes.has_key?(:'description')
+        self.description = attributes[:'description']
       end
 
-      if attributes.has_key?(:'graphic_id')
-        self.graphic_id = attributes[:'graphic_id']
+      if attributes.has_key?(:'published')
+        self.published = attributes[:'published']
       end
 
       if attributes.has_key?(:'group_id')
         self.group_id = attributes[:'group_id']
       end
 
-      if attributes.has_key?(:'icon_id')
-        self.icon_id = attributes[:'icon_id']
-      end
-
       if attributes.has_key?(:'market_group_id')
         self.market_group_id = attributes[:'market_group_id']
       end
 
-      if attributes.has_key?(:'mass')
-        self.mass = attributes[:'mass']
+      if attributes.has_key?(:'radius')
+        self.radius = attributes[:'radius']
       end
 
-      if attributes.has_key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.has_key?(:'volume')
+        self.volume = attributes[:'volume']
       end
 
       if attributes.has_key?(:'packaged_volume')
         self.packaged_volume = attributes[:'packaged_volume']
       end
 
+      if attributes.has_key?(:'icon_id')
+        self.icon_id = attributes[:'icon_id']
+      end
+
+      if attributes.has_key?(:'capacity')
+        self.capacity = attributes[:'capacity']
+      end
+
       if attributes.has_key?(:'portion_size')
         self.portion_size = attributes[:'portion_size']
       end
 
-      if attributes.has_key?(:'published')
-        self.published = attributes[:'published']
+      if attributes.has_key?(:'mass')
+        self.mass = attributes[:'mass']
       end
 
-      if attributes.has_key?(:'radius')
-        self.radius = attributes[:'radius']
+      if attributes.has_key?(:'graphic_id')
+        self.graphic_id = attributes[:'graphic_id']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'dogma_attributes')
+        if (value = attributes[:'dogma_attributes']).is_a?(Array)
+          self.dogma_attributes = value
+        end
       end
 
-      if attributes.has_key?(:'volume')
-        self.volume = attributes[:'volume']
+      if attributes.has_key?(:'dogma_effects')
+        if (value = attributes[:'dogma_effects']).is_a?(Array)
+          self.dogma_effects = value
+        end
       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 @description.nil?
-        invalid_properties.push("invalid value for 'description', description cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @group_id.nil?
-        invalid_properties.push("invalid value for 'group_id', group_id cannot be nil.")
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @name.nil?
-        invalid_properties.push("invalid value for 'name', name cannot be nil.")
+      if @description.nil?
+        invalid_properties.push('invalid value for "description", description cannot be nil.')
       end
 
       if @published.nil?
-        invalid_properties.push("invalid value for 'published', published cannot be nil.")
+        invalid_properties.push('invalid value for "published", published cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @group_id.nil?
+        invalid_properties.push('invalid value for "group_id", group_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 @description.nil?
-      return false if @group_id.nil?
+      return false if @type_id.nil?
       return false if @name.nil?
+      return false if @description.nil?
       return false if @published.nil?
-      return false if @type_id.nil?
-      return true
+      return false if @group_id.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -229,22 +227,22 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          capacity == o.capacity &&
+          type_id == o.type_id &&
+          name == o.name &&
           description == o.description &&
-          dogma_attributes == o.dogma_attributes &&
-          dogma_effects == o.dogma_effects &&
-          graphic_id == o.graphic_id &&
+          published == o.published &&
           group_id == o.group_id &&
-          icon_id == o.icon_id &&
           market_group_id == o.market_group_id &&
-          mass == o.mass &&
-          name == o.name &&
+          radius == o.radius &&
+          volume == o.volume &&
           packaged_volume == o.packaged_volume &&
+          icon_id == o.icon_id &&
+          capacity == o.capacity &&
           portion_size == o.portion_size &&
-          published == o.published &&
-          radius == o.radius &&
-          type_id == o.type_id &&
-          volume == o.volume
+          mass == o.mass &&
+          graphic_id == o.graphic_id &&
+          dogma_attributes == o.dogma_attributes &&
+          dogma_effects == o.dogma_effects
     end
 
     # @see the `==` method
@@ -256,7 +254,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [capacity, description, dogma_attributes, dogma_effects, graphic_id, group_id, icon_id, market_group_id, mass, name, packaged_volume, portion_size, published, radius, type_id, volume].hash
+      [type_id, name, description, published, group_id, market_group_id, radius, volume, packaged_volume, icon_id, capacity, portion_size, mass, graphic_id, dogma_attributes, dogma_effects].hash
     end
 
     # Builds the object from hash
@@ -269,7 +267,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]]))
@@ -351,7 +349,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) }
@@ -362,7 +360,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_wars_war_id_aggressor.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
   # 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
 
@@ -54,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.
@@ -102,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
@@ -117,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
@@ -130,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]]))
@@ -212,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) }
@@ -223,7 +221,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end