esi_client 0.4.7 → 0.7.6.1

data/lib/esi_client/models/post_characters_character_id_mail_labels_label.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,12 +15,12 @@ require 'date'
 module ESIClient
   # label object
   class PostCharactersCharacterIdMailLabelsLabel
-    # Hexadecimal string representing label color, in RGB format 
-    attr_accessor :color
-
     # name string
     attr_accessor :name
 
+    # Hexadecimal string representing label color, in RGB format
+    attr_accessor :color
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -45,16 +46,16 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'color' => :'color',
-        :'name' => :'name'
+        :'name' => :'name',
+        :'color' => :'color'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'color' => :'String',
-        :'name' => :'String'
+        :'name' => :'String',
+        :'color' => :'String'
       }
     end
 
@@ -64,85 +65,84 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
-
-      if attributes.has_key?(:'color')
-        self.color = attributes[:'color']
-      else
-        self.color = "#ffffff"
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'name')
         self.name = attributes[:'name']
       end
 
+      if attributes.has_key?(:'color')
+        self.color = attributes[:'color']
+      else
+        self.color = '#ffffff'
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
       if @name.nil?
-        invalid_properties.push("invalid value for 'name', name cannot be nil.")
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
       if @name.to_s.length > 40
-        invalid_properties.push("invalid value for 'name', the character length must be smaller than or equal to 40.")
+        invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 40.')
       end
 
       if @name.to_s.length < 1
-        invalid_properties.push("invalid value for 'name', the character length must be great than or equal to 1.")
+        invalid_properties.push('invalid value for "name", the character length must be great than or equal to 1.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      color_validator = EnumAttributeValidator.new('String', ["#ffffff", "#ffff01", "#ff6600", "#fe0000", "#9a0000", "#660066", "#0000fe", "#0099ff", "#01ffff", "#00ff33", "#349800", "#006634", "#666666", "#999999", "#e6e6e6", "#ffffcd", "#99ffff", "#ccff9a"])
-      return false unless color_validator.valid?(@color)
       return false if @name.nil?
       return false if @name.to_s.length > 40
       return false if @name.to_s.length < 1
-      return true
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] color Object to be assigned
-    def color=(color)
-      validator = EnumAttributeValidator.new('String', ["#ffffff", "#ffff01", "#ff6600", "#fe0000", "#9a0000", "#660066", "#0000fe", "#0099ff", "#01ffff", "#00ff33", "#349800", "#006634", "#666666", "#999999", "#e6e6e6", "#ffffcd", "#99ffff", "#ccff9a"])
-      unless validator.valid?(color)
-        fail ArgumentError, "invalid value for 'color', must be one of #{validator.allowable_values}."
-      end
-      @color = color
+      color_validator = EnumAttributeValidator.new('String', ['#0000fe', '#006634', '#0099ff', '#00ff33', '#01ffff', '#349800', '#660066', '#666666', '#999999', '#99ffff', '#9a0000', '#ccff9a', '#e6e6e6', '#fe0000', '#ff6600', '#ffff01', '#ffffcd', '#ffffff'])
+      return false unless color_validator.valid?(@color)
+      true
     end
 
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
       if name.nil?
-        fail ArgumentError, "name cannot be nil"
+        fail ArgumentError, 'name cannot be nil'
       end
 
       if name.to_s.length > 40
-        fail ArgumentError, "invalid value for 'name', the character length must be smaller than or equal to 40."
+        fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 40.'
       end
 
       if name.to_s.length < 1
-        fail ArgumentError, "invalid value for 'name', the character length must be great than or equal to 1."
+        fail ArgumentError, 'invalid value for "name", the character length must be great than or equal to 1.'
       end
 
       @name = name
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] color Object to be assigned
+    def color=(color)
+      validator = EnumAttributeValidator.new('String', ['#0000fe', '#006634', '#0099ff', '#00ff33', '#01ffff', '#349800', '#660066', '#666666', '#999999', '#99ffff', '#9a0000', '#ccff9a', '#e6e6e6', '#fe0000', '#ff6600', '#ffff01', '#ffffcd', '#ffffff'])
+      unless validator.valid?(color)
+        fail ArgumentError, 'invalid value for "color", must be one of #{validator.allowable_values}.'
+      end
+      @color = color
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          color == o.color &&
-          name == o.name
+          name == o.name &&
+          color == o.color
     end
 
     # @see the `==` method
