ruby-esi 0.5.1 → 0.6.0

data/lib/ruby-esi/models/get_characters_character_id_planets_planet_id_extractor_details.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
   # extractor_details object
@@ -40,14 +42,24 @@ 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
       {
-        :'cycle_time' => :'Object',
-        :'head_radius' => :'Object',
-        :'heads' => :'Object',
-        :'product_type_id' => :'Object',
-        :'qty_per_cycle' => :'Object'
+        :'cycle_time' => :'Integer',
+        :'head_radius' => :'Float',
+        :'heads' => :'Array<GetCharactersCharacterIdPlanetsPlanetIdHead>',
+        :'product_type_id' => :'Integer',
+        :'qty_per_cycle' => :'Integer'
       }
     end
 
@@ -56,7 +68,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -65,9 +77,10 @@ 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::GetCharactersCharacterIdPlanetsPlanetIdExtractorDetails`. 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::GetCharactersCharacterIdPlanetsPlanetIdExtractorDetails`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -84,6 +97,8 @@ module ESI
         if (value = attributes[:'heads']).is_a?(Array)
           self.heads = value
         end
+      else
+        self.heads = nil
       end
 
       if attributes.key?(:'product_type_id')
@@ -98,21 +113,42 @@ module ESI
     # 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 @heads.nil?
         invalid_properties.push('invalid value for "heads", heads cannot be nil.')
       end
 
+      if @heads.length > 10
+        invalid_properties.push('invalid value for "heads", number of items must be less than or equal to 10.')
+      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?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @heads.nil?
+      return false if @heads.length > 10
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] heads Value to be assigned
+    def heads=(heads)
+      if heads.nil?
+        fail ArgumentError, 'heads cannot be nil'
+      end
+
+      if heads.length > 10
+        fail ArgumentError, 'invalid value for "heads", number of items must be less than or equal to 10.'
+      end
+
+      @heads = heads
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -141,39 +177,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
@@ -203,7 +233,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
 
@@ -251,5 +283,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_characters_character_id_planets_planet_id_factory_details.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
   # factory_details object
@@ -24,10 +26,20 @@ 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
       {
-        :'schematic_id' => :'Object'
+        :'schematic_id' => :'Integer'
       }
     end
 
@@ -36,7 +48,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -45,21 +57,25 @@ 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::GetCharactersCharacterIdPlanetsPlanetIdFactoryDetails`. 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::GetCharactersCharacterIdPlanetsPlanetIdFactoryDetails`. 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?(:'schematic_id')
         self.schematic_id = attributes[:'schematic_id']
+      else
+        self.schematic_id = 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 @schematic_id.nil?
         invalid_properties.push('invalid value for "schematic_id", schematic_id cannot be nil.')
@@ -71,10 +87,21 @@ 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 @schematic_id.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] schematic_id Value to be assigned
+    def schematic_id=(schematic_id)
+      if schematic_id.nil?
+        fail ArgumentError, 'schematic_id cannot be nil'
+      end
+
+      @schematic_id = schematic_id
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -99,39 +126,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
@@ -161,7 +182,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
 
@@ -209,5 +232,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_characters_character_id_planets_planet_id_head.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
   # head object
@@ -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
       {
-        :'head_id' => :'Object',
-        :'latitude' => :'Object',
-        :'longitude' => :'Object'
+        :'head_id' => :'Integer',
+        :'latitude' => :'Float',
+        :'longitude' => :'Float'
       }
     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,34 +67,50 @@ 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::GetCharactersCharacterIdPlanetsPlanetIdHead`. 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::GetCharactersCharacterIdPlanetsPlanetIdHead`. 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?(:'head_id')
         self.head_id = attributes[:'head_id']
+      else
+        self.head_id = nil
       end
 
       if attributes.key?(:'latitude')
         self.latitude = attributes[:'latitude']
+      else
+        self.latitude = nil
       end
 
       if attributes.key?(:'longitude')
         self.longitude = attributes[:'longitude']
+      else
+        self.longitude = 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 @head_id.nil?
         invalid_properties.push('invalid value for "head_id", head_id cannot be nil.')
       end
 
+      if @head_id > 9
+        invalid_properties.push('invalid value for "head_id", must be smaller than or equal to 9.')
+      end
+
+      if @head_id < 0
+        invalid_properties.push('invalid value for "head_id", must be greater than or equal to 0.')
+      end
+
       if @latitude.nil?
         invalid_properties.push('invalid value for "latitude", latitude cannot be nil.')
       end
@@ -97,12 +125,53 @@ 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 @head_id.nil?
+      return false if @head_id > 9
+      return false if @head_id < 0
       return false if @latitude.nil?
       return false if @longitude.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] head_id Value to be assigned
+    def head_id=(head_id)
+      if head_id.nil?
+        fail ArgumentError, 'head_id cannot be nil'
+      end
+
+      if head_id > 9
+        fail ArgumentError, 'invalid value for "head_id", must be smaller than or equal to 9.'
+      end
+
+      if head_id < 0
+        fail ArgumentError, 'invalid value for "head_id", must be greater than or equal to 0.'
+      end
+
+      @head_id = head_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] latitude Value to be assigned
+    def latitude=(latitude)
+      if latitude.nil?
+        fail ArgumentError, 'latitude cannot be nil'
+      end
+
+      @latitude = latitude
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] longitude Value to be assigned
+    def longitude=(longitude)
+      if longitude.nil?
+        fail ArgumentError, 'longitude cannot be nil'
+      end
+
+      @longitude = longitude
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -129,39 +198,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 +254,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 +304,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end