ruby-esi 0.5.0 → 0.6.0

data/lib/ruby-esi/models/get_fw_stats_kills.rb

@@ -3,13 +3,15 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.17
+The version of the OpenAPI document: 1.33
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.13.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
+require 'time'
 
 module ESI
   # Summary of kills against an enemy faction for the given faction
@@ -32,12 +34,22 @@ module ESI
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'last_week' => :'Object',
-        :'total' => :'Object',
-        :'yesterday' => :'Object'
+        :'last_week' => :'Integer',
+        :'total' => :'Integer',
+        :'yesterday' => :'Integer'
       }
     end
 
@@ -46,7 +58,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -55,29 +67,37 @@ module ESI
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwStatsKills`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwStatsKills`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'last_week')
         self.last_week = attributes[:'last_week']
+      else
+        self.last_week = nil
       end
 
       if attributes.key?(:'total')
         self.total = attributes[:'total']
+      else
+        self.total = nil
       end
 
       if attributes.key?(:'yesterday')
         self.yesterday = attributes[:'yesterday']
+      else
+        self.yesterday = nil
       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
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @last_week.nil?
         invalid_properties.push('invalid value for "last_week", last_week cannot be nil.')
@@ -97,12 +117,43 @@ module ESI
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @last_week.nil?
       return false if @total.nil?
       return false if @yesterday.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] last_week Value to be assigned
+    def last_week=(last_week)
+      if last_week.nil?
+        fail ArgumentError, 'last_week cannot be nil'
+      end
+
+      @last_week = last_week
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] total Value to be assigned
+    def total=(total)
+      if total.nil?
+        fail ArgumentError, 'total cannot be nil'
+      end
+
+      @total = total
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] yesterday Value to be assigned
+    def yesterday=(yesterday)
+      if yesterday.nil?
+        fail ArgumentError, 'yesterday cannot be nil'
+      end
+
+      @yesterday = yesterday
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -129,39 +180,33 @@ module ESI
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    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.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that 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) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     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)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -191,7 +236,9 @@ module ESI
           end
         end
       else # model
-        ESI.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = ESI.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -239,5 +286,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_fw_stats_victory_points.rb

@@ -3,13 +3,15 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.17
+The version of the OpenAPI document: 1.33
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.13.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
+require 'time'
 
 module ESI
   # Summary of victory points gained for the given faction
@@ -32,12 +34,22 @@ module ESI
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'last_week' => :'Object',
-        :'total' => :'Object',
-        :'yesterday' => :'Object'
+        :'last_week' => :'Integer',
+        :'total' => :'Integer',
+        :'yesterday' => :'Integer'
       }
     end
 
@@ -46,7 +58,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -55,29 +67,37 @@ module ESI
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwStatsVictoryPoints`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwStatsVictoryPoints`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'last_week')
         self.last_week = attributes[:'last_week']
+      else
+        self.last_week = nil
       end
 
       if attributes.key?(:'total')
         self.total = attributes[:'total']
+      else
+        self.total = nil
       end
 
       if attributes.key?(:'yesterday')
         self.yesterday = attributes[:'yesterday']
+      else
+        self.yesterday = nil
       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
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @last_week.nil?
         invalid_properties.push('invalid value for "last_week", last_week cannot be nil.')
@@ -97,12 +117,43 @@ module ESI
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @last_week.nil?
       return false if @total.nil?
       return false if @yesterday.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] last_week Value to be assigned
+    def last_week=(last_week)
+      if last_week.nil?
+        fail ArgumentError, 'last_week cannot be nil'
+      end
+
+      @last_week = last_week
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] total Value to be assigned
+    def total=(total)
+      if total.nil?
+        fail ArgumentError, 'total cannot be nil'
+      end
+
+      @total = total
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] yesterday Value to be assigned
+    def yesterday=(yesterday)
+      if yesterday.nil?
+        fail ArgumentError, 'yesterday cannot be nil'
+      end
+
+      @yesterday = yesterday
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -129,39 +180,33 @@ module ESI
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    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.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that 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) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     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)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -191,7 +236,9 @@ module ESI
           end
         end
       else # model
