esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_characters_character_id_search_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
 
@@ -33,14 +33,14 @@ module ESIClient
     # faction array
     attr_accessor :faction
 
-    # inventorytype array
-    attr_accessor :inventorytype
+    # inventory_type array
+    attr_accessor :inventory_type
 
     # region array
     attr_accessor :region
 
-    # solarsystem array
-    attr_accessor :solarsystem
+    # solar_system array
+    attr_accessor :solar_system
 
     # station array
     attr_accessor :station
@@ -48,10 +48,6 @@ module ESIClient
     # structure array
     attr_accessor :structure
 
-    # wormhole array
-    attr_accessor :wormhole
-
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -61,12 +57,11 @@ module ESIClient
         :'constellation' => :'constellation',
         :'corporation' => :'corporation',
         :'faction' => :'faction',
-        :'inventorytype' => :'inventorytype',
+        :'inventory_type' => :'inventory_type',
         :'region' => :'region',
-        :'solarsystem' => :'solarsystem',
+        :'solar_system' => :'solar_system',
         :'station' => :'station',
-        :'structure' => :'structure',
-        :'wormhole' => :'wormhole'
+        :'structure' => :'structure'
       }
     end
 
@@ -79,12 +74,11 @@ module ESIClient
         :'constellation' => :'Array<Integer>',
         :'corporation' => :'Array<Integer>',
         :'faction' => :'Array<Integer>',
-        :'inventorytype' => :'Array<Integer>',
+        :'inventory_type' => :'Array<Integer>',
         :'region' => :'Array<Integer>',
-        :'solarsystem' => :'Array<Integer>',
+        :'solar_system' => :'Array<Integer>',
         :'station' => :'Array<Integer>',
-        :'structure' => :'Array<Integer>',
-        :'wormhole' => :'Array<Integer>'
+        :'structure' => :'Array<Integer>'
       }
     end
 
@@ -94,7 +88,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?(:'agent')
         if (value = attributes[:'agent']).is_a?(Array)
@@ -132,9 +126,9 @@ module ESIClient
         end
       end
 
-      if attributes.has_key?(:'inventorytype')
-        if (value = attributes[:'inventorytype']).is_a?(Array)
-          self.inventorytype = value
+      if attributes.has_key?(:'inventory_type')
+        if (value = attributes[:'inventory_type']).is_a?(Array)
+          self.inventory_type = value
         end
       end
 
@@ -144,9 +138,9 @@ module ESIClient
         end
       end
 
-      if attributes.has_key?(:'solarsystem')
-        if (value = attributes[:'solarsystem']).is_a?(Array)
-          self.solarsystem = value
+      if attributes.has_key?(:'solar_system')
+        if (value = attributes[:'solar_system']).is_a?(Array)
+          self.solar_system = value
         end
       end
 
@@ -161,26 +155,19 @@ module ESIClient
           self.structure = value
         end
       end
-
-      if attributes.has_key?(:'wormhole')
-        if (value = attributes[:'wormhole']).is_a?(Array)
-          self.wormhole = 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
-      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.
@@ -194,12 +181,11 @@ module ESIClient
           constellation == o.constellation &&
           corporation == o.corporation &&
           faction == o.faction &&
-          inventorytype == o.inventorytype &&
+          inventory_type == o.inventory_type &&
           region == o.region &&
-          solarsystem == o.solarsystem &&
+          solar_system == o.solar_system &&
           station == o.station &&
-          structure == o.structure &&
-          wormhole == o.wormhole
+          structure == o.structure
     end
 
     # @see the `==` method
@@ -211,7 +197,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [agent, alliance, character, constellation, corporation, faction, inventorytype, region, solarsystem, station, structure, wormhole].hash
+      [agent, alliance, character, constellation, corporation, faction, inventory_type, region, solar_system, station, structure].hash
     end
 
     # Builds the object from hash
@@ -224,7 +210,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]]))
@@ -306,7 +292,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) }
@@ -317,7 +303,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_characters_character_id_ship_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,31 +15,30 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCharactersCharacterIdShipOk
+    # ship_type_id integer
+    attr_accessor :ship_type_id
+
     # Item id's are unique to a ship and persist until it is repackaged. This value can be used to track repeated uses of a ship, or detect when a pilot changes into a different instance of the same ship type.
     attr_accessor :ship_item_id
 
     # ship_name string
     attr_accessor :ship_name
 
-    # ship_type_id integer
-    attr_accessor :ship_type_id
-
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'ship_type_id' => :'ship_type_id',
         :'ship_item_id' => :'ship_item_id',
