esi_client 0.7.6.2 → 0.8.5.0

data/lib/esi_client/models/get_fw_systems_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,14 +15,17 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetFwSystems200Ok
-    # solar_system_id integer
-    attr_accessor :solar_system_id
+    # contested string
+    attr_accessor :contested
+
+    # occupier_faction_id integer
+    attr_accessor :occupier_faction_id
 
     # owner_faction_id integer
     attr_accessor :owner_faction_id
 
-    # occupier_faction_id integer
-    attr_accessor :occupier_faction_id
+    # solar_system_id integer
+    attr_accessor :solar_system_id
 
     # victory_points integer
     attr_accessor :victory_points
@@ -30,30 +33,49 @@ module ESIClient
     # victory_points_threshold integer
     attr_accessor :victory_points_threshold
 
-    # contested boolean
-    attr_accessor :contested
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'solar_system_id' => :'solar_system_id',
-        :'owner_faction_id' => :'owner_faction_id',
+        :'contested' => :'contested',
         :'occupier_faction_id' => :'occupier_faction_id',
+        :'owner_faction_id' => :'owner_faction_id',
+        :'solar_system_id' => :'solar_system_id',
         :'victory_points' => :'victory_points',
-        :'victory_points_threshold' => :'victory_points_threshold',
-        :'contested' => :'contested'
+        :'victory_points_threshold' => :'victory_points_threshold'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'solar_system_id' => :'Integer',
-        :'owner_faction_id' => :'Integer',
+        :'contested' => :'String',
         :'occupier_faction_id' => :'Integer',
+        :'owner_faction_id' => :'Integer',
+        :'solar_system_id' => :'Integer',
         :'victory_points' => :'Integer',
-        :'victory_points_threshold' => :'Integer',
-        :'contested' => :'BOOLEAN'
+        :'victory_points_threshold' => :'Integer'
       }
     end
 
@@ -65,16 +87,20 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'solar_system_id')
-        self.solar_system_id = attributes[:'solar_system_id']
+      if attributes.has_key?(:'contested')
+        self.contested = attributes[:'contested']
+      end
+
+      if attributes.has_key?(:'occupier_faction_id')
+        self.occupier_faction_id = attributes[:'occupier_faction_id']
       end
 
       if attributes.has_key?(:'owner_faction_id')
         self.owner_faction_id = attributes[:'owner_faction_id']
       end
 
-      if attributes.has_key?(:'occupier_faction_id')
-        self.occupier_faction_id = attributes[:'occupier_faction_id']
+      if attributes.has_key?(:'solar_system_id')
+        self.solar_system_id = attributes[:'solar_system_id']
       end
 
       if attributes.has_key?(:'victory_points')
@@ -84,26 +110,26 @@ module ESIClient
       if attributes.has_key?(:'victory_points_threshold')
         self.victory_points_threshold = attributes[:'victory_points_threshold']
       end
-
-      if attributes.has_key?(:'contested')
-        self.contested = attributes[:'contested']
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @solar_system_id.nil?
-        invalid_properties.push('invalid value for "solar_system_id", solar_system_id cannot be nil.')
+      if @contested.nil?
+        invalid_properties.push('invalid value for "contested", contested cannot be nil.')
+      end
+
+      if @occupier_faction_id.nil?
+        invalid_properties.push('invalid value for "occupier_faction_id", occupier_faction_id cannot be nil.')
       end
 
       if @owner_faction_id.nil?
         invalid_properties.push('invalid value for "owner_faction_id", owner_faction_id cannot be nil.')
       end
 
-      if @occupier_faction_id.nil?
-        invalid_properties.push('invalid value for "occupier_faction_id", occupier_faction_id cannot be nil.')
+      if @solar_system_id.nil?
+        invalid_properties.push('invalid value for "solar_system_id", solar_system_id cannot be nil.')
       end
 
       if @victory_points.nil?
@@ -114,36 +140,44 @@ module ESIClient
         invalid_properties.push('invalid value for "victory_points_threshold", victory_points_threshold cannot be nil.')
       end
 
-      if @contested.nil?
-        invalid_properties.push('invalid value for "contested", contested cannot be nil.')
-      end
-
       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 @solar_system_id.nil?
-      return false if @owner_faction_id.nil?
+      return false if @contested.nil?
+      contested_validator = EnumAttributeValidator.new('String', ['captured', 'contested', 'uncontested', 'vulnerable'])
+      return false unless contested_validator.valid?(@contested)
       return false if @occupier_faction_id.nil?
+      return false if @owner_faction_id.nil?
+      return false if @solar_system_id.nil?
       return false if @victory_points.nil?
       return false if @victory_points_threshold.nil?
