ruby-esi 0.3.0 → 0.5.0

data/lib/ruby-esi/models/get_characters_character_id_clones_jump_clone.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -64,43 +63,56 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'implants' => :'Array<Integer>',
-        :'jump_clone_id' => :'Integer',
-        :'location_id' => :'Integer',
-        :'location_type' => :'String',
-        :'name' => :'String'
+        :'implants' => :'Object',
+        :'jump_clone_id' => :'Object',
+        :'location_id' => :'Object',
+        :'location_type' => :'Object',
+        :'name' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::GetCharactersCharacterIdClonesJumpClone` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      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::GetCharactersCharacterIdClonesJumpClone`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'implants')
+      if attributes.key?(:'implants')
         if (value = attributes[:'implants']).is_a?(Array)
           self.implants = value
         end
       end
 
-      if attributes.has_key?(:'jump_clone_id')
+      if attributes.key?(:'jump_clone_id')
         self.jump_clone_id = attributes[:'jump_clone_id']
       end
 
-      if attributes.has_key?(:'location_id')
+      if attributes.key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'location_type')
+      if attributes.key?(:'location_type')
         self.location_type = attributes[:'location_type']
       end
 
-      if attributes.has_key?(:'name')
+      if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
     end
@@ -135,7 +147,7 @@ module ESI
       return false if @jump_clone_id.nil?
       return false if @location_id.nil?
       return false if @location_type.nil?
-      location_type_validator = EnumAttributeValidator.new('String', ['station', 'structure'])
+      location_type_validator = EnumAttributeValidator.new('Object', ['station', 'structure'])
       return false unless location_type_validator.valid?(@location_type)
       true
     end
@@ -143,9 +155,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] location_type Object to be assigned
     def location_type=(location_type)
-      validator = EnumAttributeValidator.new('String', ['station', 'structure'])
+      validator = EnumAttributeValidator.new('Object', ['station', 'structure'])
       unless validator.valid?(location_type)
-        fail ArgumentError, 'invalid value for "location_type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"location_type\", must be one of #{validator.allowable_values}."
       end
       @location_type = location_type
     end
@@ -169,17 +181,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [implants, jump_clone_id, location_id, location_type, name].hash
     end
 
+    # Builds the object from hash
+    # @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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -188,7 +207,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -210,7 +231,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -231,8 +252,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -254,7 +274,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -276,7 +300,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_characters_character_id_clones_ok.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -37,38 +36,51 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'home_location' => :'GetCharactersCharacterIdClonesHomeLocation',
-        :'jump_clones' => :'Array<GetCharactersCharacterIdClonesJumpClone>',
-        :'last_clone_jump_date' => :'DateTime',
-        :'last_station_change_date' => :'DateTime'
+        :'home_location' => :'Object',
+        :'jump_clones' => :'Object',
+        :'last_clone_jump_date' => :'Object',
+        :'last_station_change_date' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::GetCharactersCharacterIdClonesOk` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      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::GetCharactersCharacterIdClonesOk`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'home_location')
+      if attributes.key?(:'home_location')
         self.home_location = attributes[:'home_location']
       end
 
-      if attributes.has_key?(:'jump_clones')
+      if attributes.key?(:'jump_clones')
         if (value = attributes[:'jump_clones']).is_a?(Array)
           self.jump_clones = value
         end
       end
 
-      if attributes.has_key?(:'last_clone_jump_date')
+      if attributes.key?(:'last_clone_jump_date')
         self.last_clone_jump_date = attributes[:'last_clone_jump_date']
       end
 
-      if attributes.has_key?(:'last_station_change_date')
+      if attributes.key?(:'last_station_change_date')
         self.last_station_change_date = attributes[:'last_station_change_date']
       end
     end
@@ -109,17 +121,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [home_location, jump_clones, last_clone_jump_date, last_station_change_date].hash
     end
 