-        :'ship_name' => :'ship_name',
-        :'ship_type_id' => :'ship_type_id'
+        :'ship_name' => :'ship_name'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'ship_type_id' => :'Integer',
         :'ship_item_id' => :'Integer',
-        :'ship_name' => :'String',
-        :'ship_type_id' => :'Integer'
+        :'ship_name' => :'String'
       }
     end
 
@@ -49,7 +48,11 @@ 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?(:'ship_type_id')
+        self.ship_type_id = attributes[:'ship_type_id']
+      end
 
       if attributes.has_key?(:'ship_item_id')
         self.ship_item_id = attributes[:'ship_item_id']
@@ -58,39 +61,34 @@ module ESIClient
       if attributes.has_key?(:'ship_name')
         self.ship_name = attributes[:'ship_name']
       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 @ship_item_id.nil?
-        invalid_properties.push("invalid value for 'ship_item_id', ship_item_id cannot be nil.")
+      if @ship_type_id.nil?
+        invalid_properties.push('invalid value for "ship_type_id", ship_type_id cannot be nil.')
       end
 
-      if @ship_name.nil?
-        invalid_properties.push("invalid value for 'ship_name', ship_name cannot be nil.")
+      if @ship_item_id.nil?
+        invalid_properties.push('invalid value for "ship_item_id", ship_item_id cannot be nil.')
       end
 
-      if @ship_type_id.nil?
-        invalid_properties.push("invalid value for 'ship_type_id', ship_type_id cannot be nil.")
+      if @ship_name.nil?
+        invalid_properties.push('invalid value for "ship_name", ship_name 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 @ship_type_id.nil?
       return false if @ship_item_id.nil?
       return false if @ship_name.nil?
-      return false if @ship_type_id.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -98,9 +96,9 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          ship_type_id == o.ship_type_id &&
           ship_item_id == o.ship_item_id &&
-          ship_name == o.ship_name &&
-          ship_type_id == o.ship_type_id
+          ship_name == o.ship_name
     end
 
     # @see the `==` method
@@ -112,7 +110,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [ship_item_id, ship_name, ship_type_id].hash
+      [ship_type_id, ship_item_id, ship_name].hash
     end
 
     # Builds the object from hash
@@ -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_characters_character_id_skillqueue_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,56 +15,55 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCharactersCharacterIdSkillqueue200Ok
+    # skill_id integer
+    attr_accessor :skill_id
+
     # finish_date string
     attr_accessor :finish_date
 
+    # start_date string
+    attr_accessor :start_date
+
     # finished_level integer
     attr_accessor :finished_level
 
-    # level_end_sp integer
-    attr_accessor :level_end_sp
-
-    # Amount of SP that was in the skill when it started training it's current level. Used to calculate % of current level complete.
-    attr_accessor :level_start_sp
-
     # queue_position integer
     attr_accessor :queue_position
 
-    # skill_id integer
-    attr_accessor :skill_id
-
-    # start_date string
-    attr_accessor :start_date
-
     # training_start_sp integer
     attr_accessor :training_start_sp
 
+    # level_end_sp integer
+    attr_accessor :level_end_sp
+
+    # Amount of SP that was in the skill when it started training it's current level. Used to calculate % of current level complete.
+    attr_accessor :level_start_sp
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'skill_id' => :'skill_id',
         :'finish_date' => :'finish_date',
+        :'start_date' => :'start_date',
         :'finished_level' => :'finished_level',
-        :'level_end_sp' => :'level_end_sp',
-        :'level_start_sp' => :'level_start_sp',
         :'queue_position' => :'queue_position',
-        :'skill_id' => :'skill_id',
-        :'start_date' => :'start_date',
-        :'training_start_sp' => :'training_start_sp'
+        :'training_start_sp' => :'training_start_sp',
+        :'level_end_sp' => :'level_end_sp',
+        :'level_start_sp' => :'level_start_sp'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'skill_id' => :'Integer',
         :'finish_date' => :'DateTime',
+        :'start_date' => :'DateTime',
         :'finished_level' => :'Integer',
-        :'level_end_sp' => :'Integer',
-        :'level_start_sp' => :'Integer',
         :'queue_position' => :'Integer',
-        :'skill_id' => :'Integer',
-        :'start_date' => :'DateTime',
-        :'training_start_sp' => :'Integer'
+        :'training_start_sp' => :'Integer',
+        :'level_end_sp' => :'Integer',
+        :'level_start_sp' => :'Integer'
       }
     end
 
@@ -74,93 +73,92 @@ 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?(:'finish_date')
-        self.finish_date = attributes[:'finish_date']
+      if attributes.has_key?(:'skill_id')
+        self.skill_id = attributes[:'skill_id']
       end
 