@@ -154,7 +154,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [color, name].hash
+      [name, color].hash
     end
 
     # Builds the object from hash
@@ -167,7 +167,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -249,7 +249,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -260,7 +260,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/post_characters_character_id_mail_mail.rb

@@ -3,47 +3,47 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
 require 'date'
 
 module ESIClient
-  # mail schema
+  # mail object
   class PostCharactersCharacterIdMailMail
-    # approved_cost integer
-    attr_accessor :approved_cost
-
-    # body string
-    attr_accessor :body
-
     # recipients array
     attr_accessor :recipients
 
     # subject string
     attr_accessor :subject
 
+    # body string
+    attr_accessor :body
+
+    # approved_cost integer
+    attr_accessor :approved_cost
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'approved_cost' => :'approved_cost',
-        :'body' => :'body',
         :'recipients' => :'recipients',
-        :'subject' => :'subject'
+        :'subject' => :'subject',
+        :'body' => :'body',
+        :'approved_cost' => :'approved_cost'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'approved_cost' => :'Integer',
-        :'body' => :'String',
         :'recipients' => :'Array<PostCharactersCharacterIdMailRecipient>',
-        :'subject' => :'String'
+        :'subject' => :'String',
+        :'body' => :'String',
+        :'approved_cost' => :'Integer'
       }
     end
 
@@ -53,17 +53,7 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
-
-      if attributes.has_key?(:'approved_cost')
-        self.approved_cost = attributes[:'approved_cost']
-      else
-        self.approved_cost = 0
-      end
-
-      if attributes.has_key?(:'body')
-        self.body = attributes[:'body']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'recipients')
         if (value = attributes[:'recipients']).is_a?(Array)
@@ -75,72 +65,81 @@ module ESIClient
         self.subject = attributes[:'subject']
       end
 
+      if attributes.has_key?(:'body')
+        self.body = attributes[:'body']
+      end
+
+      if attributes.has_key?(:'approved_cost')
+        self.approved_cost = attributes[:'approved_cost']
+      else
+        self.approved_cost = 0
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @body.nil?
-        invalid_properties.push("invalid value for 'body', body cannot be nil.")
+      if @recipients.nil?
+        invalid_properties.push('invalid value for "recipients", recipients cannot be nil.')
       end
 
-      if @body.to_s.length > 10000
-        invalid_properties.push("invalid value for 'body', the character length must be smaller than or equal to 10000.")
+      if @subject.nil?
+        invalid_properties.push('invalid value for "subject", subject cannot be nil.')
       end
 
-      if @recipients.nil?
-        invalid_properties.push("invalid value for 'recipients', recipients cannot be nil.")
+      if @subject.to_s.length > 1000
+        invalid_properties.push('invalid value for "subject", the character length must be smaller than or equal to 1000.')
       end
 
-      if @subject.nil?
-        invalid_properties.push("invalid value for 'subject', subject cannot be nil.")
+      if @body.nil?
+        invalid_properties.push('invalid value for "body", body cannot be nil.')
       end
 
-      if @subject.to_s.length > 1000
-        invalid_properties.push("invalid value for 'subject', the character length must be smaller than or equal to 1000.")
+      if @body.to_s.length > 10000
+        invalid_properties.push('invalid value for "body", the character length must be smaller than or equal to 10000.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @body.nil?
-      return false if @body.to_s.length > 10000
       return false if @recipients.nil?
       return false if @subject.nil?
       return false if @subject.to_s.length > 1000
-      return true
+      return false if @body.nil?
+      return false if @body.to_s.length > 10000
+      true
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] body Value to be assigned
-    def body=(body)
-      if body.nil?
-        fail ArgumentError, "body cannot be nil"
+    # @param [Object] subject Value to be assigned
+    def subject=(subject)
+      if subject.nil?
+        fail ArgumentError, 'subject cannot be nil'
       end
 
-      if body.to_s.length > 10000
-        fail ArgumentError, "invalid value for 'body', the character length must be smaller than or equal to 10000."
+      if subject.to_s.length > 1000
+        fail ArgumentError, 'invalid value for "subject", the character length must be smaller than or equal to 1000.'
       end
 
