ruby-esi 0.1.0 → 0.2.0

data/lib/ruby-esi/models/get_alliances_alliance_id_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -15,14 +15,23 @@ require 'date'
 module ESI
   # 200 ok object
   class GetAlliancesAllianceIdOk
-    # the full name of the alliance
-    attr_accessor :alliance_name
+    # ID of the corporation that created the alliance
+    attr_accessor :creator_corporation_id
+
+    # ID of the character that created the alliance
+    attr_accessor :creator_id
 
     # date_founded string
     attr_accessor :date_founded
 
     # the executor corporation ID, if this alliance is not closed
-    attr_accessor :executor_corp
+    attr_accessor :executor_corporation_id
+
+    # Faction ID this alliance is fighting for, if this alliance is enlisted in factional warfare
+    attr_accessor :faction_id
+
+    # the full name of the alliance
+    attr_accessor :name
 
     # the short name of the alliance
     attr_accessor :ticker
@@ -31,9 +40,12 @@ module ESI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_name' => :'alliance_name',
+        :'creator_corporation_id' => :'creator_corporation_id',
+        :'creator_id' => :'creator_id',
         :'date_founded' => :'date_founded',
-        :'executor_corp' => :'executor_corp',
+        :'executor_corporation_id' => :'executor_corporation_id',
+        :'faction_id' => :'faction_id',
+        :'name' => :'name',
         :'ticker' => :'ticker'
       }
     end
@@ -41,9 +53,12 @@ module ESI
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_name' => :'String',
+        :'creator_corporation_id' => :'Integer',
+        :'creator_id' => :'Integer',
         :'date_founded' => :'DateTime',
-        :'executor_corp' => :'Integer',
+        :'executor_corporation_id' => :'Integer',
+        :'faction_id' => :'Integer',
+        :'name' => :'String',
         :'ticker' => :'String'
       }
     end
@@ -56,16 +71,28 @@ module ESI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
 
-      if attributes.has_key?(:'alliance_name')
-        self.alliance_name = attributes[:'alliance_name']
+      if attributes.has_key?(:'creator_corporation_id')
+        self.creator_corporation_id = attributes[:'creator_corporation_id']
+      end
+
+      if attributes.has_key?(:'creator_id')
+        self.creator_id = attributes[:'creator_id']
       end
 
       if attributes.has_key?(:'date_founded')
         self.date_founded = attributes[:'date_founded']
       end
 
-      if attributes.has_key?(:'executor_corp')
-        self.executor_corp = attributes[:'executor_corp']
+      if attributes.has_key?(:'executor_corporation_id')
+        self.executor_corporation_id = attributes[:'executor_corporation_id']
+      end
+
+      if attributes.has_key?(:'faction_id')
+        self.faction_id = attributes[:'faction_id']
+      end
+
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
       end
 
       if attributes.has_key?(:'ticker')
@@ -75,17 +102,25 @@ module ESI
     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 @alliance_name.nil?
-        invalid_properties.push("invalid value for 'alliance_name', alliance_name cannot be nil.")
+      if @creator_corporation_id.nil?
+        invalid_properties.push("invalid value for 'creator_corporation_id', creator_corporation_id cannot be nil.")
+      end
+
+      if @creator_id.nil?
+        invalid_properties.push("invalid value for 'creator_id', creator_id cannot be nil.")
       end
 
       if @date_founded.nil?
         invalid_properties.push("invalid value for 'date_founded', date_founded cannot be nil.")
       end
 
+      if @name.nil?
+        invalid_properties.push("invalid value for 'name', name cannot be nil.")
+      end
+
       if @ticker.nil?
         invalid_properties.push("invalid value for 'ticker', ticker cannot be nil.")
       end
@@ -96,8 +131,10 @@ module ESI
     # 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 @alliance_name.nil?
+      return false if @creator_corporation_id.nil?
+      return false if @creator_id.nil?
       return false if @date_founded.nil?
+      return false if @name.nil?
       return false if @ticker.nil?
       return true
     end