-      if attributes.has_key?(:'finished_level')
-        self.finished_level = attributes[:'finished_level']
+      if attributes.has_key?(:'finish_date')
+        self.finish_date = attributes[:'finish_date']
       end
 
-      if attributes.has_key?(:'level_end_sp')
-        self.level_end_sp = attributes[:'level_end_sp']
+      if attributes.has_key?(:'start_date')
+        self.start_date = attributes[:'start_date']
       end
 
-      if attributes.has_key?(:'level_start_sp')
-        self.level_start_sp = attributes[:'level_start_sp']
+      if attributes.has_key?(:'finished_level')
+        self.finished_level = attributes[:'finished_level']
       end
 
       if attributes.has_key?(:'queue_position')
         self.queue_position = attributes[:'queue_position']
       end
 
-      if attributes.has_key?(:'skill_id')
-        self.skill_id = attributes[:'skill_id']
+      if attributes.has_key?(:'training_start_sp')
+        self.training_start_sp = attributes[:'training_start_sp']
       end
 
-      if attributes.has_key?(:'start_date')
-        self.start_date = attributes[:'start_date']
+      if attributes.has_key?(:'level_end_sp')
+        self.level_end_sp = attributes[:'level_end_sp']
       end
 
-      if attributes.has_key?(:'training_start_sp')
-        self.training_start_sp = attributes[:'training_start_sp']
+      if attributes.has_key?(:'level_start_sp')
+        self.level_start_sp = attributes[:'level_start_sp']
       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 @skill_id.nil?
+        invalid_properties.push('invalid value for "skill_id", skill_id cannot be nil.')
+      end
+
       if @finished_level.nil?
-        invalid_properties.push("invalid value for 'finished_level', finished_level cannot be nil.")
+        invalid_properties.push('invalid value for "finished_level", finished_level cannot be nil.')
       end
 
       if @finished_level > 5
-        invalid_properties.push("invalid value for 'finished_level', must be smaller than or equal to 5.")
+        invalid_properties.push('invalid value for "finished_level", must be smaller than or equal to 5.')
       end
 
       if @finished_level < 0
-        invalid_properties.push("invalid value for 'finished_level', must be greater than or equal to 0.")
+        invalid_properties.push('invalid value for "finished_level", must be greater than or equal to 0.')
       end
 
       if @queue_position.nil?
-        invalid_properties.push("invalid value for 'queue_position', queue_position cannot be nil.")
-      end
-
-      if @skill_id.nil?
-        invalid_properties.push("invalid value for 'skill_id', skill_id cannot be nil.")
+        invalid_properties.push('invalid value for "queue_position", queue_position 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 @skill_id.nil?
       return false if @finished_level.nil?
       return false if @finished_level > 5
       return false if @finished_level < 0
       return false if @queue_position.nil?
-      return false if @skill_id.nil?
-      return true
+      true
     end
 
     # Custom attribute writer method with validation
     # @param [Object] finished_level Value to be assigned
     def finished_level=(finished_level)
       if finished_level.nil?
-        fail ArgumentError, "finished_level cannot be nil"
+        fail ArgumentError, 'finished_level cannot be nil'
       end
 
       if finished_level > 5
-        fail ArgumentError, "invalid value for 'finished_level', must be smaller than or equal to 5."
+        fail ArgumentError, 'invalid value for "finished_level", must be smaller than or equal to 5.'
       end
 
       if finished_level < 0
-        fail ArgumentError, "invalid value for 'finished_level', must be greater than or equal to 0."
+        fail ArgumentError, 'invalid value for "finished_level", must be greater than or equal to 0.'
       end
 
       @finished_level = finished_level
@@ -171,14 +169,14 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          skill_id == o.skill_id &&
           finish_date == o.finish_date &&
+          start_date == o.start_date &&
           finished_level == o.finished_level &&
-          level_end_sp == o.level_end_sp &&
-          level_start_sp == o.level_start_sp &&
           queue_position == o.queue_position &&
-          skill_id == o.skill_id &&
-          start_date == o.start_date &&
-          training_start_sp == o.training_start_sp
+          training_start_sp == o.training_start_sp &&
+          level_end_sp == o.level_end_sp &&
+          level_start_sp == o.level_start_sp
     end
 
     # @see the `==` method
@@ -190,7 +188,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [finish_date, finished_level, level_end_sp, level_start_sp, queue_position, skill_id, start_date, training_start_sp].hash
+      [skill_id, finish_date, start_date, finished_level, queue_position, training_start_sp, level_end_sp, level_start_sp].hash
     end
 
     # Builds the object from hash
@@ -203,7 +201,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]]))
@@ -285,7 +283,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) }
@@ -296,7 +294,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end