-        ESI.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = ESI.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -239,5 +286,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/{get_fw_systems_200_ok.rb → get_fw_systems200_ok.rb}

@@ -3,13 +3,15 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.17
+The version of the OpenAPI document: 1.33
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.13.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
+require 'time'
 
 module ESI
   # 200 ok object
@@ -66,15 +68,25 @@ module ESI
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'contested' => :'Object',
-        :'occupier_faction_id' => :'Object',
-        :'owner_faction_id' => :'Object',
-        :'solar_system_id' => :'Object',
-        :'victory_points' => :'Object',
-        :'victory_points_threshold' => :'Object'
+        :'contested' => :'String',
+        :'occupier_faction_id' => :'Integer',
+        :'owner_faction_id' => :'Integer',
+        :'solar_system_id' => :'Integer',
+        :'victory_points' => :'Integer',
+        :'victory_points_threshold' => :'Integer'
       }
     end
 
@@ -83,7 +95,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -92,41 +104,55 @@ module ESI
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwSystems200Ok`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ESI::GetFwSystems200Ok`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'contested')
         self.contested = attributes[:'contested']
+      else
+        self.contested = nil
       end
 
       if attributes.key?(:'occupier_faction_id')
         self.occupier_faction_id = attributes[:'occupier_faction_id']
+      else
+        self.occupier_faction_id = nil
       end
 
       if attributes.key?(:'owner_faction_id')
         self.owner_faction_id = attributes[:'owner_faction_id']
+      else
+        self.owner_faction_id = nil
       end
 
       if attributes.key?(:'solar_system_id')
         self.solar_system_id = attributes[:'solar_system_id']
+      else
+        self.solar_system_id = nil
       end
 
       if attributes.key?(:'victory_points')
         self.victory_points = attributes[:'victory_points']
+      else
+        self.victory_points = nil
       end
 
       if attributes.key?(:'victory_points_threshold')
         self.victory_points_threshold = attributes[:'victory_points_threshold']
+      else
+        self.victory_points_threshold = nil
       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
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @contested.nil?
         invalid_properties.push('invalid value for "contested", contested cannot be nil.')
@@ -158,8 +184,9 @@ module ESI
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @contested.nil?
-      contested_validator = EnumAttributeValidator.new('Object', ['captured', 'contested', 'uncontested', 'vulnerable'])
+      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?
@@ -172,13 +199,63 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] contested Object to be assigned
     def contested=(contested)
-      validator = EnumAttributeValidator.new('Object', ['captured', 'contested', 'uncontested', 'vulnerable'])
+      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
 
+    # Custom attribute writer method with validation
+    # @param [Object] occupier_faction_id Value to be assigned
+    def occupier_faction_id=(occupier_faction_id)
+      if occupier_faction_id.nil?
+        fail ArgumentError, 'occupier_faction_id cannot be nil'
+      end
+
+      @occupier_faction_id = occupier_faction_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] owner_faction_id Value to be assigned
+    def owner_faction_id=(owner_faction_id)
+      if owner_faction_id.nil?
+        fail ArgumentError, 'owner_faction_id cannot be nil'
+      end
+
+      @owner_faction_id = owner_faction_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] solar_system_id Value to be assigned
+    def solar_system_id=(solar_system_id)
+      if solar_system_id.nil?
+        fail ArgumentError, 'solar_system_id cannot be nil'
+      end
+
+      @solar_system_id = solar_system_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] victory_points Value to be assigned
+    def victory_points=(victory_points)
+      if victory_points.nil?
+        fail ArgumentError, 'victory_points cannot be nil'
+      end
+
+      @victory_points = victory_points
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] victory_points_threshold Value to be assigned
+    def victory_points_threshold=(victory_points_threshold)
+      if victory_points_threshold.nil?
+        fail ArgumentError, 'victory_points_threshold cannot be nil'
+      end
+
+      @victory_points_threshold = victory_points_threshold
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -208,39 +285,33 @@ module ESI
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    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.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that 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) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     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)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -270,7 +341,9 @@ module ESI
           end
         end
       else # model
-        ESI.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = ESI.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -318,5 +391,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end