ruby-esi 0.5.0 → 0.6.0

data/lib/ruby-esi/models/{get_corporations_corporation_id_structures_200_ok.rb → get_corporations_corporation_id_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
@@ -102,24 +104,34 @@ 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
       {
-        :'corporation_id' => :'Object',
-        :'fuel_expires' => :'Object',
-        :'name' => :'Object',
-        :'next_reinforce_apply' => :'Object',
-        :'next_reinforce_hour' => :'Object',
-        :'profile_id' => :'Object',
-        :'reinforce_hour' => :'Object',
-        :'services' => :'Object',
-        :'state' => :'Object',
-        :'state_timer_end' => :'Object',
-        :'state_timer_start' => :'Object',
-        :'structure_id' => :'Object',
-        :'system_id' => :'Object',
-        :'type_id' => :'Object',
-        :'unanchors_at' => :'Object'
+        :'corporation_id' => :'Integer',
+        :'fuel_expires' => :'Time',
+        :'name' => :'String',
+        :'next_reinforce_apply' => :'Time',
+        :'next_reinforce_hour' => :'Integer',
+        :'profile_id' => :'Integer',
+        :'reinforce_hour' => :'Integer',
+        :'services' => :'Array<GetCorporationsCorporationIdStructuresService>',
+        :'state' => :'String',
+        :'state_timer_end' => :'Time',
+        :'state_timer_start' => :'Time',
+        :'structure_id' => :'Integer',
+        :'system_id' => :'Integer',
+        :'type_id' => :'Integer',
+        :'unanchors_at' => :'Time'
       }
     end
 
@@ -128,7 +140,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -137,15 +149,18 @@ 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::GetCorporationsCorporationIdStructures200Ok`. 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::GetCorporationsCorporationIdStructures200Ok`. 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?(:'corporation_id')
         self.corporation_id = attributes[:'corporation_id']
+      else
+        self.corporation_id = nil
       end
 
       if attributes.key?(:'fuel_expires')
@@ -166,6 +181,8 @@ module ESI
 
       if attributes.key?(:'profile_id')
         self.profile_id = attributes[:'profile_id']
+      else
+        self.profile_id = nil
       end
 
       if attributes.key?(:'reinforce_hour')
@@ -180,6 +197,8 @@ module ESI
 
       if attributes.key?(:'state')
         self.state = attributes[:'state']
+      else
+        self.state = nil
       end
 
       if attributes.key?(:'state_timer_end')
@@ -192,14 +211,20 @@ module ESI
 
       if attributes.key?(:'structure_id')
         self.structure_id = attributes[:'structure_id']
+      else
+        self.structure_id = nil
       end
 
       if attributes.key?(:'system_id')
         self.system_id = attributes[:'system_id']
+      else
+        self.system_id = nil
       end
 
       if attributes.key?(:'type_id')
         self.type_id = attributes[:'type_id']
+      else
+        self.type_id = nil
       end
 
       if attributes.key?(:'unanchors_at')
@@ -210,15 +235,36 @@ 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 @corporation_id.nil?
         invalid_properties.push('invalid value for "corporation_id", corporation_id cannot be nil.')
       end
 
+      if !@next_reinforce_hour.nil? && @next_reinforce_hour > 23
+        invalid_properties.push('invalid value for "next_reinforce_hour", must be smaller than or equal to 23.')
+      end
+
+      if !@next_reinforce_hour.nil? && @next_reinforce_hour < 0
+        invalid_properties.push('invalid value for "next_reinforce_hour", must be greater than or equal to 0.')
+      end
+
       if @profile_id.nil?
         invalid_properties.push('invalid value for "profile_id", profile_id cannot be nil.')
       end
 
+      if !@reinforce_hour.nil? && @reinforce_hour > 23
+        invalid_properties.push('invalid value for "reinforce_hour", must be smaller than or equal to 23.')
+      end
+
+      if !@reinforce_hour.nil? && @reinforce_hour < 0
+        invalid_properties.push('invalid value for "reinforce_hour", must be greater than or equal to 0.')
+      end
+
+      if !@services.nil? && @services.length > 10
+        invalid_properties.push('invalid value for "services", number of items must be less than or equal to 10.')
+      end
+
       if @state.nil?
         invalid_properties.push('invalid value for "state", state cannot be nil.')
       end
@@ -241,10 +287,16 @@ 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 @corporation_id.nil?
+      return false if !@next_reinforce_hour.nil? && @next_reinforce_hour > 23
+      return false if !@next_reinforce_hour.nil? && @next_reinforce_hour < 0
       return false if @profile_id.nil?
+      return false if !@reinforce_hour.nil? && @reinforce_hour > 23
+      return false if !@reinforce_hour.nil? && @reinforce_hour < 0
+      return false if !@services.nil? && @services.length > 10
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('Object', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
+      state_validator = EnumAttributeValidator.new('String', ["anchor_vulnerable", "anchoring", "armor_reinforce", "armor_vulnerable", "deploy_vulnerable", "fitting_invulnerable", "hull_reinforce", "hull_vulnerable", "online_deprecated", "onlining_vulnerable", "shield_vulnerable", "unanchored", "unknown"])
       return false unless state_validator.valid?(@state)
       return false if @structure_id.nil?
       return false if @system_id.nil?
@@ -252,16 +304,116 @@ module ESI
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] corporation_id Value to be assigned
+    def corporation_id=(corporation_id)
+      if corporation_id.nil?
+        fail ArgumentError, 'corporation_id cannot be nil'
+      end
+
+      @corporation_id = corporation_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] next_reinforce_hour Value to be assigned
+    def next_reinforce_hour=(next_reinforce_hour)
+      if next_reinforce_hour.nil?
+        fail ArgumentError, 'next_reinforce_hour cannot be nil'
+      end
+
+      if next_reinforce_hour > 23
+        fail ArgumentError, 'invalid value for "next_reinforce_hour", must be smaller than or equal to 23.'
+      end
+
+      if next_reinforce_hour < 0
+        fail ArgumentError, 'invalid value for "next_reinforce_hour", must be greater than or equal to 0.'
+      end
+
+      @next_reinforce_hour = next_reinforce_hour
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] profile_id Value to be assigned
+    def profile_id=(profile_id)
+      if profile_id.nil?
+        fail ArgumentError, 'profile_id cannot be nil'
+      end
+
+      @profile_id = profile_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] reinforce_hour Value to be assigned
+    def reinforce_hour=(reinforce_hour)
+      if reinforce_hour.nil?
+        fail ArgumentError, 'reinforce_hour cannot be nil'
+      end
+
+      if reinforce_hour > 23
+        fail ArgumentError, 'invalid value for "reinforce_hour", must be smaller than or equal to 23.'
+      end
+
+      if reinforce_hour < 0
+        fail ArgumentError, 'invalid value for "reinforce_hour", must be greater than or equal to 0.'
+      end
+
+      @reinforce_hour = reinforce_hour
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] services Value to be assigned
+    def services=(services)
+      if services.nil?
+        fail ArgumentError, 'services cannot be nil'
+      end
+
+      if services.length > 10
+        fail ArgumentError, 'invalid value for "services", number of items must be less than or equal to 10.'
+      end
+
+      @services = services
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('Object', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
+      validator = EnumAttributeValidator.new('String', ["anchor_vulnerable", "anchoring", "armor_reinforce", "armor_vulnerable", "deploy_vulnerable", "fitting_invulnerable", "hull_reinforce", "hull_vulnerable", "online_deprecated", "onlining_vulnerable", "shield_vulnerable", "unanchored", "unknown"])
       unless validator.valid?(state)
         fail ArgumentError, "invalid value for \"state\", must be one of #{validator.allowable_values}."
       end
       @state = state
     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] system_id Value to be assigned