-      return false if @contested.nil?
       true
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] contested Object to be assigned
+    def contested=(contested)
+      validator = EnumAttributeValidator.new('String', ['captured', 'contested', 'uncontested', 'vulnerable'])
+      unless validator.valid?(contested)
+        fail ArgumentError, 'invalid value for "contested", must be one of #{validator.allowable_values}.'
+      end
+      @contested = contested
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          solar_system_id == o.solar_system_id &&
-          owner_faction_id == o.owner_faction_id &&
+          contested == o.contested &&
           occupier_faction_id == o.occupier_faction_id &&
+          owner_faction_id == o.owner_faction_id &&
+          solar_system_id == o.solar_system_id &&
           victory_points == o.victory_points &&
-          victory_points_threshold == o.victory_points_threshold &&
-          contested == o.contested
+          victory_points_threshold == o.victory_points_threshold
     end
 
     # @see the `==` method
@@ -155,7 +189,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [solar_system_id, owner_faction_id, occupier_faction_id, victory_points, victory_points_threshold, contested].hash
+      [contested, occupier_faction_id, owner_faction_id, solar_system_id, victory_points, victory_points_threshold].hash
     end
 
     # Builds the object from hash

data/lib/esi_client/models/get_fw_wars_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,25 +15,25 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetFwWars200Ok
-    # faction_id integer
-    attr_accessor :faction_id
-
     # The faction ID of the enemy faction.
     attr_accessor :against_id
 
+    # faction_id integer
+    attr_accessor :faction_id
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'faction_id' => :'faction_id',
-        :'against_id' => :'against_id'
+        :'against_id' => :'against_id',
+        :'faction_id' => :'faction_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'faction_id' => :'Integer',
-        :'against_id' => :'Integer'
+        :'against_id' => :'Integer',
+        :'faction_id' => :'Integer'
       }
     end
 
@@ -45,35 +45,35 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'faction_id')
-        self.faction_id = attributes[:'faction_id']
-      end
-
       if attributes.has_key?(:'against_id')
         self.against_id = attributes[:'against_id']
       end
+
+      if attributes.has_key?(:'faction_id')
+        self.faction_id = attributes[:'faction_id']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @faction_id.nil?
-        invalid_properties.push('invalid value for "faction_id", faction_id cannot be nil.')
-      end
-
       if @against_id.nil?
         invalid_properties.push('invalid value for "against_id", against_id cannot be nil.')
       end
 
+      if @faction_id.nil?
+        invalid_properties.push('invalid value for "faction_id", faction_id cannot be nil.')
+      end
+
       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 @faction_id.nil?
       return false if @against_id.nil?
+      return false if @faction_id.nil?
       true
     end
 
@@ -82,8 +82,8 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          faction_id == o.faction_id &&
-          against_id == o.against_id
+          against_id == o.against_id &&
+          faction_id == o.faction_id
     end
 
     # @see the `==` method
@@ -95,7 +95,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [faction_id, against_id].hash
+      [against_id, faction_id].hash
     end
 
     # Builds the object from hash

data/lib/esi_client/models/get_incursions_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,29 +15,29 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetIncursions200Ok
-    # The type of this incursion
-    attr_accessor :type
-
-    # The state of this incursion
-    attr_accessor :state
+    # The constellation id in which this incursion takes place
+    attr_accessor :constellation_id
 
-    # Influence of this incursion as a float from 0 to 1
-    attr_accessor :influence
+    # The attacking faction's id
+    attr_accessor :faction_id
 
     # Whether the final encounter has boss or not
     attr_accessor :has_boss
 
-    # The attacking faction's id
-    attr_accessor :faction_id
+    # A list of infested solar system ids that are a part of this incursion
+    attr_accessor :infested_solar_systems
 
-    # The constellation id in which this incursion takes place
-    attr_accessor :constellation_id
+    # Influence of this incursion as a float from 0 to 1
+    attr_accessor :influence
 
     # Staging solar system for this incursion
     attr_accessor :staging_solar_system_id
 
-    # A list of infested solar system ids that are a part of this incursion
-    attr_accessor :infested_solar_systems
+    # The state of this incursion
+    attr_accessor :state
+
+    # The type of this incursion
+    attr_accessor :type
 
     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
       {
-        :'type' => :'type',
-        :'state' => :'state',
-        :'influence' => :'influence',
-        :'has_boss' => :'has_boss',
-        :'faction_id' => :'faction_id',
         :'constellation_id' => :'constellation_id',
+        :'faction_id' => :'faction_id',
+        :'has_boss' => :'has_boss',
+        :'infested_solar_systems' => :'infested_solar_systems',
+        :'influence' => :'influence',
         :'staging_solar_system_id' => :'staging_solar_system_id',
-        :'infested_solar_systems' => :'infested_solar_systems'
+        :'state' => :'state',
+        :'type' => :'type'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'type' => :'String',
-        :'state' => :'String',
-        :'influence' => :'Float',
-        :'has_boss' => :'BOOLEAN',
-        :'faction_id' => :'Integer',
         :'constellation_id' => :'Integer',
+        :'faction_id' => :'Integer',
+        :'has_boss' => :'BOOLEAN',
+        :'infested_solar_systems' => :'Array<Integer>',
+        :'influence' => :'Float',
         :'staging_solar_system_id' => :'Integer',
-        :'infested_solar_systems' => :'Array<Integer>'
+        :'state' => :'String',
+        :'type' => :'String'
       }
     end
 
