ruby-esi 0.3.0 → 0.5.0

data/lib/ruby-esi/models/get_characters_character_id_contracts_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'
@@ -18,7 +17,7 @@ module ESI
     # Who will accept the contract
     attr_accessor :acceptor_id
 
-    # ID to whom the contract is assigned, can be corporation or character ID
+    # ID to whom the contract is assigned, can be alliance, corporation or character ID
     attr_accessor :assignee_id
 
     # To whom the contract is available
@@ -132,126 +131,139 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'acceptor_id' => :'Integer',
-        :'assignee_id' => :'Integer',
-        :'availability' => :'String',
-        :'buyout' => :'Float',
-        :'collateral' => :'Float',
-        :'contract_id' => :'Integer',
-        :'date_accepted' => :'DateTime',
-        :'date_completed' => :'DateTime',
-        :'date_expired' => :'DateTime',
-        :'date_issued' => :'DateTime',
-        :'days_to_complete' => :'Integer',
-        :'end_location_id' => :'Integer',
-        :'for_corporation' => :'BOOLEAN',
-        :'issuer_corporation_id' => :'Integer',
-        :'issuer_id' => :'Integer',
-        :'price' => :'Float',
-        :'reward' => :'Float',
-        :'start_location_id' => :'Integer',
-        :'status' => :'String',
-        :'title' => :'String',
-        :'type' => :'String',
-        :'volume' => :'Float'
+        :'acceptor_id' => :'Object',
+        :'assignee_id' => :'Object',
+        :'availability' => :'Object',
+        :'buyout' => :'Object',
+        :'collateral' => :'Object',
+        :'contract_id' => :'Object',
+        :'date_accepted' => :'Object',
+        :'date_completed' => :'Object',
+        :'date_expired' => :'Object',
+        :'date_issued' => :'Object',
+        :'days_to_complete' => :'Object',
+        :'end_location_id' => :'Object',
+        :'for_corporation' => :'Object',
+        :'issuer_corporation_id' => :'Object',
+        :'issuer_id' => :'Object',
+        :'price' => :'Object',
+        :'reward' => :'Object',
+        :'start_location_id' => :'Object',
+        :'status' => :'Object',
+        :'title' => :'Object',
+        :'type' => :'Object',
+        :'volume' => :'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::GetCharactersCharacterIdContracts200Ok` 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::GetCharactersCharacterIdContracts200Ok`. 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?(:'acceptor_id')
+      if attributes.key?(:'acceptor_id')
         self.acceptor_id = attributes[:'acceptor_id']
       end
 
-      if attributes.has_key?(:'assignee_id')
+      if attributes.key?(:'assignee_id')
         self.assignee_id = attributes[:'assignee_id']
       end
 
-      if attributes.has_key?(:'availability')
+      if attributes.key?(:'availability')
         self.availability = attributes[:'availability']
       end
 
-      if attributes.has_key?(:'buyout')
+      if attributes.key?(:'buyout')
         self.buyout = attributes[:'buyout']
       end
 
-      if attributes.has_key?(:'collateral')
+      if attributes.key?(:'collateral')
         self.collateral = attributes[:'collateral']
       end
 
-      if attributes.has_key?(:'contract_id')
+      if attributes.key?(:'contract_id')
         self.contract_id = attributes[:'contract_id']
       end
 
-      if attributes.has_key?(:'date_accepted')
+      if attributes.key?(:'date_accepted')
         self.date_accepted = attributes[:'date_accepted']
       end
 
-      if attributes.has_key?(:'date_completed')
+      if attributes.key?(:'date_completed')
         self.date_completed = attributes[:'date_completed']
       end
 
-      if attributes.has_key?(:'date_expired')
+      if attributes.key?(:'date_expired')
         self.date_expired = attributes[:'date_expired']
       end
 
-      if attributes.has_key?(:'date_issued')
+      if attributes.key?(:'date_issued')
         self.date_issued = attributes[:'date_issued']
       end
 
-      if attributes.has_key?(:'days_to_complete')
+      if attributes.key?(:'days_to_complete')
         self.days_to_complete = attributes[:'days_to_complete']
       end
 
-      if attributes.has_key?(:'end_location_id')
+      if attributes.key?(:'end_location_id')
         self.end_location_id = attributes[:'end_location_id']
       end
 
-      if attributes.has_key?(:'for_corporation')
+      if attributes.key?(:'for_corporation')
         self.for_corporation = attributes[:'for_corporation']
       end
 
-      if attributes.has_key?(:'issuer_corporation_id')
+      if attributes.key?(:'issuer_corporation_id')
         self.issuer_corporation_id = attributes[:'issuer_corporation_id']
       end
 
-      if attributes.has_key?(:'issuer_id')
+      if attributes.key?(:'issuer_id')
         self.issuer_id = attributes[:'issuer_id']
       end
 
-      if attributes.has_key?(:'price')
+      if attributes.key?(:'price')
         self.price = attributes[:'price']
       end
 
