esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_incursions_200_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,29 +15,29 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetIncursions200Ok
-    # The constellation id in which this incursion takes place
-    attr_accessor :constellation_id
+    # The type of this incursion
+    attr_accessor :type
 
-    # The attacking faction's id
-    attr_accessor :faction_id
+    # The state of this incursion
+    attr_accessor :state
+
+    # Influence of this incursion as a float from 0 to 1
+    attr_accessor :influence
 
     # Whether the final encounter has boss or not
     attr_accessor :has_boss
 
-    # A list of infested solar system ids that are a part of this incursion
-    attr_accessor :infested_solar_systems
+    # The attacking faction's id
+    attr_accessor :faction_id
 
-    # Influence of this incursion as a float from 0 to 1
-    attr_accessor :influence
+    # The constellation id in which this incursion takes place
+    attr_accessor :constellation_id
 
     # Staging solar system for this incursion
     attr_accessor :staging_solar_system_id
 
-    # The state of this incursion
-    attr_accessor :state
-
-    # The type of this incursion
-    attr_accessor :type
+    # A list of infested solar system ids that are a part of this incursion
+    attr_accessor :infested_solar_systems
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -64,28 +64,28 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'constellation_id' => :'constellation_id',
-        :'faction_id' => :'faction_id',
-        :'has_boss' => :'has_boss',
-        :'infested_solar_systems' => :'infested_solar_systems',
+        :'type' => :'type',
+        :'state' => :'state',
         :'influence' => :'influence',
+        :'has_boss' => :'has_boss',
+        :'faction_id' => :'faction_id',
+        :'constellation_id' => :'constellation_id',
         :'staging_solar_system_id' => :'staging_solar_system_id',
-        :'state' => :'state',
-        :'type' => :'type'
+        :'infested_solar_systems' => :'infested_solar_systems'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'constellation_id' => :'Integer',
-        :'faction_id' => :'Integer',
-        :'has_boss' => :'BOOLEAN',
-        :'infested_solar_systems' => :'Array<Integer>',
+        :'type' => :'String',
+        :'state' => :'String',
         :'influence' => :'Float',
+        :'has_boss' => :'BOOLEAN',
+        :'faction_id' => :'Integer',
+        :'constellation_id' => :'Integer',
         :'staging_solar_system_id' => :'Integer',
-        :'state' => :'String',
-        :'type' => :'String'
+        :'infested_solar_systems' => :'Array<Integer>'
       }
     end
 
@@ -95,105 +95,104 @@ 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?(:'constellation_id')
-        self.constellation_id = attributes[:'constellation_id']
+      if attributes.has_key?(:'type')
+        self.type = attributes[:'type']
       end
 
-      if attributes.has_key?(:'faction_id')
-        self.faction_id = attributes[:'faction_id']
+      if attributes.has_key?(:'state')
+        self.state = attributes[:'state']
+      end
+
+      if attributes.has_key?(:'influence')
+        self.influence = attributes[:'influence']
       end
 
       if attributes.has_key?(:'has_boss')
         self.has_boss = attributes[:'has_boss']
       end
 
-      if attributes.has_key?(:'infested_solar_systems')
-        if (value = attributes[:'infested_solar_systems']).is_a?(Array)
-          self.infested_solar_systems = value
-        end
+      if attributes.has_key?(:'faction_id')
+        self.faction_id = attributes[:'faction_id']
       end
 
-      if attributes.has_key?(:'influence')
-        self.influence = attributes[:'influence']
+      if attributes.has_key?(:'constellation_id')
+        self.constellation_id = attributes[:'constellation_id']
       end
 
       if attributes.has_key?(:'staging_solar_system_id')
         self.staging_solar_system_id = attributes[:'staging_solar_system_id']
       end
 
-      if attributes.has_key?(:'state')
-        self.state = attributes[:'state']
-      end
-
-      if attributes.has_key?(:'type')
-        self.type = attributes[:'type']
+      if attributes.has_key?(:'infested_solar_systems')
+        if (value = attributes[:'infested_solar_systems']).is_a?(Array)
+          self.infested_solar_systems = 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 @constellation_id.nil?
-        invalid_properties.push("invalid value for 'constellation_id', constellation_id cannot be nil.")
+      if @type.nil?
+        invalid_properties.push('invalid value for "type", type cannot be nil.')
       end
 
