ruby-esi 0.5.1 → 0.6.0

data/lib/ruby-esi/models/{get_sovereignty_structures_200_ok.rb → get_sovereignty_structures200_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
@@ -48,16 +50,26 @@ 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
       {
-        :'alliance_id' => :'Object',
-        :'solar_system_id' => :'Object',
-        :'structure_id' => :'Object',
-        :'structure_type_id' => :'Object',
-        :'vulnerability_occupancy_level' => :'Object',
-        :'vulnerable_end_time' => :'Object',
-        :'vulnerable_start_time' => :'Object'
+        :'alliance_id' => :'Integer',
+        :'solar_system_id' => :'Integer',
+        :'structure_id' => :'Integer',
+        :'structure_type_id' => :'Integer',
+        :'vulnerability_occupancy_level' => :'Float',
+        :'vulnerable_end_time' => :'Time',
+        :'vulnerable_start_time' => :'Time'
       }
     end
 
@@ -66,7 +78,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -75,27 +87,36 @@ 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::GetSovereigntyStructures200Ok`. 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::GetSovereigntyStructures200Ok`. 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?(:'alliance_id')
         self.alliance_id = attributes[:'alliance_id']
+      else
+        self.alliance_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?(:'structure_id')
         self.structure_id = attributes[:'structure_id']
+      else
+        self.structure_id = nil
       end
 
       if attributes.key?(:'structure_type_id')
         self.structure_type_id = attributes[:'structure_type_id']
+      else
+        self.structure_type_id = nil
       end
 
       if attributes.key?(:'vulnerability_occupancy_level')
@@ -114,6 +135,7 @@ 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 @alliance_id.nil?
         invalid_properties.push('invalid value for "alliance_id", alliance_id cannot be nil.')
@@ -137,6 +159,7 @@ 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 @alliance_id.nil?
       return false if @solar_system_id.nil?
       return false if @structure_id.nil?
@@ -144,6 +167,46 @@ module ESI
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] alliance_id Value to be assigned
+    def alliance_id=(alliance_id)
+      if alliance_id.nil?
+        fail ArgumentError, 'alliance_id cannot be nil'
+      end
+
+      @alliance_id = alliance_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] structure_id Value to be assigned
+    def structure_id=(structure_id)
+      if structure_id.nil?
+        fail ArgumentError, 'structure_id cannot be nil'
+      end
+
+      @structure_id = structure_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] structure_type_id Value to be assigned
+    def structure_type_id=(structure_type_id)
+      if structure_type_id.nil?
+        fail ArgumentError, 'structure_type_id cannot be nil'
+      end
+
+      @structure_type_id = structure_type_id
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -174,39 +237,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
@@ -236,7 +293,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
 
@@ -284,5 +343,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_status_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
@@ -36,13 +38,23 @@ 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
       {
-        :'players' => :'Object',
-        :'server_version' => :'Object',
-        :'start_time' => :'Object',
-        :'vip' => :'Object'
+        :'players' => :'Integer',
+        :'server_version' => :'String',
+        :'start_time' => :'Time',
+        :'vip' => :'Boolean'
       }
     end
 
@@ -51,7 +63,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -60,23 +72,30 @@ 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::GetStatusOk`. 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::GetStatusOk`. 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?(:'players')
         self.players = attributes[:'players']
+      else
+        self.players = nil
       end
 
       if attributes.key?(:'server_version')
         self.server_version = attributes[:'server_version']
+      else
+        self.server_version = nil
       end
 
       if attributes.key?(:'start_time')
         self.start_time = attributes[:'start_time']
+      else
+        self.start_time = nil
       end
 
       if attributes.key?(:'vip')
@@ -87,6 +106,7 @@ 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 @players.nil?
         invalid_properties.push('invalid value for "players", players cannot be nil.')
@@ -106,12 +126,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 @players.nil?
       return false if @server_version.nil?
       return false if @start_time.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] players Value to be assigned
+    def players=(players)
+      if players.nil?
+        fail ArgumentError, 'players cannot be nil'
+      end
+
+      @players = players
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] server_version Value to be assigned
+    def server_version=(server_version)
+      if server_version.nil?
+        fail ArgumentError, 'server_version cannot be nil'
+      end
+
+      @server_version = server_version
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] start_time Value to be assigned
+    def start_time=(start_time)
+      if start_time.nil?
+        fail ArgumentError, 'start_time cannot be nil'
+      end
+
+      @start_time = start_time
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -139,39 +190,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
@@ -201,7 +246,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
 
@@ -249,5 +296,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/{get_universe_ancestries_200_ok.rb → get_universe_ancestries200_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
@@ -44,15 +46,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
       {
-        :'bloodline_id' => :'Object',
-        :'description' => :'Object',
-        :'icon_id' => :'Object',
-        :'id' => :'Object',
-        :'name' => :'Object',
-        :'short_description' => :'Object'
+        :'bloodline_id' => :'Integer',
+        :'description' => :'String',
+        :'icon_id' => :'Integer',
+        :'id' => :'Integer',
+        :'name' => :'String',
+        :'short_description' => :'String'
       }
     end
 
@@ -61,7 +73,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -70,19 +82,24 @@ 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::GetUniverseAncestries200Ok`. 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::GetUniverseAncestries200Ok`. 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?(:'bloodline_id')
         self.bloodline_id = attributes[:'bloodline_id']
+      else
+        self.bloodline_id = nil
       end
 
       if attributes.key?(:'description')
         self.description = attributes[:'description']
+      else
+        self.description = nil
       end
 
       if attributes.key?(:'icon_id')
@@ -91,10 +108,14 @@ module ESI
 
       if attributes.key?(:'id')
         self.id = attributes[:'id']
+      else
+        self.id = nil
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'short_description')
@@ -105,6 +126,7 @@ 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 @bloodline_id.nil?
         invalid_properties.push('invalid value for "bloodline_id", bloodline_id cannot be nil.')
@@ -128,6 +150,7 @@ 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 @bloodline_id.nil?
       return false if @description.nil?
       return false if @id.nil?
@@ -135,6 +158,46 @@ module ESI
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] bloodline_id Value to be assigned
+    def bloodline_id=(bloodline_id)
+      if bloodline_id.nil?
+        fail ArgumentError, 'bloodline_id cannot be nil'
+      end
+
+      @bloodline_id = bloodline_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] description Value to be assigned
+    def description=(description)
+      if description.nil?
+        fail ArgumentError, 'description cannot be nil'
+      end
+
+      @description = description
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] id Value to be assigned
+    def id=(id)
+      if id.nil?
+        fail ArgumentError, 'id cannot be nil'
+      end
+
+      @id = id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] name Value to be assigned
+    def name=(name)
+      if name.nil?
+        fail ArgumentError, 'name cannot be nil'
+      end
+
+      @name = name
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -164,39 +227,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
@@ -226,7 +283,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
 
@@ -274,5 +333,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end