@@ -97,38 +97,38 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'type')
-        self.type = attributes[:'type']
-      end
-
-      if attributes.has_key?(:'state')
-        self.state = attributes[:'state']
+      if attributes.has_key?(:'constellation_id')
+        self.constellation_id = attributes[:'constellation_id']
       end
 
-      if attributes.has_key?(:'influence')
-        self.influence = attributes[:'influence']
+      if attributes.has_key?(:'faction_id')
+        self.faction_id = attributes[:'faction_id']
       end
 
       if attributes.has_key?(:'has_boss')
         self.has_boss = attributes[:'has_boss']
       end
 
-      if attributes.has_key?(:'faction_id')
-        self.faction_id = attributes[:'faction_id']
+      if attributes.has_key?(:'infested_solar_systems')
+        if (value = attributes[:'infested_solar_systems']).is_a?(Array)
+          self.infested_solar_systems = value
+        end
       end
 
-      if attributes.has_key?(:'constellation_id')
-        self.constellation_id = attributes[:'constellation_id']
+      if attributes.has_key?(:'influence')
+        self.influence = attributes[:'influence']
       end
 
       if attributes.has_key?(:'staging_solar_system_id')
         self.staging_solar_system_id = attributes[:'staging_solar_system_id']
       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?(:'state')
+        self.state = attributes[:'state']
+      end
+
+      if attributes.has_key?(:'type')
+        self.type = attributes[:'type']
       end
     end
 
@@ -136,36 +136,36 @@ module ESIClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
-      if @state.nil?
-        invalid_properties.push('invalid value for "state", state cannot be nil.')
+      if @constellation_id.nil?
+        invalid_properties.push('invalid value for "constellation_id", constellation_id 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 @has_boss.nil?
         invalid_properties.push('invalid value for "has_boss", has_boss cannot be nil.')
       end
 
-      if @faction_id.nil?
-        invalid_properties.push('invalid value for "faction_id", faction_id cannot be nil.')
+      if @infested_solar_systems.nil?
+        invalid_properties.push('invalid value for "infested_solar_systems", infested_solar_systems cannot be nil.')
       end
 
-      if @constellation_id.nil?
-        invalid_properties.push('invalid value for "constellation_id", constellation_id cannot be nil.')
+      if @influence.nil?
+        invalid_properties.push('invalid value for "influence", influence 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.')
       end
 
-      if @infested_solar_systems.nil?
-        invalid_properties.push('invalid value for "infested_solar_systems", infested_solar_systems cannot be nil.')
+      if @state.nil?
+        invalid_properties.push('invalid value for "state", state cannot be nil.')
+      end
+
+      if @type.nil?
+        invalid_properties.push('invalid value for "type", type cannot be nil.')
       end
 
       invalid_properties
@@ -174,16 +174,16 @@ module ESIClient
     # 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 @type.nil?
+      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 @state.nil?
       state_validator = EnumAttributeValidator.new('String', ['withdrawing', 'mobilizing', 'established'])
       return false unless state_validator.valid?(@state)
-      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?
+      return false if @type.nil?
       true
     end
 
@@ -202,14 +202,14 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          type == o.type &&
-          state == o.state &&
-          influence == o.influence &&
-          has_boss == o.has_boss &&
-          faction_id == o.faction_id &&
           constellation_id == o.constellation_id &&
+          faction_id == o.faction_id &&
+          has_boss == o.has_boss &&
+          infested_solar_systems == o.infested_solar_systems &&
+          influence == o.influence &&
           staging_solar_system_id == o.staging_solar_system_id &&
-          infested_solar_systems == o.infested_solar_systems
+          state == o.state &&
+          type == o.type
     end
 
     # @see the `==` method
@@ -221,7 +221,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [type, state, influence, has_boss, faction_id, constellation_id, staging_solar_system_id, infested_solar_systems].hash
+      [constellation_id, faction_id, has_boss, infested_solar_systems, influence, staging_solar_system_id, state, type].hash
     end
 
     # Builds the object from hash