esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_characters_character_id_skills_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
 
@@ -21,12 +21,15 @@ module ESIClient
     # total_sp integer
     attr_accessor :total_sp
 
+    # Skill points available to be assigned
+    attr_accessor :unallocated_sp
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'skills' => :'skills',
-        :'total_sp' => :'total_sp'
+        :'total_sp' => :'total_sp',
+        :'unallocated_sp' => :'unallocated_sp'
       }
     end
 
@@ -34,7 +37,8 @@ module ESIClient
     def self.swagger_types
       {
         :'skills' => :'Array<GetCharactersCharacterIdSkillsSkill>',
-        :'total_sp' => :'Integer'
+        :'total_sp' => :'Integer',
+        :'unallocated_sp' => :'Integer'
       }
     end
 
@@ -44,7 +48,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?(:'skills')
         if (value = attributes[:'skills']).is_a?(Array)
@@ -56,19 +60,32 @@ module ESIClient
         self.total_sp = attributes[:'total_sp']
       end
 
+      if attributes.has_key?(:'unallocated_sp')
+        self.unallocated_sp = attributes[:'unallocated_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
-      return invalid_properties
+      if @skills.nil?
+        invalid_properties.push('invalid value for "skills", skills cannot be nil.')
+      end
+
+      if @total_sp.nil?
+        invalid_properties.push('invalid value for "total_sp", total_sp 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 true
+      return false if @skills.nil?
+      return false if @total_sp.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -77,7 +94,8 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           skills == o.skills &&
-          total_sp == o.total_sp
+          total_sp == o.total_sp &&
+          unallocated_sp == o.unallocated_sp
     end
 
     # @see the `==` method
@@ -89,7 +107,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [skills, total_sp].hash
+      [skills, total_sp, unallocated_sp].hash
     end
 
     # Builds the object from hash
@@ -102,7 +120,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]]))
@@ -184,7 +202,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) }
@@ -195,7 +213,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_characters_character_id_skills_skill.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,35 @@ require 'date'
 module ESIClient
   # skill object
   class GetCharactersCharacterIdSkillsSkill
-    # current_skill_level integer
-    attr_accessor :current_skill_level
-
     # skill_id integer
     attr_accessor :skill_id
 
     # skillpoints_in_skill integer
     attr_accessor :skillpoints_in_skill
 
+    # trained_skill_level integer
+    attr_accessor :trained_skill_level
+
+    # active_skill_level integer
+    attr_accessor :active_skill_level
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'current_skill_level' => :'current_skill_level',
         :'skill_id' => :'skill_id',
-        :'skillpoints_in_skill' => :'skillpoints_in_skill'
+        :'skillpoints_in_skill' => :'skillpoints_in_skill',
+        :'trained_skill_level' => :'trained_skill_level',
+        :'active_skill_level' => :'active_skill_level'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'current_skill_level' => :'Integer',
         :'skill_id' => :'Integer',
-        :'skillpoints_in_skill' => :'Integer'
+        :'skillpoints_in_skill' => :'Integer',
+        :'trained_skill_level' => :'Integer',
+        :'active_skill_level' => :'Integer'
       }
     end
 
@@ -49,11 +53,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}
-
-      if attributes.has_key?(:'current_skill_level')
-        self.current_skill_level = attributes[:'current_skill_level']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'skill_id')
         self.skill_id = attributes[:'skill_id']
@@ -63,19 +63,46 @@ module ESIClient
         self.skillpoints_in_skill = attributes[:'skillpoints_in_skill']
       end
 