@@ -107,9 +144,12 @@ module ESI
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_name == o.alliance_name &&
+          creator_corporation_id == o.creator_corporation_id &&
+          creator_id == o.creator_id &&
           date_founded == o.date_founded &&
-          executor_corp == o.executor_corp &&
+          executor_corporation_id == o.executor_corporation_id &&
+          faction_id == o.faction_id &&
+          name == o.name &&
           ticker == o.ticker
     end
 
@@ -122,7 +162,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_name, date_founded, executor_corp, ticker].hash
+      [creator_corporation_id, creator_id, date_founded, executor_corporation_id, faction_id, name, ticker].hash
     end
 
     # Builds the object from hash

data/lib/ruby-esi/models/get_characters_character_id_agents_research_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -84,7 +84,7 @@ module ESI
     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 @agent_id.nil?

data/lib/ruby-esi/models/get_characters_character_id_assets_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -15,6 +15,9 @@ require 'date'
 module ESI
   # 200 ok object
   class GetCharactersCharacterIdAssets200Ok
+    # is_blueprint_copy boolean
+    attr_accessor :is_blueprint_copy
+
     # is_singleton boolean
     attr_accessor :is_singleton
 
@@ -61,6 +64,7 @@ module ESI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'is_blueprint_copy' => :'is_blueprint_copy',
         :'is_singleton' => :'is_singleton',
         :'item_id' => :'item_id',
         :'location_flag' => :'location_flag',
@@ -74,6 +78,7 @@ module ESI
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'is_blueprint_copy' => :'BOOLEAN',
         :'is_singleton' => :'BOOLEAN',
         :'item_id' => :'Integer',
         :'location_flag' => :'String',
@@ -92,6 +97,10 @@ module ESI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
 
+      if attributes.has_key?(:'is_blueprint_copy')
+        self.is_blueprint_copy = attributes[:'is_blueprint_copy']
+      end
+
       if attributes.has_key?(:'is_singleton')
         self.is_singleton = attributes[:'is_singleton']
       end
@@ -123,7 +132,7 @@ module ESI
     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 @is_singleton.nil?
@@ -146,6 +155,10 @@ module ESI
         invalid_properties.push("invalid value for 'location_type', location_type cannot be nil.")
       end
 
+      if @quantity.nil?
+        invalid_properties.push("invalid value for 'quantity', quantity cannot be nil.")
+      end
+
       if @type_id.nil?
         invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
       end
@@ -159,12 +172,13 @@ module ESI
       return false if @is_singleton.nil?
       return false if @item_id.nil?
       return false if @location_flag.nil?
-      location_flag_validator = EnumAttributeValidator.new('String', ["AssetSafety", "AutoFit", "Cargo", "CorpseBay", "Deliveries", "DroneBay", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "FleetHangar", "Hangar", "HangarAll", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "HiddenModifiers", "Implant", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "Locked", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "Module", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedFuelBay", "SpecializedGasHold", "SpecializedIndustrialShipHold", "SpecializedLargeShipHold", "SpecializedMaterialBay", "SpecializedMediumShipHold", "SpecializedMineralHold", "SpecializedOreHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SubSystemBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "Unlocked", "Wardrobe"])
+      location_flag_validator = EnumAttributeValidator.new('String', ["AssetSafety", "AutoFit", "BoosterBay", "Cargo", "CorpseBay", "Deliveries", "DroneBay", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "FleetHangar", "Hangar", "HangarAll", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "HiddenModifiers", "Implant", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "Locked", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "Skill", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedFuelBay", "SpecializedGasHold", "SpecializedIndustrialShipHold", "SpecializedLargeShipHold", "SpecializedMaterialBay", "SpecializedMediumShipHold", "SpecializedMineralHold", "SpecializedOreHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SubSystemBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "Unlocked", "Wardrobe"])
       return false unless location_flag_validator.valid?(@location_flag)
       return false if @location_id.nil?
       return false if @location_type.nil?
       location_type_validator = EnumAttributeValidator.new('String', ["station", "solar_system", "other"])
       return false unless location_type_validator.valid?(@location_type)
+      return false if @quantity.nil?
       return false if @type_id.nil?
       return true
     end