-      if @faction_id.nil?
-        invalid_properties.push("invalid value for 'faction_id', faction_id cannot be nil.")
+      if @state.nil?
+        invalid_properties.push('invalid value for "state", state cannot be nil.')
       end
 
-      if @has_boss.nil?
-        invalid_properties.push("invalid value for 'has_boss', has_boss cannot be nil.")
+      if @influence.nil?
+        invalid_properties.push('invalid value for "influence", influence cannot be nil.')
       end
 
-      if @infested_solar_systems.nil?
-        invalid_properties.push("invalid value for 'infested_solar_systems', infested_solar_systems cannot be nil.")
+      if @has_boss.nil?
+        invalid_properties.push('invalid value for "has_boss", has_boss cannot be nil.')
       end
 
-      if @influence.nil?
-        invalid_properties.push("invalid value for 'influence', influence cannot be nil.")
+      if @faction_id.nil?
+        invalid_properties.push('invalid value for "faction_id", faction_id cannot be nil.')
       end
 
-      if @staging_solar_system_id.nil?
-        invalid_properties.push("invalid value for 'staging_solar_system_id', staging_solar_system_id cannot be nil.")
+      if @constellation_id.nil?
+        invalid_properties.push('invalid value for "constellation_id", constellation_id cannot be nil.')
       end
 
-      if @state.nil?
-        invalid_properties.push("invalid value for 'state', state cannot be nil.")
+      if @staging_solar_system_id.nil?
+        invalid_properties.push('invalid value for "staging_solar_system_id", staging_solar_system_id cannot be nil.')
       end
 
-      if @type.nil?
-        invalid_properties.push("invalid value for 'type', type cannot be nil.")
+      if @infested_solar_systems.nil?
+        invalid_properties.push('invalid value for "infested_solar_systems", infested_solar_systems 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 @constellation_id.nil?
-      return false if @faction_id.nil?
-      return false if @has_boss.nil?
-      return false if @infested_solar_systems.nil?
-      return false if @influence.nil?
-      return false if @staging_solar_system_id.nil?
+      return false if @type.nil?
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('String', ["withdrawing", "mobilizing", "established"])
+      state_validator = EnumAttributeValidator.new('String', ['withdrawing', 'mobilizing', 'established'])
       return false unless state_validator.valid?(@state)
-      return false if @type.nil?
-      return true
+      return false if @influence.nil?
+      return false if @has_boss.nil?
+      return false if @faction_id.nil?
+      return false if @constellation_id.nil?
+      return false if @staging_solar_system_id.nil?
+      return false if @infested_solar_systems.nil?
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ["withdrawing", "mobilizing", "established"])
+      validator = EnumAttributeValidator.new('String', ['withdrawing', 'mobilizing', 'established'])
       unless validator.valid?(state)
-        fail ArgumentError, "invalid value for 'state', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
       end
       @state = state
     end
@@ -203,14 +202,14 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          constellation_id == o.constellation_id &&
-          faction_id == o.faction_id &&
-          has_boss == o.has_boss &&
-          infested_solar_systems == o.infested_solar_systems &&
+          type == o.type &&
+          state == o.state &&
           influence == o.influence &&
+          has_boss == o.has_boss &&
+          faction_id == o.faction_id &&
+          constellation_id == o.constellation_id &&
           staging_solar_system_id == o.staging_solar_system_id &&
-          state == o.state &&
-          type == o.type
+          infested_solar_systems == o.infested_solar_systems
     end
 
     # @see the `==` method
@@ -222,7 +221,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [constellation_id, faction_id, has_boss, infested_solar_systems, influence, staging_solar_system_id, state, type].hash
+      [type, state, influence, has_boss, faction_id, constellation_id, staging_solar_system_id, infested_solar_systems].hash
     end
 
     # Builds the object from hash
