ruby-esi 0.4.0 → 0.5.1

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

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.8.2
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.23
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -56,61 +55,74 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'bookmark_id' => :'Integer',
-        :'coordinates' => :'GetCharactersCharacterIdBookmarksCoordinates',
-        :'created' => :'DateTime',
-        :'creator_id' => :'Integer',
-        :'folder_id' => :'Integer',
-        :'item' => :'GetCharactersCharacterIdBookmarksItem',
-        :'label' => :'String',
-        :'location_id' => :'Integer',
-        :'notes' => :'String'
+        :'bookmark_id' => :'Object',
+        :'coordinates' => :'Object',
+        :'created' => :'Object',
+        :'creator_id' => :'Object',
+        :'folder_id' => :'Object',
+        :'item' => :'Object',
+        :'label' => :'Object',
+        :'location_id' => :'Object',
+        :'notes' => :'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::GetCharactersCharacterIdBookmarks200Ok` 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::GetCharactersCharacterIdBookmarks200Ok`. 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?(:'bookmark_id')
+      if attributes.key?(:'bookmark_id')
         self.bookmark_id = attributes[:'bookmark_id']
       end
 
-      if attributes.has_key?(:'coordinates')
+      if attributes.key?(:'coordinates')
         self.coordinates = attributes[:'coordinates']
       end
 
-      if attributes.has_key?(:'created')
+      if attributes.key?(:'created')
         self.created = attributes[:'created']
       end
 
-      if attributes.has_key?(:'creator_id')
+      if attributes.key?(:'creator_id')
         self.creator_id = attributes[:'creator_id']
       end
 
-      if attributes.has_key?(:'folder_id')
+      if attributes.key?(:'folder_id')
         self.folder_id = attributes[:'folder_id']
       end
 
-      if attributes.has_key?(:'item')
+      if attributes.key?(:'item')
         self.item = attributes[:'item']
       end
 
-      if attributes.has_key?(:'label')
+      if attributes.key?(:'label')
         self.label = attributes[:'label']
       end
 
-      if attributes.has_key?(:'location_id')
+      if attributes.key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'notes')
+      if attributes.key?(:'notes')
         self.notes = attributes[:'notes']
       end
     end
@@ -181,17 +193,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [bookmark_id, coordinates, created, creator_id, folder_id, item, label, location_id, notes].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
@@ -200,7 +219,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
@@ -222,7 +243,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
@@ -243,8 +264,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
 
@@ -266,7 +286,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
@@ -288,7 +312,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

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

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.8.2
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.23
-
+Swagger Codegen version: 3.0.42
 =end
 
 require 'date'
@@ -34,31 +33,44 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'x' => :'Float',
-        :'y' => :'Float',
-        :'z' => :'Float'
+        :'x' => :'Object',
+        :'y' => :'Object',
+        :'z' => :'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::GetCharactersCharacterIdBookmarksCoordinates` 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::GetCharactersCharacterIdBookmarksCoordinates`. 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?(:'x')
+      if attributes.key?(:'x')
         self.x = attributes[:'x']
       end
 
-      if attributes.has_key?(:'y')
+      if attributes.key?(:'y')
         self.y = attributes[:'y']
       end
 
-      if attributes.has_key?(:'z')
+      if attributes.key?(:'z')
         self.z = attributes[:'z']
       end
     end
@@ -108,17 +120,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [x, y, z].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
@@ -127,7 +146,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
@@ -149,7 +170,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
@@ -170,8 +191,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
 
@@ -193,7 +213,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
@@ -215,7 +239,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

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

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.8.2
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.23
-
+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
       {
-        :'folder_id' => :'Integer',
-        :'name' => :'String'
+        :'folder_id' => :'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::GetCharactersCharacterIdBookmarksFolders200Ok` 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::GetCharactersCharacterIdBookmarksFolders200Ok`. 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?(:'folder_id')
+      if attributes.key?(:'folder_id')
         self.folder_id = attributes[:'folder_id']
       end
 
-      if attributes.has_key?(:'name')
+      if attributes.key?(:'name')
         self.name = attributes[:'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
       [folder_id, 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

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

@@ -3,11 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.8.2
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.23
-
+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
       {
-        :'item_id' => :'Integer',
-        :'type_id' => :'Integer'
+        :'item_id' => :'Object',
+        :'type_id' => :'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::GetCharactersCharacterIdBookmarksItem` 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::GetCharactersCharacterIdBookmarksItem`. 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?(:'item_id')
+      if attributes.key?(:'item_id')
         self.item_id = attributes[:'item_id']
       end
 
-      if attributes.has_key?(:'type_id')
+      if attributes.key?(:'type_id')
         self.type_id = attributes[:'type_id']
       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
       [item_id, type_id].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