esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_markets_structures_structure_id_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
 
@@ -15,38 +15,38 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetMarketsStructuresStructureId200Ok
-    # duration integer
-    attr_accessor :duration
-
-    # is_buy_order boolean
-    attr_accessor :is_buy_order
+    # order_id integer
+    attr_accessor :order_id
 
-    # issued string
-    attr_accessor :issued
+    # type_id integer
+    attr_accessor :type_id
 
     # location_id integer
     attr_accessor :location_id
 
+    # volume_total integer
+    attr_accessor :volume_total
+
+    # volume_remain integer
+    attr_accessor :volume_remain
+
     # min_volume integer
     attr_accessor :min_volume
 
-    # order_id integer
-    attr_accessor :order_id
-
     # price number
     attr_accessor :price
 
-    # range string
-    attr_accessor :range
+    # is_buy_order boolean
+    attr_accessor :is_buy_order
 
-    # type_id integer
-    attr_accessor :type_id
+    # duration integer
+    attr_accessor :duration
 
-    # volume_remain integer
-    attr_accessor :volume_remain
+    # issued string
+    attr_accessor :issued
 
-    # volume_total integer
-    attr_accessor :volume_total
+    # range string
+    attr_accessor :range
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -73,34 +73,34 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'duration' => :'duration',
-        :'is_buy_order' => :'is_buy_order',
-        :'issued' => :'issued',
-        :'location_id' => :'location_id',
-        :'min_volume' => :'min_volume',
         :'order_id' => :'order_id',
-        :'price' => :'price',
-        :'range' => :'range',
         :'type_id' => :'type_id',
+        :'location_id' => :'location_id',
+        :'volume_total' => :'volume_total',
         :'volume_remain' => :'volume_remain',
-        :'volume_total' => :'volume_total'
+        :'min_volume' => :'min_volume',
+        :'price' => :'price',
+        :'is_buy_order' => :'is_buy_order',
+        :'duration' => :'duration',
+        :'issued' => :'issued',
+        :'range' => :'range'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'duration' => :'Integer',
-        :'is_buy_order' => :'BOOLEAN',
-        :'issued' => :'DateTime',
-        :'location_id' => :'Integer',
-        :'min_volume' => :'Integer',
         :'order_id' => :'Integer',
-        :'price' => :'Float',
-        :'range' => :'String',
         :'type_id' => :'Integer',
+        :'location_id' => :'Integer',
+        :'volume_total' => :'Integer',
         :'volume_remain' => :'Integer',
-        :'volume_total' => :'Integer'
+        :'min_volume' => :'Integer',
+        :'price' => :'Float',
+        :'is_buy_order' => :'BOOLEAN',
+        :'duration' => :'Integer',
+        :'issued' => :'DateTime',
+        :'range' => :'String'
       }
     end
 
@@ -110,130 +110,129 @@ 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?(:'duration')
-        self.duration = attributes[:'duration']
-      end
-
-      if attributes.has_key?(:'is_buy_order')
-        self.is_buy_order = attributes[:'is_buy_order']
+      if attributes.has_key?(:'order_id')
+        self.order_id = attributes[:'order_id']
       end
 
-      if attributes.has_key?(:'issued')
-        self.issued = attributes[:'issued']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
       if attributes.has_key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'min_volume')
-        self.min_volume = attributes[:'min_volume']
+      if attributes.has_key?(:'volume_total')
+        self.volume_total = attributes[:'volume_total']
       end
 
-      if attributes.has_key?(:'order_id')
-        self.order_id = attributes[:'order_id']
+      if attributes.has_key?(:'volume_remain')
+        self.volume_remain = attributes[:'volume_remain']
+      end
+
+      if attributes.has_key?(:'min_volume')
+        self.min_volume = attributes[:'min_volume']
       end
 
       if attributes.has_key?(:'price')
         self.price = attributes[:'price']
       end
 
-      if attributes.has_key?(:'range')
-        self.range = attributes[:'range']
+      if attributes.has_key?(:'is_buy_order')
+        self.is_buy_order = attributes[:'is_buy_order']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'duration')
+        self.duration = attributes[:'duration']
       end
 
-      if attributes.has_key?(:'volume_remain')
-        self.volume_remain = attributes[:'volume_remain']
+      if attributes.has_key?(:'issued')
+        self.issued = attributes[:'issued']
       end
 
-      if attributes.has_key?(:'volume_total')
-        self.volume_total = attributes[:'volume_total']
+      if attributes.has_key?(:'range')
+        self.range = attributes[:'range']
       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 @duration.nil?