-      @body = body
+      @subject = subject
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] subject Value to be assigned
-    def subject=(subject)
-      if subject.nil?
-        fail ArgumentError, "subject cannot be nil"
+    # @param [Object] body Value to be assigned
+    def body=(body)
+      if body.nil?
+        fail ArgumentError, 'body cannot be nil'
       end
 
-      if subject.to_s.length > 1000
-        fail ArgumentError, "invalid value for 'subject', the character length must be smaller than or equal to 1000."
+      if body.to_s.length > 10000
+        fail ArgumentError, 'invalid value for "body", the character length must be smaller than or equal to 10000.'
       end
 
-      @subject = subject
+      @body = body
     end
 
     # Checks equality by comparing each attribute.
@@ -148,10 +147,10 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          approved_cost == o.approved_cost &&
-          body == o.body &&
           recipients == o.recipients &&
-          subject == o.subject
+          subject == o.subject &&
+          body == o.body &&
+          approved_cost == o.approved_cost
     end
 
     # @see the `==` method
@@ -163,7 +162,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [approved_cost, body, recipients, subject].hash
+      [recipients, subject, body, approved_cost].hash
     end
 
     # Builds the object from hash
@@ -176,7 +175,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -258,7 +257,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -269,7 +268,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/post_characters_character_id_mail_recipient.rb

@@ -3,9 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.4.7
+OpenAPI spec version: 0.7.6
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -14,12 +15,12 @@ require 'date'
 module ESIClient
   # recipient object
   class PostCharactersCharacterIdMailRecipient
-    # recipient_id integer
-    attr_accessor :recipient_id
-
     # recipient_type string
     attr_accessor :recipient_type
 
+    # recipient_id integer
+    attr_accessor :recipient_id
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -45,16 +46,16 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'recipient_id' => :'recipient_id',
-        :'recipient_type' => :'recipient_type'
+        :'recipient_type' => :'recipient_type',
+        :'recipient_id' => :'recipient_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'recipient_id' => :'Integer',
-        :'recipient_type' => :'String'
+        :'recipient_type' => :'String',
+        :'recipient_id' => :'Integer'
       }
     end
 
@@ -64,49 +65,48 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
-
-      if attributes.has_key?(:'recipient_id')
-        self.recipient_id = attributes[:'recipient_id']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'recipient_type')
         self.recipient_type = attributes[:'recipient_type']
       end
 
+      if attributes.has_key?(:'recipient_id')
+        self.recipient_id = attributes[:'recipient_id']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @recipient_id.nil?
-        invalid_properties.push("invalid value for 'recipient_id', recipient_id cannot be nil.")
+      if @recipient_type.nil?
+        invalid_properties.push('invalid value for "recipient_type", recipient_type cannot be nil.')
       end
 
-      if @recipient_type.nil?
-        invalid_properties.push("invalid value for 'recipient_type', recipient_type cannot be nil.")
+      if @recipient_id.nil?
+        invalid_properties.push('invalid value for "recipient_id", recipient_id cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @recipient_id.nil?
       return false if @recipient_type.nil?
-      recipient_type_validator = EnumAttributeValidator.new('String', ["alliance", "character", "corporation", "mailing_list"])
+      recipient_type_validator = EnumAttributeValidator.new('String', ['alliance', 'character', 'corporation', 'mailing_list'])
       return false unless recipient_type_validator.valid?(@recipient_type)
-      return true
+      return false if @recipient_id.nil?
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] recipient_type Object to be assigned
     def recipient_type=(recipient_type)
-      validator = EnumAttributeValidator.new('String', ["alliance", "character", "corporation", "mailing_list"])
+      validator = EnumAttributeValidator.new('String', ['alliance', 'character', 'corporation', 'mailing_list'])
       unless validator.valid?(recipient_type)
-        fail ArgumentError, "invalid value for 'recipient_type', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "recipient_type", must be one of #{validator.allowable_values}.'
       end
       @recipient_type = recipient_type
     end
@@ -116,8 +116,8 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          recipient_id == o.recipient_id &&
-          recipient_type == o.recipient_type
+          recipient_type == o.recipient_type &&
+          recipient_id == o.recipient_id
     end
 
     # @see the `==` method
@@ -129,7 +129,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [recipient_id, recipient_type].hash
+      [recipient_type, recipient_id].hash
     end
 
     # Builds the object from hash
@@ -142,7 +142,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -224,7 +224,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -235,7 +235,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end