ruby-esi 0.4.0 → 0.5.1

data/lib/ruby-esi/models/get_corporations_corporation_id_structures_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'
@@ -104,93 +103,106 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'corporation_id' => :'Integer',
-        :'fuel_expires' => :'DateTime',
-        :'name' => :'String',
-        :'next_reinforce_apply' => :'DateTime',
-        :'next_reinforce_hour' => :'Integer',
-        :'profile_id' => :'Integer',
-        :'reinforce_hour' => :'Integer',
-        :'services' => :'Array<GetCorporationsCorporationIdStructuresService>',
-        :'state' => :'String',
-        :'state_timer_end' => :'DateTime',
-        :'state_timer_start' => :'DateTime',
-        :'structure_id' => :'Integer',
-        :'system_id' => :'Integer',
-        :'type_id' => :'Integer',
-        :'unanchors_at' => :'DateTime'
+        :'corporation_id' => :'Object',
+        :'fuel_expires' => :'Object',
+        :'name' => :'Object',
+        :'next_reinforce_apply' => :'Object',
+        :'next_reinforce_hour' => :'Object',
+        :'profile_id' => :'Object',
+        :'reinforce_hour' => :'Object',
+        :'services' => :'Object',
+        :'state' => :'Object',
+        :'state_timer_end' => :'Object',
+        :'state_timer_start' => :'Object',
+        :'structure_id' => :'Object',
+        :'system_id' => :'Object',
+        :'type_id' => :'Object',
+        :'unanchors_at' => :'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::GetCorporationsCorporationIdStructures200Ok` 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::GetCorporationsCorporationIdStructures200Ok`. 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?(:'corporation_id')
+      if attributes.key?(:'corporation_id')
         self.corporation_id = attributes[:'corporation_id']
       end
 
-      if attributes.has_key?(:'fuel_expires')
+      if attributes.key?(:'fuel_expires')
         self.fuel_expires = attributes[:'fuel_expires']
       end
 
-      if attributes.has_key?(:'name')
+      if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'next_reinforce_apply')
+      if attributes.key?(:'next_reinforce_apply')
         self.next_reinforce_apply = attributes[:'next_reinforce_apply']
       end
 
-      if attributes.has_key?(:'next_reinforce_hour')
+      if attributes.key?(:'next_reinforce_hour')
         self.next_reinforce_hour = attributes[:'next_reinforce_hour']
       end
 
-      if attributes.has_key?(:'profile_id')
+      if attributes.key?(:'profile_id')
         self.profile_id = attributes[:'profile_id']
       end
 
-      if attributes.has_key?(:'reinforce_hour')
+      if attributes.key?(:'reinforce_hour')
         self.reinforce_hour = attributes[:'reinforce_hour']
       end
 
-      if attributes.has_key?(:'services')
+      if attributes.key?(:'services')
         if (value = attributes[:'services']).is_a?(Array)
           self.services = value
         end
       end
 
-      if attributes.has_key?(:'state')
+      if attributes.key?(:'state')
         self.state = attributes[:'state']
       end
 
-      if attributes.has_key?(:'state_timer_end')
+      if attributes.key?(:'state_timer_end')
         self.state_timer_end = attributes[:'state_timer_end']
       end
 
-      if attributes.has_key?(:'state_timer_start')
+      if attributes.key?(:'state_timer_start')
         self.state_timer_start = attributes[:'state_timer_start']
       end
 
-      if attributes.has_key?(:'structure_id')
+      if attributes.key?(:'structure_id')
         self.structure_id = attributes[:'structure_id']
       end
 
-      if attributes.has_key?(:'system_id')
+      if attributes.key?(:'system_id')
         self.system_id = attributes[:'system_id']
       end
 
-      if attributes.has_key?(:'type_id')
+      if attributes.key?(:'type_id')
         self.type_id = attributes[:'type_id']
       end
 
-      if attributes.has_key?(:'unanchors_at')
+      if attributes.key?(:'unanchors_at')
         self.unanchors_at = attributes[:'unanchors_at']
       end
     end
@@ -203,26 +215,10 @@ module ESI
         invalid_properties.push('invalid value for "corporation_id", corporation_id cannot be nil.')
       end
 
-      if !@next_reinforce_hour.nil? && @next_reinforce_hour > 23
-        invalid_properties.push('invalid value for "next_reinforce_hour", must be smaller than or equal to 23.')
-      end
-
-      if !@next_reinforce_hour.nil? && @next_reinforce_hour < 0
-        invalid_properties.push('invalid value for "next_reinforce_hour", must be greater than or equal to 0.')
-      end
-
       if @profile_id.nil?
         invalid_properties.push('invalid value for "profile_id", profile_id cannot be nil.')
       end
 
