ruby-esi 0.4.0 → 0.5.0

data/lib/ruby-esi/models/get_corporations_corporation_id_orders_history_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'
@@ -108,96 +107,109 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'duration' => :'Integer',
-        :'escrow' => :'Float',
-        :'is_buy_order' => :'BOOLEAN',
-        :'issued' => :'DateTime',
-        :'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'
+        :'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'
       }
     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::GetCorporationsCorporationIdOrdersHistory200Ok` 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::GetCorporationsCorporationIdOrdersHistory200Ok`. 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?(:'duration')
+      if attributes.key?(:'duration')
         self.duration = attributes[:'duration']
       end
 
-      if attributes.has_key?(:'escrow')
+      if attributes.key?(:'escrow')
         self.escrow = attributes[:'escrow']
       end
 
-      if attributes.has_key?(:'is_buy_order')
+      if attributes.key?(:'is_buy_order')
         self.is_buy_order = attributes[:'is_buy_order']
       end
 
-      if attributes.has_key?(:'issued')
+      if attributes.key?(:'issued')
         self.issued = attributes[:'issued']
       end
 
-      if attributes.has_key?(:'issued_by')
+      if attributes.key?(:'issued_by')
         self.issued_by = attributes[:'issued_by']
       end
 
-      if attributes.has_key?(:'location_id')
+      if attributes.key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'min_volume')
+      if attributes.key?(:'min_volume')
         self.min_volume = attributes[:'min_volume']
       end
 
-      if attributes.has_key?(:'order_id')
+      if attributes.key?(:'order_id')
         self.order_id = attributes[:'order_id']
       end
 
-      if attributes.has_key?(:'price')
+      if attributes.key?(:'price')
         self.price = attributes[:'price']
       end
 
-      if attributes.has_key?(:'range')
+      if attributes.key?(:'range')
         self.range = attributes[:'range']
       end
 
-      if attributes.has_key?(:'region_id')
+      if attributes.key?(:'region_id')
         self.region_id = attributes[:'region_id']
       end
 
-      if attributes.has_key?(:'state')
+      if attributes.key?(:'state')
         self.state = attributes[:'state']
       end
 
-      if attributes.has_key?(:'type_id')
+      if attributes.key?(:'type_id')
         self.type_id = attributes[:'type_id']
       end
 
-      if attributes.has_key?(:'volume_remain')
+      if attributes.key?(:'volume_remain')
         self.volume_remain = attributes[:'volume_remain']
       end
 
-      if attributes.has_key?(:'volume_total')
+      if attributes.key?(:'volume_total')
         self.volume_total = attributes[:'volume_total']
       end
 
-      if attributes.has_key?(:'wallet_division')
+      if attributes.key?(:'wallet_division')
         self.wallet_division = attributes[:'wallet_division']
       end
     end
@@ -254,14 +266,6 @@ 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
 
@@ -274,27 +278,25 @@ module ESI
       return false if @order_id.nil?
       return false if @price.nil?
       return false if @range.nil?
-      range_validator = EnumAttributeValidator.new('String', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      range_validator = EnumAttributeValidator.new('Object', ['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('String', ['cancelled', 'expired'])
+      state_validator = EnumAttributeValidator.new('Object', ['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 checking allowed values (enum).
     # @param [Object] range Object to be assigned
     def range=(range)
-      validator = EnumAttributeValidator.new('String', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      validator = EnumAttributeValidator.new('Object', ['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}.'
+        fail ArgumentError, "invalid value for \"range\", must be one of #{validator.allowable_values}."
       end
       @range = range
     end
@@ -302,31 +304,13 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['cancelled', 'expired'])
+      validator = EnumAttributeValidator.new('Object', ['cancelled', 'expired'])
       unless validator.valid?(state)
-        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
+        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] 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)
@@ -357,17 +341,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [duration, escrow, is_buy_order, issued, issued_by, location_id, min_volume, order_id, price, range, region_id, state, type_id, volume_remain, volume_total, wallet_division].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
@@ -376,7 +367,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
@@ -398,7 +391,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
@@ -419,8 +412,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
 
@@ -442,7 +434,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
@@ -464,7 +460,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_corporations_corporation_id_roles_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'
@@ -80,75 +79,88 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'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>'
+        :'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'
       }
     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::GetCorporationsCorporationIdRoles200Ok` 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::GetCorporationsCorporationIdRoles200Ok`. 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?(:'character_id')
+      if attributes.key?(:'character_id')
         self.character_id = attributes[:'character_id']
       end
 
-      if attributes.has_key?(:'grantable_roles')
+      if attributes.key?(:'grantable_roles')
         if (value = attributes[:'grantable_roles']).is_a?(Array)
           self.grantable_roles = value
         end
       end
 
-      if attributes.has_key?(:'grantable_roles_at_base')
+      if attributes.key?(:'grantable_roles_at_base')
         if (value = attributes[:'grantable_roles_at_base']).is_a?(Array)
           self.grantable_roles_at_base = value
         end
       end
 
-      if attributes.has_key?(:'grantable_roles_at_hq')
+      if attributes.key?(:'grantable_roles_at_hq')
         if (value = attributes[:'grantable_roles_at_hq']).is_a?(Array)
           self.grantable_roles_at_hq = value
         end
       end
 
-      if attributes.has_key?(:'grantable_roles_at_other')
+      if attributes.key?(:'grantable_roles_at_other')
         if (value = attributes[:'grantable_roles_at_other']).is_a?(Array)
           self.grantable_roles_at_other = value
         end
       end
 
-      if attributes.has_key?(:'roles')
+      if attributes.key?(:'roles')
         if (value = attributes[:'roles']).is_a?(Array)
           self.roles = value
         end
       end
 
-      if attributes.has_key?(:'roles_at_base')
+      if attributes.key?(:'roles_at_base')
         if (value = attributes[:'roles_at_base']).is_a?(Array)
           self.roles_at_base = value
         end
       end
 
-      if attributes.has_key?(:'roles_at_hq')
+      if attributes.key?(:'roles_at_hq')
         if (value = attributes[:'roles_at_hq']).is_a?(Array)
           self.roles_at_hq = value
         end
       end
 
-      if attributes.has_key?(:'roles_at_other')
+      if attributes.key?(:'roles_at_other')
         if (value = attributes[:'roles_at_other']).is_a?(Array)
           self.roles_at_other = value
         end
@@ -196,17 +208,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [character_id, grantable_roles, grantable_roles_at_base, grantable_roles_at_hq, grantable_roles_at_other, roles, roles_at_base, roles_at_hq, roles_at_other].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
@@ -215,7 +234,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
@@ -237,7 +258,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
@@ -258,8 +279,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
 
@@ -281,7 +301,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
@@ -303,7 +327,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end