-        invalid_properties.push("invalid value for 'duration', duration cannot be nil.")
+      if @order_id.nil?
+        invalid_properties.push('invalid value for "order_id", order_id cannot be nil.')
       end
 
-      if @is_buy_order.nil?
-        invalid_properties.push("invalid value for 'is_buy_order', is_buy_order cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @issued.nil?
-        invalid_properties.push("invalid value for 'issued', issued cannot be nil.")
+      if @location_id.nil?
+        invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
       end
 
-      if @location_id.nil?
-        invalid_properties.push("invalid value for 'location_id', location_id cannot be nil.")
+      if @volume_total.nil?
+        invalid_properties.push('invalid value for "volume_total", volume_total cannot be nil.')
       end
 
-      if @min_volume.nil?
-        invalid_properties.push("invalid value for 'min_volume', min_volume cannot be nil.")
+      if @volume_remain.nil?
+        invalid_properties.push('invalid value for "volume_remain", volume_remain cannot be nil.')
       end
 
-      if @order_id.nil?
-        invalid_properties.push("invalid value for 'order_id', order_id cannot be nil.")
+      if @min_volume.nil?
+        invalid_properties.push('invalid value for "min_volume", min_volume cannot be nil.')
       end
 
       if @price.nil?
-        invalid_properties.push("invalid value for 'price', price cannot be nil.")
+        invalid_properties.push('invalid value for "price", price cannot be nil.')
       end
 
-      if @range.nil?
-        invalid_properties.push("invalid value for 'range', range cannot be nil.")
+      if @is_buy_order.nil?
+        invalid_properties.push('invalid value for "is_buy_order", is_buy_order cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @duration.nil?
+        invalid_properties.push('invalid value for "duration", duration cannot be nil.')
       end
 
-      if @volume_remain.nil?
-        invalid_properties.push("invalid value for 'volume_remain', volume_remain cannot be nil.")
+      if @issued.nil?
+        invalid_properties.push('invalid value for "issued", issued cannot be nil.')
       end
 
-      if @volume_total.nil?
-        invalid_properties.push("invalid value for 'volume_total', volume_total cannot be nil.")
+      if @range.nil?
+        invalid_properties.push('invalid value for "range", range 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 @duration.nil?
-      return false if @is_buy_order.nil?
-      return false if @issued.nil?
+      return false if @order_id.nil?
+      return false if @type_id.nil?
       return false if @location_id.nil?
+      return false if @volume_total.nil?
+      return false if @volume_remain.nil?
       return false if @min_volume.nil?
-      return false if @order_id.nil?
       return false if @price.nil?
+      return false if @is_buy_order.nil?
+      return false if @duration.nil?
+      return false if @issued.nil?
       return false if @range.nil?
-      range_validator = EnumAttributeValidator.new('String', ["station", "region", "solarsystem", "1", "2", "3", "4", "5", "10", "20", "30", "40"])
+      range_validator = EnumAttributeValidator.new('String', ['station', 'region', 'solarsystem', '1', '2', '3', '4', '5', '10', '20', '30', '40'])
       return false unless range_validator.valid?(@range)
-      return false if @type_id.nil?
-      return false if @volume_remain.nil?
-      return false if @volume_total.nil?
-      return true
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] range Object to be assigned
     def range=(range)
-      validator = EnumAttributeValidator.new('String', ["station", "region", "solarsystem", "1", "2", "3", "4", "5", "10", "20", "30", "40"])
+      validator = EnumAttributeValidator.new('String', ['station', 'region', 'solarsystem', '1', '2', '3', '4', '5', '10', '20', '30', '40'])
       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
@@ -243,17 +242,17 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          duration == o.duration &&
-          is_buy_order == o.is_buy_order &&
-          issued == o.issued &&
-          location_id == o.location_id &&
-          min_volume == o.min_volume &&
           order_id == o.order_id &&
-          price == o.price &&
-          range == o.range &&
           type_id == o.type_id &&
+          location_id == o.location_id &&
+          volume_total == o.volume_total &&
           volume_remain == o.volume_remain &&
-          volume_total == o.volume_total
+          min_volume == o.min_volume &&
+          price == o.price &&
+          is_buy_order == o.is_buy_order &&
+          duration == o.duration &&
+          issued == o.issued &&
+          range == o.range
     end
 
     # @see the `==` method
@@ -265,7 +264,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [duration, is_buy_order, issued, location_id, min_volume, order_id, price, range, type_id, volume_remain, volume_total].hash
+      [order_id, type_id, location_id, volume_total, volume_remain, min_volume, price, is_buy_order, duration, issued, range].hash
     end
 
     # Builds the object from hash
@@ -278,7 +277,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]]))
@@ -360,7 +359,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) }
@@ -371,7 +370,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_opportunities_groups_group_id_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
 