@@ -172,7 +186,7 @@ module ESI
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] location_flag Object to be assigned
     def location_flag=(location_flag)
-      validator = EnumAttributeValidator.new('String', ["AssetSafety", "AutoFit", "Cargo", "CorpseBay", "Deliveries", "DroneBay", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "FleetHangar", "Hangar", "HangarAll", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "HiddenModifiers", "Implant", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "Locked", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "Module", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedFuelBay", "SpecializedGasHold", "SpecializedIndustrialShipHold", "SpecializedLargeShipHold", "SpecializedMaterialBay", "SpecializedMediumShipHold", "SpecializedMineralHold", "SpecializedOreHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SubSystemBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "Unlocked", "Wardrobe"])
+      validator = EnumAttributeValidator.new('String', ["AssetSafety", "AutoFit", "BoosterBay", "Cargo", "CorpseBay", "Deliveries", "DroneBay", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "FleetHangar", "Hangar", "HangarAll", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "HiddenModifiers", "Implant", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "Locked", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "Skill", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedFuelBay", "SpecializedGasHold", "SpecializedIndustrialShipHold", "SpecializedLargeShipHold", "SpecializedMaterialBay", "SpecializedMediumShipHold", "SpecializedMineralHold", "SpecializedOreHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SubSystemBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "Unlocked", "Wardrobe"])
       unless validator.valid?(location_flag)
         fail ArgumentError, "invalid value for 'location_flag', must be one of #{validator.allowable_values}."
       end
@@ -194,6 +208,7 @@ module ESI
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          is_blueprint_copy == o.is_blueprint_copy &&
           is_singleton == o.is_singleton &&
           item_id == o.item_id &&
           location_flag == o.location_flag &&
@@ -212,7 +227,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [is_singleton, item_id, location_flag, location_id, location_type, quantity, type_id].hash
+      [is_blueprint_copy, is_singleton, item_id, location_flag, location_id, location_type, quantity, type_id].hash
     end
 
     # Builds the object from hash

data/lib/ruby-esi/models/get_characters_character_id_attributes_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -111,7 +111,7 @@ module ESI
     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 @charisma.nil?

data/lib/ruby-esi/models/get_characters_character_id_blueprints_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -132,7 +132,7 @@ module ESI
     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?

data/lib/ruby-esi/models/get_characters_character_id_bookmarks_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -18,8 +18,10 @@ module ESI
     # bookmark_id integer
     attr_accessor :bookmark_id
 
-    # create_date string
-    attr_accessor :create_date
+    attr_accessor :coordinates
+
+    # created string
+    attr_accessor :created
 
     # creator_id integer
     attr_accessor :creator_id
@@ -27,29 +29,30 @@ module ESI
     # folder_id integer
     attr_accessor :folder_id
 
-    # memo string
-    attr_accessor :memo
+    attr_accessor :item
 
-    # note string
-    attr_accessor :note
+    # label string
+    attr_accessor :label
 
-    # owner_id integer
-    attr_accessor :owner_id
+    # location_id integer
+    attr_accessor :location_id
 
-    attr_accessor :target
+    # notes string
+    attr_accessor :notes
 
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'bookmark_id' => :'bookmark_id',
-        :'create_date' => :'create_date',
+        :'coordinates' => :'coordinates',
+        :'created' => :'created',
         :'creator_id' => :'creator_id',
         :'folder_id' => :'folder_id',
-        :'memo' => :'memo',
-        :'note' => :'note',
-        :'owner_id' => :'owner_id',
-        :'target' => :'target'
+        :'item' => :'item',
+        :'label' => :'label',
+        :'location_id' => :'location_id',
+        :'notes' => :'notes'
       }
     end
 
@@ -57,13 +60,14 @@ module ESI
     def self.swagger_types
       {
         :'bookmark_id' => :'Integer',
-        :'create_date' => :'DateTime',
+        :'coordinates' => :'GetCharactersCharacterIdBookmarksCoordinates',
+        :'created' => :'DateTime',
         :'creator_id' => :'Integer',
         :'folder_id' => :'Integer',
-        :'memo' => :'String',
-        :'note' => :'String',
-        :'owner_id' => :'Integer',
-        :'target' => :'GetCharactersCharacterIdBookmarksTarget'
+        :'item' => :'GetCharactersCharacterIdBookmarksItem',
+        :'label' => :'String',
+        :'location_id' => :'Integer',
+        :'notes' => :'String'
       }
     end
 
