ruby-esi 0.5.0 → 0.6.0

data/lib/ruby-esi/models/{get_corporations_corporation_id_orders_history_200_ok.rb → get_corporations_corporation_id_orders_history200_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
@@ -106,25 +108,35 @@ 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
       {
-        :'duration' => :'Object',
-        :'escrow' => :'Object',
-        :'is_buy_order' => :'Object',
-        :'issued' => :'Object',
-        :'issued_by' => :'Object',
-        :'location_id' => :'Object',
-        :'min_volume' => :'Object',
-        :'order_id' => :'Object',
-        :'price' => :'Object',
-        :'range' => :'Object',
-        :'region_id' => :'Object',
-        :'state' => :'Object',
-        :'type_id' => :'Object',
-        :'volume_remain' => :'Object',
-        :'volume_total' => :'Object',
-        :'wallet_division' => :'Object'
+        :'duration' => :'Integer',
+        :'escrow' => :'Float',
+        :'is_buy_order' => :'Boolean',
+        :'issued' => :'Time',
+        :'issued_by' => :'Integer',
+        :'location_id' => :'Integer',
+        :'min_volume' => :'Integer',
+        :'order_id' => :'Integer',
+        :'price' => :'Float',
+        :'range' => :'String',
+        :'region_id' => :'Integer',
+        :'state' => :'String',
+        :'type_id' => :'Integer',
+        :'volume_remain' => :'Integer',
+        :'volume_total' => :'Integer',
+        :'wallet_division' => :'Integer'
       }
     end
 
@@ -133,7 +145,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -142,15 +154,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::GetCorporationsCorporationIdOrdersHistory200Ok`. 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::GetCorporationsCorporationIdOrdersHistory200Ok`. 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?(:'duration')
         self.duration = attributes[:'duration']
+      else
+        self.duration = nil
       end
 
       if attributes.key?(:'escrow')
@@ -163,6 +178,8 @@ module ESI
 
       if attributes.key?(:'issued')
         self.issued = attributes[:'issued']
+      else
+        self.issued = nil
       end
 
       if attributes.key?(:'issued_by')
@@ -171,6 +188,8 @@ module ESI
 
       if attributes.key?(:'location_id')
         self.location_id = attributes[:'location_id']
+      else
+        self.location_id = nil
       end
 
       if attributes.key?(:'min_volume')
@@ -179,44 +198,63 @@ module ESI
 
       if attributes.key?(:'order_id')
         self.order_id = attributes[:'order_id']
+      else
+        self.order_id = nil
       end
 
       if attributes.key?(:'price')
         self.price = attributes[:'price']
+      else
+        self.price = nil
       end
 
       if attributes.key?(:'range')
         self.range = attributes[:'range']
+      else
+        self.range = nil
       end
 
       if attributes.key?(:'region_id')
         self.region_id = attributes[:'region_id']
+      else
+        self.region_id = nil
       end
 
       if attributes.key?(:'state')
         self.state = attributes[:'state']
+      else
+        self.state = nil
       end
 
       if attributes.key?(:'type_id')
         self.type_id = attributes[:'type_id']
+      else
+        self.type_id = nil
       end
 
       if attributes.key?(:'volume_remain')
         self.volume_remain = attributes[:'volume_remain']
+      else
+        self.volume_remain = nil
       end
 
       if attributes.key?(:'volume_total')
         self.volume_total = attributes[:'volume_total']
+      else
+        self.volume_total = nil
       end
 
       if attributes.key?(:'wallet_division')
         self.wallet_division = attributes[:'wallet_division']
+      else
+        self.wallet_division = 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 @duration.nil?
         invalid_properties.push('invalid value for "duration", duration cannot be nil.')
@@ -266,51 +304,170 @@ module ESI
         invalid_properties.push('invalid value for "wallet_division", wallet_division cannot be nil.')
       end
 
+      if @wallet_division > 7
+        invalid_properties.push('invalid value for "wallet_division", must be smaller than or equal to 7.')
+      end
+
+      if @wallet_division < 1
+        invalid_properties.push('invalid value for "wallet_division", must be greater than or equal to 1.')
+      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 @duration.nil?
       return false if @issued.nil?
       return false if @location_id.nil?
       return false if @order_id.nil?
       return false if @price.nil?
       return false if @range.nil?
-      range_validator = EnumAttributeValidator.new('Object', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      range_validator = EnumAttributeValidator.new('String', ["1", "10", "2", "20", "3", "30", "4", "40", "5", "region", "solarsystem", "station"])
       return false unless range_validator.valid?(@range)
       return false if @region_id.nil?
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('Object', ['cancelled', 'expired'])
+      state_validator = EnumAttributeValidator.new('String', ["cancelled", "expired"])
       return false unless state_validator.valid?(@state)
       return false if @type_id.nil?
       return false if @volume_remain.nil?
       return false if @volume_total.nil?
       return false if @wallet_division.nil?
+      return false if @wallet_division > 7
+      return false if @wallet_division < 1
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] duration Value to be assigned
+    def duration=(duration)
+      if duration.nil?
+        fail ArgumentError, 'duration cannot be nil'
+      end
+
+      @duration = duration
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] issued Value to be assigned
+    def issued=(issued)
+      if issued.nil?
+        fail ArgumentError, 'issued cannot be nil'
+      end
+
+      @issued = issued
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] location_id Value to be assigned
+    def location_id=(location_id)
+      if location_id.nil?
+        fail ArgumentError, 'location_id cannot be nil'
+      end
+
+      @location_id = location_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] order_id Value to be assigned
+    def order_id=(order_id)
+      if order_id.nil?
+        fail ArgumentError, 'order_id cannot be nil'
+      end
+
+      @order_id = order_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] price Value to be assigned
+    def price=(price)
+      if price.nil?
+        fail ArgumentError, 'price cannot be nil'
+      end
+
+      @price = price
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] range Object to be assigned
     def range=(range)
