esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/post_characters_character_id_mail_recipient.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,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
@@ -46,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
 
@@ -65,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
@@ -117,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
@@ -130,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
@@ -143,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]]))
@@ -225,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) }
@@ -236,7 +235,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/post_corporations_corporation_id_assets_locations_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -18,23 +18,13 @@ module ESIClient
     # item_id integer
     attr_accessor :item_id
 
-    # x number
-    attr_accessor :x
-
-    # y number
-    attr_accessor :y
-
-    # z number
-    attr_accessor :z
-
+    attr_accessor :position
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'item_id' => :'item_id',
-        :'x' => :'x',
-        :'y' => :'y',
-        :'z' => :'z'
+        :'position' => :'position'
       }
     end
 
@@ -42,9 +32,7 @@ module ESIClient
     def self.swagger_types
       {
         :'item_id' => :'Integer',
-        :'x' => :'Float',
-        :'y' => :'Float',
-        :'z' => :'Float'
+        :'position' => :'PostCorporationsCorporationIdAssetsLocationsPosition'
       }
     end
 
@@ -54,57 +42,38 @@ 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}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'item_id')
         self.item_id = attributes[:'item_id']
       end
 
-      if attributes.has_key?(:'x')
-        self.x = attributes[:'x']
-      end
-
-      if attributes.has_key?(:'y')
-        self.y = attributes[:'y']
-      end
-
-      if attributes.has_key?(:'z')
-        self.z = attributes[:'z']
+      if attributes.has_key?(:'position')
+        self.position = attributes[:'position']
       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 @item_id.nil?
-        invalid_properties.push("invalid value for 'item_id', item_id cannot be nil.")
-      end
-
-      if @x.nil?
-        invalid_properties.push("invalid value for 'x', x cannot be nil.")
+        invalid_properties.push('invalid value for "item_id", item_id cannot be nil.')
       end
 
-      if @y.nil?
-        invalid_properties.push("invalid value for 'y', y cannot be nil.")
+      if @position.nil?
+        invalid_properties.push('invalid value for "position", position cannot be nil.')
       end
 
-      if @z.nil?
-        invalid_properties.push("invalid value for 'z', z 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 @item_id.nil?
-      return false if @x.nil?
-      return false if @y.nil?
-      return false if @z.nil?
-      return true
+      return false if @position.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -113,9 +82,7 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           item_id == o.item_id &&
-          x == o.x &&
-          y == o.y &&
-          z == o.z
+          position == o.position
     end
 
     # @see the `==` method
@@ -127,7 +94,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [item_id, x, y, z].hash
+      [item_id, position].hash
     end
 
     # Builds the object from hash
@@ -140,7 +107,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]]))
@@ -222,7 +189,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) }
@@ -233,7 +200,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/post_corporations_corporation_id_assets_locations_position.rb

@@ -0,0 +1,220 @@
+=begin
+#EVE Swagger Interface
+
+#An OpenAPI for EVE Online
+
+OpenAPI spec version: 0.7.5
+
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
+
+=end
+
+require 'date'
+
+module ESIClient
+  # position object
+  class PostCorporationsCorporationIdAssetsLocationsPosition
+    # x number
+    attr_accessor :x
+
+    # y number
+    attr_accessor :y
+
+    # z number
+    attr_accessor :z
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'x' => :'x',
+        :'y' => :'y',
+        :'z' => :'z'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'x' => :'Float',
+        :'y' => :'Float',
+        :'z' => :'Float'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      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?(:'x')
+        self.x = attributes[:'x']
+      end
+
+      if attributes.has_key?(:'y')
+        self.y = attributes[:'y']
+      end
+
+      if attributes.has_key?(:'z')
+        self.z = attributes[:'z']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      if @x.nil?
+        invalid_properties.push('invalid value for "x", x cannot be nil.')
+      end
+
+      if @y.nil?
+        invalid_properties.push('invalid value for "y", y cannot be nil.')
+      end
+
+      if @z.nil?
+        invalid_properties.push('invalid value for "z", z cannot be nil.')
+      end
+
+      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 @x.nil?
+      return false if @y.nil?
+      return false if @z.nil?
+      true
+    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 &&
+          x == o.x &&
+          y == o.y &&
+          z == o.z
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] 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 build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # 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) })
+          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
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = ESIClient.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @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) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end