ruby-esi 0.5.1 → 0.6.0

data/lib/ruby-esi/models/get_killmails_killmail_id_killmail_hash_item.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
   # item 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
       {
-        :'flag' => :'Object',
-        :'item_type_id' => :'Object',
-        :'items' => :'Object',
-        :'quantity_destroyed' => :'Object',
-        :'quantity_dropped' => :'Object',
-        :'singleton' => :'Object'
+        :'flag' => :'Integer',
+        :'item_type_id' => :'Integer',
+        :'items' => :'Array<GetKillmailsKillmailIdKillmailHashItemsItem>',
+        :'quantity_destroyed' => :'Integer',
+        :'quantity_dropped' => :'Integer',
+        :'singleton' => :'Integer'
       }
     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::GetKillmailsKillmailIdKillmailHashItem`. 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::GetKillmailsKillmailIdKillmailHashItem`. 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?(:'flag')
         self.flag = attributes[:'flag']
+      else
+        self.flag = nil
       end
 
       if attributes.key?(:'item_type_id')
         self.item_type_id = attributes[:'item_type_id']
+      else
+        self.item_type_id = nil
       end
 
       if attributes.key?(:'items')
@@ -101,12 +118,15 @@ module ESI
 
       if attributes.key?(:'singleton')
         self.singleton = attributes[:'singleton']
+      else
+        self.singleton = 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 @flag.nil?
         invalid_properties.push('invalid value for "flag", flag cannot be nil.')
@@ -116,6 +136,10 @@ module ESI
         invalid_properties.push('invalid value for "item_type_id", item_type_id cannot be nil.')
       end
 
+      if !@items.nil? && @items.length > 10000
+        invalid_properties.push('invalid value for "items", number of items must be less than or equal to 10000.')
+      end
+
       if @singleton.nil?
         invalid_properties.push('invalid value for "singleton", singleton cannot be nil.')
       end
@@ -126,12 +150,58 @@ 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 @flag.nil?
       return false if @item_type_id.nil?
+      return false if !@items.nil? && @items.length > 10000
       return false if @singleton.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] flag Value to be assigned
+    def flag=(flag)
+      if flag.nil?
+        fail ArgumentError, 'flag cannot be nil'
+      end
+
+      @flag = flag
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] item_type_id Value to be assigned
+    def item_type_id=(item_type_id)
+      if item_type_id.nil?
+        fail ArgumentError, 'item_type_id cannot be nil'
+      end
+
+      @item_type_id = item_type_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] items Value to be assigned
+    def items=(items)
+      if items.nil?
+        fail ArgumentError, 'items cannot be nil'
+      end
+
+      if items.length > 10000
+        fail ArgumentError, 'invalid value for "items", number of items must be less than or equal to 10000.'
+      end
+
+      @items = items
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] singleton Value to be assigned
+    def singleton=(singleton)
+      if singleton.nil?
+        fail ArgumentError, 'singleton cannot be nil'
+      end
+
+      @singleton = singleton
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -161,39 +231,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
@@ -223,7 +287,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
 
@@ -271,5 +337,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/ruby-esi/models/get_killmails_killmail_id_killmail_hash_items_item.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
   # item 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
       {
-        :'flag' => :'Object',
-        :'item_type_id' => :'Object',
-        :'quantity_destroyed' => :'Object',
-        :'quantity_dropped' => :'Object',
-        :'singleton' => :'Object'
+        :'flag' => :'Integer',
+        :'item_type_id' => :'Integer',
+        :'quantity_destroyed' => :'Integer',
+        :'quantity_dropped' => :'Integer',
+        :'singleton' => :'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,19 +77,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::GetKillmailsKillmailIdKillmailHashItemsItem`. 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::GetKillmailsKillmailIdKillmailHashItemsItem`. 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?(:'flag')
         self.flag = attributes[:'flag']
+      else
+        self.flag = nil
       end
 
       if attributes.key?(:'item_type_id')
         self.item_type_id = attributes[:'item_type_id']
+      else
+        self.item_type_id = nil
       end
 
       if attributes.key?(:'quantity_destroyed')
@@ -90,12 +107,15 @@ module ESI
 
       if attributes.key?(:'singleton')
         self.singleton = attributes[:'singleton']
+      else
+        self.singleton = 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 @flag.nil?
         invalid_properties.push('invalid value for "flag", flag cannot be nil.')
@@ -115,12 +135,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 @flag.nil?
       return false if @item_type_id.nil?
       return false if @singleton.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] flag Value to be assigned
+    def flag=(flag)
+      if flag.nil?
+        fail ArgumentError, 'flag cannot be nil'
+      end
+
+      @flag = flag
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] item_type_id Value to be assigned
+    def item_type_id=(item_type_id)
+      if item_type_id.nil?
+        fail ArgumentError, 'item_type_id cannot be nil'
+      end
+
+      @item_type_id = item_type_id
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] singleton Value to be assigned
+    def singleton=(singleton)
+      if singleton.nil?
+        fail ArgumentError, 'singleton cannot be nil'
+      end
+
+      @singleton = singleton
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -149,39 +200,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
@@ -211,7 +256,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
 
@@ -259,5 +306,8 @@ module ESI
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end