+      if attributes.has_key?(:'trained_skill_level')
+        self.trained_skill_level = attributes[:'trained_skill_level']
+      end
+
+      if attributes.has_key?(:'active_skill_level')
+        self.active_skill_level = attributes[:'active_skill_level']
+      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
+      if @skill_id.nil?
+        invalid_properties.push('invalid value for "skill_id", skill_id cannot be nil.')
+      end
+
+      if @skillpoints_in_skill.nil?
+        invalid_properties.push('invalid value for "skillpoints_in_skill", skillpoints_in_skill cannot be nil.')
+      end
+
+      if @trained_skill_level.nil?
+        invalid_properties.push('invalid value for "trained_skill_level", trained_skill_level cannot be nil.')
+      end
+
+      if @active_skill_level.nil?
+        invalid_properties.push('invalid value for "active_skill_level", active_skill_level 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 true
+      return false if @skill_id.nil?
+      return false if @skillpoints_in_skill.nil?
+      return false if @trained_skill_level.nil?
+      return false if @active_skill_level.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -83,9 +110,10 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          current_skill_level == o.current_skill_level &&
           skill_id == o.skill_id &&
-          skillpoints_in_skill == o.skillpoints_in_skill
+          skillpoints_in_skill == o.skillpoints_in_skill &&
+          trained_skill_level == o.trained_skill_level &&
+          active_skill_level == o.active_skill_level
     end
 
     # @see the `==` method
@@ -97,7 +125,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [current_skill_level, skill_id, skillpoints_in_skill].hash
+      [skill_id, skillpoints_in_skill, trained_skill_level, active_skill_level].hash
     end
 
     # Builds the object from hash
@@ -110,7 +138,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]]))
@@ -192,7 +220,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) }
@@ -203,7 +231,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_characters_character_id_standings_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
 
@@ -70,7 +70,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?(:'from_id')
         self.from_id = attributes[:'from_id']
@@ -83,34 +83,33 @@ module ESIClient
       if attributes.has_key?(:'standing')
         self.standing = attributes[:'standing']
       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 @from_id.nil?
-        invalid_properties.push("invalid value for 'from_id', from_id cannot be nil.")
+        invalid_properties.push('invalid value for "from_id", from_id cannot be nil.')
       end
 
       if @from_type.nil?
-        invalid_properties.push("invalid value for 'from_type', from_type cannot be nil.")
+        invalid_properties.push('invalid value for "from_type", from_type cannot be nil.')
       end
 
       if @standing.nil?
-        invalid_properties.push("invalid value for 'standing', standing cannot be nil.")
+        invalid_properties.push('invalid value for "standing", standing cannot be nil.')
       end
 
       if @standing > 10
-        invalid_properties.push("invalid value for 'standing', must be smaller than or equal to 10.")
+        invalid_properties.push('invalid value for "standing", must be smaller than or equal to 10.')
       end
 
       if @standing < -10
-        invalid_properties.push("invalid value for 'standing', must be greater than or equal to -10.")
+        invalid_properties.push('invalid value for "standing", must be greater than or equal to -10.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
@@ -118,20 +117,20 @@ module ESIClient
     def valid?
       return false if @from_id.nil?
       return false if @from_type.nil?
-      from_type_validator = EnumAttributeValidator.new('String', ["agent", "npc_corp", "faction"])
+      from_type_validator = EnumAttributeValidator.new('String', ['agent', 'npc_corp', 'faction'])
       return false unless from_type_validator.valid?(@from_type)
       return false if @standing.nil?
       return false if @standing > 10
       return false if @standing < -10
-      return true
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] from_type Object to be assigned
     def from_type=(from_type)
-      validator = EnumAttributeValidator.new('String', ["agent", "npc_corp", "faction"])
+      validator = EnumAttributeValidator.new('String', ['agent', 'npc_corp', 'faction'])
       unless validator.valid?(from_type)
-        fail ArgumentError, "invalid value for 'from_type', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "from_type", must be one of #{validator.allowable_values}.'
       end
       @from_type = from_type
     end
@@ -140,15 +139,15 @@ module ESIClient
     # @param [Object] standing Value to be assigned
     def standing=(standing)
       if standing.nil?
-        fail ArgumentError, "standing cannot be nil"
+        fail ArgumentError, 'standing cannot be nil'
       end
 
       if standing > 10
-        fail ArgumentError, "invalid value for 'standing', must be smaller than or equal to 10."
+        fail ArgumentError, 'invalid value for "standing", must be smaller than or equal to 10.'
       end
 
       if standing < -10
-        fail ArgumentError, "invalid value for 'standing', must be greater than or equal to -10."
+        fail ArgumentError, 'invalid value for "standing", must be greater than or equal to -10.'
       end
 
       @standing = standing
@@ -186,7 +185,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]]))
@@ -268,7 +267,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) }
@@ -279,7 +278,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_characters_character_id_stats_200_ok.rb