@@ -235,7 +234,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]]))
@@ -317,7 +316,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) }
@@ -328,7 +327,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_industry_facilities_200_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
 
@@ -18,31 +18,30 @@ module ESIClient
     # ID of the facility
     attr_accessor :facility_id
 
+    # Tax imposed by the facility
+    attr_accessor :tax
+
     # Owner of the facility
     attr_accessor :owner_id
 
-    # Region ID where the facility is
-    attr_accessor :region_id
+    # Type ID of the facility
+    attr_accessor :type_id
 
     # Solar system ID where the facility is
     attr_accessor :solar_system_id
 
-    # Tax imposed by the facility
-    attr_accessor :tax
-
-    # Type ID of the facility
-    attr_accessor :type_id
-
+    # Region ID where the facility is
+    attr_accessor :region_id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'facility_id' => :'facility_id',
+        :'tax' => :'tax',
         :'owner_id' => :'owner_id',
-        :'region_id' => :'region_id',
+        :'type_id' => :'type_id',
         :'solar_system_id' => :'solar_system_id',
-        :'tax' => :'tax',
-        :'type_id' => :'type_id'
+        :'region_id' => :'region_id'
       }
     end
 
@@ -50,11 +49,11 @@ module ESIClient
     def self.swagger_types
       {
         :'facility_id' => :'Integer',
+        :'tax' => :'Float',
         :'owner_id' => :'Integer',
-        :'region_id' => :'Integer',
+        :'type_id' => :'Integer',
         :'solar_system_id' => :'Integer',
-        :'tax' => :'Float',
-        :'type_id' => :'Integer'
+        :'region_id' => :'Integer'
       }
     end
 
@@ -64,59 +63,58 @@ 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?(:'facility_id')
         self.facility_id = attributes[:'facility_id']
       end
 
+      if attributes.has_key?(:'tax')
+        self.tax = attributes[:'tax']
+      end
+
       if attributes.has_key?(:'owner_id')
         self.owner_id = attributes[:'owner_id']
       end
 
-      if attributes.has_key?(:'region_id')
-        self.region_id = attributes[:'region_id']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
       if attributes.has_key?(:'solar_system_id')
         self.solar_system_id = attributes[:'solar_system_id']
       end
 
-      if attributes.has_key?(:'tax')
-        self.tax = attributes[:'tax']
-      end
-
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'region_id')
+        self.region_id = attributes[:'region_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 @facility_id.nil?
-        invalid_properties.push("invalid value for 'facility_id', facility_id cannot be nil.")
+        invalid_properties.push('invalid value for "facility_id", facility_id cannot be nil.')
       end
 
       if @owner_id.nil?
-        invalid_properties.push("invalid value for 'owner_id', owner_id cannot be nil.")
+        invalid_properties.push('invalid value for "owner_id", owner_id cannot be nil.')
       end
 
-      if @region_id.nil?
-        invalid_properties.push("invalid value for 'region_id', region_id cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id 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
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @region_id.nil?
+        invalid_properties.push('invalid value for "region_id", region_id cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
@@ -124,10 +122,10 @@ module ESIClient
     def valid?
       return false if @facility_id.nil?
       return false if @owner_id.nil?
-      return false if @region_id.nil?
-      return false if @solar_system_id.nil?
       return false if @type_id.nil?
-      return true
+      return false if @solar_system_id.nil?
+      return false if @region_id.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -136,11 +134,11 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           facility_id == o.facility_id &&
+          tax == o.tax &&
           owner_id == o.owner_id &&
-          region_id == o.region_id &&
+          type_id == o.type_id &&
           solar_system_id == o.solar_system_id &&
-          tax == o.tax &&
-          type_id == o.type_id
+          region_id == o.region_id
     end
 
     # @see the `==` method
@@ -152,7 +150,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [facility_id, owner_id, region_id, solar_system_id, tax, type_id].hash
+      [facility_id, tax, owner_id, type_id, solar_system_id, region_id].hash
     end
 
     # Builds the object from hash
@@ -165,7 +163,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]]))
@@ -247,7 +245,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) }
@@ -258,7 +256,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end