+    # Builds the object from hash
+    # @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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -128,7 +147,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -150,7 +171,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -171,8 +192,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -194,7 +214,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -216,7 +240,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_characters_character_id_contacts_200_ok.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -68,48 +67,61 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'contact_id' => :'Integer',
-        :'contact_type' => :'String',
-        :'is_blocked' => :'BOOLEAN',
-        :'is_watched' => :'BOOLEAN',
-        :'label_ids' => :'Array<Integer>',
-        :'standing' => :'Float'
+        :'contact_id' => :'Object',
+        :'contact_type' => :'Object',
+        :'is_blocked' => :'Object',
+        :'is_watched' => :'Object',
+        :'label_ids' => :'Object',
+        :'standing' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::GetCharactersCharacterIdContacts200Ok` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      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::GetCharactersCharacterIdContacts200Ok`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'contact_id')
+      if attributes.key?(:'contact_id')
         self.contact_id = attributes[:'contact_id']
       end
 
-      if attributes.has_key?(:'contact_type')
+      if attributes.key?(:'contact_type')
         self.contact_type = attributes[:'contact_type']
       end
 
-      if attributes.has_key?(:'is_blocked')
+      if attributes.key?(:'is_blocked')
         self.is_blocked = attributes[:'is_blocked']
       end
 
-      if attributes.has_key?(:'is_watched')
+      if attributes.key?(:'is_watched')
         self.is_watched = attributes[:'is_watched']
       end
 
-      if attributes.has_key?(:'label_ids')
+      if attributes.key?(:'label_ids')
         if (value = attributes[:'label_ids']).is_a?(Array)
           self.label_ids = value
         end
       end
 
-      if attributes.has_key?(:'standing')
+      if attributes.key?(:'standing')
         self.standing = attributes[:'standing']
       end
     end
@@ -138,7 +150,7 @@ module ESI
     def valid?
       return false if @contact_id.nil?
       return false if @contact_type.nil?
-      contact_type_validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction'])
+      contact_type_validator = EnumAttributeValidator.new('Object', ['character', 'corporation', 'alliance', 'faction'])
       return false unless contact_type_validator.valid?(@contact_type)
       return false if @standing.nil?
       true
@@ -147,9 +159,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] contact_type Object to be assigned
     def contact_type=(contact_type)
-      validator = EnumAttributeValidator.new('String', ['character', 'corporation', 'alliance', 'faction'])
+      validator = EnumAttributeValidator.new('Object', ['character', 'corporation', 'alliance', 'faction'])
       unless validator.valid?(contact_type)
-        fail ArgumentError, 'invalid value for "contact_type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"contact_type\", must be one of #{validator.allowable_values}."
       end
       @contact_type = contact_type
     end
@@ -174,17 +186,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [contact_id, contact_type, is_blocked, is_watched, label_ids, standing].hash
     end
 
+    # Builds the object from hash
+    # @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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -193,7 +212,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -215,7 +236,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -236,8 +257,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -259,7 +279,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -281,7 +305,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_characters_character_id_contacts_labels_200_ok.rb

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -30,26 +29,39 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'label_id' => :'Integer',
-        :'label_name' => :'String'
+        :'label_id' => :'Object',
+        :'label_name' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ESI::GetCharactersCharacterIdContactsLabels200Ok` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      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::GetCharactersCharacterIdContactsLabels200Ok`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'label_id')
+      if attributes.key?(:'label_id')
         self.label_id = attributes[:'label_id']
       end
 
-      if attributes.has_key?(:'label_name')
+      if attributes.key?(:'label_name')
         self.label_name = attributes[:'label_name']
       end
     end
@@ -93,17 +105,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [label_id, label_name].hash
     end
 
+    # Builds the object from hash
+    # @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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -112,7 +131,9 @@ module ESI
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -134,7 +155,7 @@ module ESI
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -155,8 +176,7 @@ module ESI
           end
         end
       else # model
-        temp_model = ESI.const_get(type).new
-        temp_model.build_from_hash(value)
+        ESI.const_get(type).build_from_hash(value)
       end
     end
 
@@ -178,7 +198,11 @@ module ESI
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -200,7 +224,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end