@@ -15,46 +15,45 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetOpportunitiesGroupsGroupIdOk
-    # The groups that are connected to this group on the opportunities map
-    attr_accessor :connected_groups
-
-    # description string
-    attr_accessor :description
-
     # group_id integer
     attr_accessor :group_id
 
     # name string
     attr_accessor :name
 
+    # description string
+    attr_accessor :description
+
     # notification string
     attr_accessor :notification
 
     # Tasks need to complete for this group
     attr_accessor :required_tasks
 
+    # The groups that are connected to this group on the opportunities map
+    attr_accessor :connected_groups
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'connected_groups' => :'connected_groups',
-        :'description' => :'description',
         :'group_id' => :'group_id',
         :'name' => :'name',
+        :'description' => :'description',
         :'notification' => :'notification',
-        :'required_tasks' => :'required_tasks'
+        :'required_tasks' => :'required_tasks',
+        :'connected_groups' => :'connected_groups'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'connected_groups' => :'Array<Integer>',
-        :'description' => :'String',
         :'group_id' => :'Integer',
         :'name' => :'String',
+        :'description' => :'String',
         :'notification' => :'String',
-        :'required_tasks' => :'Array<Integer>'
+        :'required_tasks' => :'Array<Integer>',
+        :'connected_groups' => :'Array<Integer>'
       }
     end
 
@@ -64,17 +63,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?(:'connected_groups')
-        if (value = attributes[:'connected_groups']).is_a?(Array)
-          self.connected_groups = value
-        end
-      end
-
-      if attributes.has_key?(:'description')
-        self.description = attributes[:'description']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'group_id')
         self.group_id = attributes[:'group_id']
@@ -84,6 +73,10 @@ module ESIClient
         self.name = attributes[:'name']
       end
 
+      if attributes.has_key?(:'description')
+        self.description = attributes[:'description']
+      end
+
       if attributes.has_key?(:'notification')
         self.notification = attributes[:'notification']
       end
@@ -94,49 +87,54 @@ module ESIClient
         end
       end
 
+      if attributes.has_key?(:'connected_groups')
+        if (value = attributes[:'connected_groups']).is_a?(Array)
+          self.connected_groups = value
+        end
+      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 @connected_groups.nil?
-        invalid_properties.push("invalid value for 'connected_groups', connected_groups cannot be nil.")
-      end
-
-      if @description.nil?
-        invalid_properties.push("invalid value for 'description', description cannot be nil.")
-      end
-
       if @group_id.nil?
-        invalid_properties.push("invalid value for 'group_id', group_id cannot be nil.")
+        invalid_properties.push('invalid value for "group_id", group_id cannot be nil.')
       end
 
       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 @description.nil?
+        invalid_properties.push('invalid value for "description", description cannot be nil.')
       end
 
       if @notification.nil?
-        invalid_properties.push("invalid value for 'notification', notification cannot be nil.")
+        invalid_properties.push('invalid value for "notification", notification cannot be nil.')
       end
 
       if @required_tasks.nil?
-        invalid_properties.push("invalid value for 'required_tasks', required_tasks cannot be nil.")
+        invalid_properties.push('invalid value for "required_tasks", required_tasks cannot be nil.')
       end
 
-      return invalid_properties
+      if @connected_groups.nil?
+        invalid_properties.push('invalid value for "connected_groups", connected_groups 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 @connected_groups.nil?
-      return false if @description.nil?
       return false if @group_id.nil?
       return false if @name.nil?
+      return false if @description.nil?
       return false if @notification.nil?
       return false if @required_tasks.nil?
-      return true
+      return false if @connected_groups.nil?
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -144,12 +142,12 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          connected_groups == o.connected_groups &&
-          description == o.description &&
           group_id == o.group_id &&
           name == o.name &&
+          description == o.description &&
           notification == o.notification &&
-          required_tasks == o.required_tasks
+          required_tasks == o.required_tasks &&
+          connected_groups == o.connected_groups
     end
 
     # @see the `==` method
@@ -161,7 +159,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [connected_groups, description, group_id, name, notification, required_tasks].hash
+      [group_id, name, description, notification, required_tasks, connected_groups].hash
     end
 
     # Builds the object from hash
@@ -174,7 +172,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]]))
@@ -256,7 +254,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) }
@@ -267,7 +265,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end