@@ -79,8 +83,12 @@ module ESI
         self.bookmark_id = attributes[:'bookmark_id']
       end
 
-      if attributes.has_key?(:'create_date')
-        self.create_date = attributes[:'create_date']
+      if attributes.has_key?(:'coordinates')
+        self.coordinates = attributes[:'coordinates']
+      end
+
+      if attributes.has_key?(:'created')
+        self.created = attributes[:'created']
       end
 
       if attributes.has_key?(:'creator_id')
@@ -91,50 +99,50 @@ module ESI
         self.folder_id = attributes[:'folder_id']
       end
 
-      if attributes.has_key?(:'memo')
-        self.memo = attributes[:'memo']
+      if attributes.has_key?(:'item')
+        self.item = attributes[:'item']
       end
 
-      if attributes.has_key?(:'note')
-        self.note = attributes[:'note']
+      if attributes.has_key?(:'label')
+        self.label = attributes[:'label']
       end
 
-      if attributes.has_key?(:'owner_id')
-        self.owner_id = attributes[:'owner_id']
+      if attributes.has_key?(:'location_id')
+        self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'target')
-        self.target = attributes[:'target']
+      if attributes.has_key?(:'notes')
+        self.notes = attributes[:'notes']
       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 @bookmark_id.nil?
         invalid_properties.push("invalid value for 'bookmark_id', bookmark_id cannot be nil.")
       end
 
-      if @create_date.nil?
-        invalid_properties.push("invalid value for 'create_date', create_date cannot be nil.")
+      if @created.nil?
+        invalid_properties.push("invalid value for 'created', created cannot be nil.")
       end
 
       if @creator_id.nil?
         invalid_properties.push("invalid value for 'creator_id', creator_id cannot be nil.")
       end
 
-      if @memo.nil?
-        invalid_properties.push("invalid value for 'memo', memo cannot be nil.")
+      if @label.nil?
+        invalid_properties.push("invalid value for 'label', label cannot be nil.")
       end
 
-      if @note.nil?
-        invalid_properties.push("invalid value for 'note', note cannot be nil.")
+      if @location_id.nil?
+        invalid_properties.push("invalid value for 'location_id', location_id cannot be nil.")
       end
 
-      if @owner_id.nil?
-        invalid_properties.push("invalid value for 'owner_id', owner_id cannot be nil.")
+      if @notes.nil?
+        invalid_properties.push("invalid value for 'notes', notes cannot be nil.")
       end
 
       return invalid_properties
@@ -144,11 +152,11 @@ module ESI
     # @return true if the model is valid
     def valid?
       return false if @bookmark_id.nil?
-      return false if @create_date.nil?
+      return false if @created.nil?
       return false if @creator_id.nil?
-      return false if @memo.nil?
-      return false if @note.nil?
-      return false if @owner_id.nil?
+      return false if @label.nil?
+      return false if @location_id.nil?
+      return false if @notes.nil?
       return true
     end
 
@@ -158,13 +166,14 @@ module ESI
       return true if self.equal?(o)
       self.class == o.class &&
           bookmark_id == o.bookmark_id &&
-          create_date == o.create_date &&
+          coordinates == o.coordinates &&
+          created == o.created &&
           creator_id == o.creator_id &&
           folder_id == o.folder_id &&
-          memo == o.memo &&
-          note == o.note &&
-          owner_id == o.owner_id &&
-          target == o.target
+          item == o.item &&
+          label == o.label &&
+          location_id == o.location_id &&
+          notes == o.notes
     end
 
     # @see the `==` method
@@ -176,7 +185,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [bookmark_id, create_date, creator_id, folder_id, memo, note, owner_id, target].hash
+      [bookmark_id, coordinates, created, creator_id, folder_id, item, label, location_id, notes].hash
     end
 
     # Builds the object from hash