-      if !@reinforce_hour.nil? && @reinforce_hour > 23
-        invalid_properties.push('invalid value for "reinforce_hour", must be smaller than or equal to 23.')
-      end
-
-      if !@reinforce_hour.nil? && @reinforce_hour < 0
-        invalid_properties.push('invalid value for "reinforce_hour", must be greater than or equal to 0.')
-      end
-
       if @state.nil?
         invalid_properties.push('invalid value for "state", state cannot be nil.')
       end
@@ -246,13 +242,9 @@ module ESI
     # @return true if the model is valid
     def valid?
       return false if @corporation_id.nil?
-      return false if !@next_reinforce_hour.nil? && @next_reinforce_hour > 23
-      return false if !@next_reinforce_hour.nil? && @next_reinforce_hour < 0
       return false if @profile_id.nil?
-      return false if !@reinforce_hour.nil? && @reinforce_hour > 23
-      return false if !@reinforce_hour.nil? && @reinforce_hour < 0
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('String', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
+      state_validator = EnumAttributeValidator.new('Object', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
       return false unless state_validator.valid?(@state)
       return false if @structure_id.nil?
       return false if @system_id.nil?
@@ -260,40 +252,12 @@ module ESI
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] next_reinforce_hour Value to be assigned
-    def next_reinforce_hour=(next_reinforce_hour)
-      if !next_reinforce_hour.nil? && next_reinforce_hour > 23
-        fail ArgumentError, 'invalid value for "next_reinforce_hour", must be smaller than or equal to 23.'
-      end
-
-      if !next_reinforce_hour.nil? && next_reinforce_hour < 0
-        fail ArgumentError, 'invalid value for "next_reinforce_hour", must be greater than or equal to 0.'
-      end
-
-      @next_reinforce_hour = next_reinforce_hour
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] reinforce_hour Value to be assigned
-    def reinforce_hour=(reinforce_hour)
-      if !reinforce_hour.nil? && reinforce_hour > 23
-        fail ArgumentError, 'invalid value for "reinforce_hour", must be smaller than or equal to 23.'
-      end
-
-      if !reinforce_hour.nil? && reinforce_hour < 0
-        fail ArgumentError, 'invalid value for "reinforce_hour", must be greater than or equal to 0.'
-      end
-
-      @reinforce_hour = reinforce_hour
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
+      validator = EnumAttributeValidator.new('Object', ['anchor_vulnerable', 'anchoring', 'armor_reinforce', 'armor_vulnerable', 'deploy_vulnerable', 'fitting_invulnerable', 'hull_reinforce', 'hull_vulnerable', 'online_deprecated', 'onlining_vulnerable', 'shield_vulnerable', 'unanchored', 'unknown'])
       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
@@ -327,17 +291,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [corporation_id, fuel_expires, name, next_reinforce_apply, next_reinforce_hour, profile_id, reinforce_hour, services, state, state_timer_end, state_timer_start, structure_id, system_id, type_id, unanchors_at].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
@@ -346,7 +317,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
@@ -368,7 +341,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
@@ -389,8 +362,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
 
@@ -412,7 +384,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
@@ -434,7 +410,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/ruby-esi/models/get_corporations_corporation_id_structures_service.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'
@@ -52,26 +51,39 @@ module ESI
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'name' => :'String',
-        :'state' => :'String'
+        :'name' => :'Object',
+        :'state' => :'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::GetCorporationsCorporationIdStructuresService` 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::GetCorporationsCorporationIdStructuresService`. 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?(:'name')
+      if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'state')
+      if attributes.key?(:'state')
         self.state = attributes[:'state']
       end
     end
@@ -96,7 +108,7 @@ module ESI
     def valid?
       return false if @name.nil?
       return false if @state.nil?
-      state_validator = EnumAttributeValidator.new('String', ['online', 'offline', 'cleanup'])
+      state_validator = EnumAttributeValidator.new('Object', ['online', 'offline', 'cleanup'])
       return false unless state_validator.valid?(@state)
       true
     end
@@ -104,9 +116,9 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['online', 'offline', 'cleanup'])
+      validator = EnumAttributeValidator.new('Object', ['online', 'offline', 'cleanup'])
       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
@@ -127,17 +139,24 @@ module ESI
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [name, state].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
@@ -146,7 +165,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
@@ -168,7 +189,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
@@ -189,8 +210,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
 
@@ -212,7 +232,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
@@ -234,7 +258,5 @@ module ESI
       else
         value
       end
-    end
-
-  end
+    end  end
 end