-      validator = EnumAttributeValidator.new('Object', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      validator = EnumAttributeValidator.new('String', ["1", "10", "2", "20", "3", "30", "4", "40", "5", "region", "solarsystem", "station"])
       unless validator.valid?(range)
         fail ArgumentError, "invalid value for \"range\", must be one of #{validator.allowable_values}."
       end
       @range = range
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] region_id Value to be assigned
+    def region_id=(region_id)
+      if region_id.nil?
+        fail ArgumentError, 'region_id cannot be nil'
+      end
+
+      @region_id = region_id
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('Object', ['cancelled', 'expired'])
+      validator = EnumAttributeValidator.new('String', ["cancelled", "expired"])
       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] 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
+
+    # Custom attribute writer method with validation
+    # @param [Object] volume_remain Value to be assigned
+    def volume_remain=(volume_remain)
+      if volume_remain.nil?
+        fail ArgumentError, 'volume_remain cannot be nil'
+      end
+
+      @volume_remain = volume_remain
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] volume_total Value to be assigned
+    def volume_total=(volume_total)
+      if volume_total.nil?
+        fail ArgumentError, 'volume_total cannot be nil'
+      end
+
+      @volume_total = volume_total
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] wallet_division Value to be assigned
+    def wallet_division=(wallet_division)
+      if wallet_division.nil?
+        fail ArgumentError, 'wallet_division cannot be nil'
+      end
+
+      if wallet_division > 7
+        fail ArgumentError, 'invalid value for "wallet_division", must be smaller than or equal to 7.'
+      end
+
+      if wallet_division < 1
+        fail ArgumentError, 'invalid value for "wallet_division", must be greater than or equal to 1.'
+      end
+
+      @wallet_division = wallet_division
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -350,39 +507,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
@@ -412,7 +563,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
 