+    def system_id=(system_id)
+      if system_id.nil?
+        fail ArgumentError, 'system_id cannot be nil'
+      end
+
+      @system_id = system_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] type_id Value to be assigned
+    def type_id=(type_id)
+      if type_id.nil?
+        fail ArgumentError, 'type_id cannot be nil'
+      end
+
+      @type_id = type_id
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -300,39 +452,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
@@ -362,7 +508,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
 
@@ -410,5 +558,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_corporations_corporation_id_structures_service.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
   # service object
@@ -50,11 +52,21 @@ 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
       {
-        :'name' => :'Object',
-        :'state' => :'Object'
+        :'name' => :'String',
+        :'state' => :'String'
       }
     end
 
@@ -63,7 +75,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -72,25 +84,31 @@ 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::GetCorporationsCorporationIdStructuresService`. 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::GetCorporationsCorporationIdStructuresService`. 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?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'state')
         self.state = attributes[:'state']
+      else
+        self.state = 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 @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -106,17 +124,28 @@ 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 @name.nil?
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('Object', ['online', 'offline', 'cleanup'])
+      state_validator = EnumAttributeValidator.new('String', ["online", "offline", "cleanup"])
       return false unless state_validator.valid?(@state)
       true
     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
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('Object', ['online', 'offline', 'cleanup'])
+      validator = EnumAttributeValidator.new('String', ["online", "offline", "cleanup"])
       unless validator.valid?(state)
         fail ArgumentError, "invalid value for \"state\", must be one of #{validator.allowable_values}."
       end
@@ -148,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
@@ -210,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
 
@@ -258,5 +283,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end