@@ -0,0 +1,298 @@
+=begin
+#EVE Swagger Interface
+
+#An OpenAPI for EVE Online
+
+OpenAPI spec version: 0.7.5
+
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
+
+=end
+
+require 'date'
+
+module ESIClient
+  # Aggregate stats for a year
+  class GetCharactersCharacterIdStats200Ok
+    # Gregorian year for this set of aggregates
+    attr_accessor :year
+
+    attr_accessor :character
+
+    attr_accessor :combat
+
+    attr_accessor :industry
+
+    attr_accessor :inventory
+
+    attr_accessor :isk
+
+    attr_accessor :market
+
+    attr_accessor :mining
+
+    attr_accessor :_module
+
+    attr_accessor :orbital
+
+    attr_accessor :pve
+
+    attr_accessor :social
+
+    attr_accessor :travel
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'year' => :'year',
+        :'character' => :'character',
+        :'combat' => :'combat',
+        :'industry' => :'industry',
+        :'inventory' => :'inventory',
+        :'isk' => :'isk',
+        :'market' => :'market',
+        :'mining' => :'mining',
+        :'_module' => :'module',
+        :'orbital' => :'orbital',
+        :'pve' => :'pve',
+        :'social' => :'social',
+        :'travel' => :'travel'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'year' => :'Integer',
+        :'character' => :'GetCharactersCharacterIdStatsCharacter',
+        :'combat' => :'GetCharactersCharacterIdStatsCombat',
+        :'industry' => :'GetCharactersCharacterIdStatsIndustry',
+        :'inventory' => :'GetCharactersCharacterIdStatsInventory',
+        :'isk' => :'GetCharactersCharacterIdStatsIsk',
+        :'market' => :'GetCharactersCharacterIdStatsMarket',
+        :'mining' => :'GetCharactersCharacterIdStatsMining',
+        :'_module' => :'GetCharactersCharacterIdStatsModule',
+        :'orbital' => :'GetCharactersCharacterIdStatsOrbital',
+        :'pve' => :'GetCharactersCharacterIdStatsPve',
+        :'social' => :'GetCharactersCharacterIdStatsSocial',
+        :'travel' => :'GetCharactersCharacterIdStatsTravel'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      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?(:'year')
+        self.year = attributes[:'year']
+      end
+
+      if attributes.has_key?(:'character')
+        self.character = attributes[:'character']
+      end
+
+      if attributes.has_key?(:'combat')
+        self.combat = attributes[:'combat']
+      end
+
+      if attributes.has_key?(:'industry')
+        self.industry = attributes[:'industry']
+      end
+
+      if attributes.has_key?(:'inventory')
+        self.inventory = attributes[:'inventory']
+      end
+
+      if attributes.has_key?(:'isk')
+        self.isk = attributes[:'isk']
+      end
+
+      if attributes.has_key?(:'market')
+        self.market = attributes[:'market']
+      end
+
+      if attributes.has_key?(:'mining')
+        self.mining = attributes[:'mining']
+      end
+
+      if attributes.has_key?(:'module')
+        self._module = attributes[:'module']
+      end
+
+      if attributes.has_key?(:'orbital')
+        self.orbital = attributes[:'orbital']
+      end
+
+      if attributes.has_key?(:'pve')
+        self.pve = attributes[:'pve']
+      end
+
+      if attributes.has_key?(:'social')
+        self.social = attributes[:'social']
+      end
+
+      if attributes.has_key?(:'travel')
+        self.travel = attributes[:'travel']
+      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 @year.nil?
+        invalid_properties.push('invalid value for "year", year 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 @year.nil?
+      true
+    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 &&
+          year == o.year &&
+          character == o.character &&
+          combat == o.combat &&
+          industry == o.industry &&
+          inventory == o.inventory &&
+          isk == o.isk &&
+          market == o.market &&
+          mining == o.mining &&
+          _module == o._module &&
+          orbital == o.orbital &&
+          pve == o.pve &&
+          social == o.social &&
+          travel == o.travel
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [year, character, combat, industry, inventory, isk, market, mining, _module, orbital, pve, social, travel].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # 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) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = ESIClient.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @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) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end