@@ -460,5 +613,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/{get_corporations_corporation_id_roles_200_ok.rb → get_corporations_corporation_id_roles200_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
@@ -78,18 +80,28 @@ 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
       {
-        :'character_id' => :'Object',
-        :'grantable_roles' => :'Object',
-        :'grantable_roles_at_base' => :'Object',
-        :'grantable_roles_at_hq' => :'Object',
-        :'grantable_roles_at_other' => :'Object',
-        :'roles' => :'Object',
-        :'roles_at_base' => :'Object',
-        :'roles_at_hq' => :'Object',
-        :'roles_at_other' => :'Object'
+        :'character_id' => :'Integer',
+        :'grantable_roles' => :'Array<String>',
+        :'grantable_roles_at_base' => :'Array<String>',
+        :'grantable_roles_at_hq' => :'Array<String>',
+        :'grantable_roles_at_other' => :'Array<String>',
+        :'roles' => :'Array<String>',
+        :'roles_at_base' => :'Array<String>',
+        :'roles_at_hq' => :'Array<String>',
+        :'roles_at_other' => :'Array<String>'
       }
     end
 
@@ -98,7 +110,7 @@ module ESI
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -107,15 +119,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::GetCorporationsCorporationIdRoles200Ok`. 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::GetCorporationsCorporationIdRoles200Ok`. 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?(:'character_id')
         self.character_id = attributes[:'character_id']
+      else
+        self.character_id = nil
       end
 
       if attributes.key?(:'grantable_roles')
@@ -170,21 +185,73 @@ 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 @character_id.nil?
         invalid_properties.push('invalid value for "character_id", character_id cannot be nil.')
       end
 
+      if !@grantable_roles.nil? && @grantable_roles.length > 100
+        invalid_properties.push('invalid value for "grantable_roles", number of items must be less than or equal to 100.')
+      end
+
+      if !@grantable_roles_at_base.nil? && @grantable_roles_at_base.length > 100
+        invalid_properties.push('invalid value for "grantable_roles_at_base", number of items must be less than or equal to 100.')
+      end
+
+      if !@grantable_roles_at_hq.nil? && @grantable_roles_at_hq.length > 100
+        invalid_properties.push('invalid value for "grantable_roles_at_hq", number of items must be less than or equal to 100.')
+      end
+
+      if !@grantable_roles_at_other.nil? && @grantable_roles_at_other.length > 100
+        invalid_properties.push('invalid value for "grantable_roles_at_other", number of items must be less than or equal to 100.')
+      end
+
+      if !@roles.nil? && @roles.length > 100
+        invalid_properties.push('invalid value for "roles", number of items must be less than or equal to 100.')
+      end
+
+      if !@roles_at_base.nil? && @roles_at_base.length > 100
+        invalid_properties.push('invalid value for "roles_at_base", number of items must be less than or equal to 100.')
+      end
+
+      if !@roles_at_hq.nil? && @roles_at_hq.length > 100
+        invalid_properties.push('invalid value for "roles_at_hq", number of items must be less than or equal to 100.')
+      end
+
+      if !@roles_at_other.nil? && @roles_at_other.length > 100
+        invalid_properties.push('invalid value for "roles_at_other", number of items must be less than or equal to 100.')
+      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 @character_id.nil?
+      return false if !@grantable_roles.nil? && @grantable_roles.length > 100
+      return false if !@grantable_roles_at_base.nil? && @grantable_roles_at_base.length > 100
+      return false if !@grantable_roles_at_hq.nil? && @grantable_roles_at_hq.length > 100
+      return false if !@grantable_roles_at_other.nil? && @grantable_roles_at_other.length > 100
+      return false if !@roles.nil? && @roles.length > 100
+      return false if !@roles_at_base.nil? && @roles_at_base.length > 100
+      return false if !@roles_at_hq.nil? && @roles_at_hq.length > 100
+      return false if !@roles_at_other.nil? && @roles_at_other.length > 100
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] character_id Value to be assigned
+    def character_id=(character_id)
+      if character_id.nil?
+        fail ArgumentError, 'character_id cannot be nil'
+      end
+
+      @character_id = character_id
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -217,39 +284,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
@@ -279,7 +340,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
 
@@ -327,5 +390,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end