-      if attributes.has_key?(:'reward')
+      if attributes.key?(:'reward')
         self.reward = attributes[:'reward']
       end
 
-      if attributes.has_key?(:'start_location_id')
+      if attributes.key?(:'start_location_id')
         self.start_location_id = attributes[:'start_location_id']
       end
 
-      if attributes.has_key?(:'status')
+      if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
 
-      if attributes.has_key?(:'title')
+      if attributes.key?(:'title')
         self.title = attributes[:'title']
       end
 
-      if attributes.has_key?(:'type')
+      if attributes.key?(:'type')
         self.type = attributes[:'type']
       end
 
-      if attributes.has_key?(:'volume')
+      if attributes.key?(:'volume')
         self.volume = attributes[:'volume']
       end
     end
@@ -313,7 +325,7 @@ module ESI
       return false if @acceptor_id.nil?
       return false if @assignee_id.nil?
       return false if @availability.nil?
-      availability_validator = EnumAttributeValidator.new('String', ['public', 'personal', 'corporation', 'alliance'])
+      availability_validator = EnumAttributeValidator.new('Object', ['public', 'personal', 'corporation', 'alliance'])
       return false unless availability_validator.valid?(@availability)
       return false if @contract_id.nil?
       return false if @date_expired.nil?
@@ -322,10 +334,10 @@ module ESI
       return false if @issuer_corporation_id.nil?
       return false if @issuer_id.nil?
       return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
+      status_validator = EnumAttributeValidator.new('Object', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
       return false unless status_validator.valid?(@status)
       return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
+      type_validator = EnumAttributeValidator.new('Object', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
       return false unless type_validator.valid?(@type)
       true
     end
@@ -333,9 +345,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] availability Object to be assigned
     def availability=(availability)
-      validator = EnumAttributeValidator.new('String', ['public', 'personal', 'corporation', 'alliance'])
+      validator = EnumAttributeValidator.new('Object', ['public', 'personal', 'corporation', 'alliance'])
       unless validator.valid?(availability)
-        fail ArgumentError, 'invalid value for "availability", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"availability\", must be one of #{validator.allowable_values}."
       end
       @availability = availability
     end
@@ -343,9 +355,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
+      validator = EnumAttributeValidator.new('Object', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
       unless validator.valid?(status)
-        fail ArgumentError, 'invalid value for "status", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
       end
       @status = status
     end
@@ -353,9 +365,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
+      validator = EnumAttributeValidator.new('Object', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
       unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"type\", must be one of #{validator.allowable_values}."
       end
       @type = type
     end
@@ -396,17 +408,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [acceptor_id, assignee_id, availability, buyout, collateral, contract_id, date_accepted, date_completed, date_expired, date_issued, days_to_complete, end_location_id, for_corporation, issuer_corporation_id, issuer_id, price, reward, start_location_id, status, title, type, volume].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
@@ -415,7 +434,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
@@ -437,7 +458,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
@@ -458,8 +479,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
 
@@ -481,7 +501,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
@@ -503,7 +527,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_characters_character_id_contracts_contract_id_bids_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'
@@ -38,36 +37,49 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'amount' => :'Float',
-        :'bid_id' => :'Integer',
-        :'bidder_id' => :'Integer',
-        :'date_bid' => :'DateTime'
+        :'amount' => :'Object',
+        :'bid_id' => :'Object',
+        :'bidder_id' => :'Object',
+        :'date_bid' => :'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::GetCharactersCharacterIdContractsContractIdBids200Ok` 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::GetCharactersCharacterIdContractsContractIdBids200Ok`. 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?(:'amount')
+      if attributes.key?(:'amount')
         self.amount = attributes[:'amount']
       end
 
-      if attributes.has_key?(:'bid_id')
+      if attributes.key?(:'bid_id')
         self.bid_id = attributes[:'bid_id']
       end
 
-      if attributes.has_key?(:'bidder_id')
+      if attributes.key?(:'bidder_id')
         self.bidder_id = attributes[:'bidder_id']
       end
 
-      if attributes.has_key?(:'date_bid')
+      if attributes.key?(:'date_bid')
         self.date_bid = attributes[:'date_bid']
       end
     end
@@ -123,17 +135,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [amount, bid_id, bidder_id, date_bid].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
@@ -142,7 +161,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
@@ -164,7 +185,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
@@ -185,8 +206,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
 
@@ -208,7 +228,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
@@ -230,7 +254,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_characters_character_id_contracts_contract_id_bids_not_found.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'
@@ -26,21 +25,34 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'error' => :'String'
+        :'error' => :'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::GetCharactersCharacterIdContractsContractIdBidsNotFound` 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::GetCharactersCharacterIdContractsContractIdBidsNotFound`. 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?(:'error')
+      if attributes.key?(:'error')
         self.error = attributes[:'error']
       end
     end
@@ -73,17 +85,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [error].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
@@ -92,7 +111,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
@@ -114,7 +135,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
@@ -135,8 +156,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
 
@@ -158,7 +178,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
@@ -180,7 +204,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end