eve_online 0.8.0 → 0.9.0

data/lib/eve_online/character_implants.rb

@@ -1,5 +1,9 @@
+require 'memoist'
+
 module EveOnline
   class CharacterImplants
+    extend Memoist
+
     attr_reader :result
 
     def initialize(result)
@@ -13,11 +17,13 @@ module EveOnline
       end
       output
     end
+    memoize :implants
 
     private
 
     def rowset
-      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'implants' }.first.fetch('row')
+      result.fetch('rowset').reject { |a| a.fetch('@name') != 'implants' }.first.fetch('row')
     end
+    memoize :rowset
   end
 end

data/lib/eve_online/character_jump_clone_implants.rb

@@ -0,0 +1,29 @@
+require 'memoist'
+
+module EveOnline
+  class CharacterJumpCloneImplants
+    extend Memoist
+
+    attr_reader :result
+
+    def initialize(result)
+      @result = result
+    end
+
+    def jump_clone_implants
+      output = []
+      rowset.each do |jump_clone_implant|
+        output << JumpCloneImplant.new(jump_clone_implant)
+      end
+      output
+    end
+    memoize :jump_clone_implants
+
+    private
+
+    def rowset
+      result.fetch('rowset').reject { |a| a.fetch('@name') != 'jumpCloneImplants' }.first.fetch('row')
+    end
+    memoize :rowset
+  end
+end

data/lib/eve_online/character_jump_clones.rb

@@ -1,5 +1,9 @@
+require 'memoist'
+
 module EveOnline
   class CharacterJumpClones
+    extend Memoist
+
     attr_reader :result
 
     def initialize(result)
@@ -13,11 +17,13 @@ module EveOnline
       end
       output
     end
+    memoize :jump_clones
 
     private
 
     def rowset
-      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'jumpClones' }.first.fetch('row')
+      result.fetch('rowset').reject { |a| a.fetch('@name') != 'jumpClones' }.first.fetch('row')
     end
+    memoize :rowset
   end
 end

data/lib/eve_online/character_skills.rb

@@ -1,5 +1,9 @@
+require 'memoist'
+
 module EveOnline
   class CharacterSkills
+    extend Memoist
+
     attr_reader :result
 
     def initialize(result)
@@ -13,11 +17,13 @@ module EveOnline
       end
       output
     end
+    memoize :skills
 
     private
 
     def rowset
-      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'skills' }.first.fetch('row')
+      result.fetch('rowset').reject { |a| a.fetch('@name') != 'skills' }.first.fetch('row')
     end
+    memoize :rowset
   end
 end

data/lib/eve_online/characters/account_balance.rb

@@ -4,6 +4,8 @@ module EveOnline
     class AccountBalance < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/AccountBalance.xml.aspx'.freeze
 
+      ACCESS_MASK = 1
+
       attr_reader :key_id, :v_code, :character_id
 
       def initialize(key_id, v_code, character_id)
@@ -24,28 +26,32 @@ module EveOnline
       end
 
       def account_id
-        @account_id ||= row.fetch('@accountID').to_i
+        row.fetch('@accountID').to_i
       end
 
       def account_key
-        @account_key ||= row.fetch('@accountKey').to_i
+        row.fetch('@accountKey').to_i
       end
 
       def balance
-        @balance ||= row.fetch('@balance')
+        row.fetch('@balance').to_f
       end
 
-      def row
-        @row ||= rowset.fetch('row')
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
       end
 
+      private
+
       def rowset
-        @rowset ||= result.fetch('rowset')
+        result.fetch('rowset')
       end
+      memoize :rowset
 
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/characters/asset_list.rb

@@ -4,6 +4,8 @@ module EveOnline
     class AssetList < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/AssetList.xml.aspx'.freeze
 
+      ACCESS_MASK = 2
+
       attr_reader :key_id, :v_code, :character_id, :flat
 
       def initialize(key_id, v_code, character_id, flat = 1)
@@ -28,18 +30,23 @@ module EveOnline
           raise ArgumentError
         end
       end
+      memoize :assets
 
-      def row
-        @row ||= rowset.fetch('row')
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }&flat=#{ flat }"
       end
 
+      private
+
       def rowset
-        @rowset ||= result.fetch('rowset')
+        result.fetch('rowset')
       end
+      memoize :rowset
 
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }&flat=#{ flat }"
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/characters/blueprints.rb

@@ -4,6 +4,8 @@ module EveOnline
     class Blueprints < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/Blueprints.xml.aspx'.freeze
 
+      ACCESS_MASK = 2
+
       attr_reader :key_id, :v_code, :character_id
 
       def initialize(key_id, v_code, character_id)
@@ -27,18 +29,23 @@ module EveOnline
           raise ArgumentError
         end
       end
+      memoize :blueprints
 
-      def row
-        @row ||= rowset.fetch('row')
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
       end
 
+      private
+
       def rowset
-        @rowset ||= result.fetch('rowset')
+        result.fetch('rowset')
       end
+      memoize :rowset
 
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/characters/bookmarks.rb

@@ -4,6 +4,8 @@ module EveOnline
     class Bookmarks < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/Bookmarks.xml.aspx'.freeze
 
+      ACCESS_MASK = 268_435_456
+
       attr_reader :key_id, :v_code, :character_id
 
       def initialize(key_id, v_code, character_id)
@@ -14,33 +16,36 @@ module EveOnline
       end
 
       def bookmark_folders
-        @bookmark_folders ||= begin
-          case row
-          when Hash
-            [BookmarkFolder.new(row)]
-          when Array
-            bookmark_folders = []
-            row.each do |bookmark_folder|
-              bookmark_folders << BookmarkFolder.new(bookmark_folder)
-            end
-            bookmark_folders
-          else
-            raise ArgumentError
+        case row
+        when Hash
+          [BookmarkFolder.new(row)]
+        when Array
+          output = []
+          row.each do |bookmark_folder|
+            output << BookmarkFolder.new(bookmark_folder)
           end
+          output
+        else
+          raise ArgumentError
         end
       end
+      memoize :bookmark_folders
 
-      def row
-        @row ||= rowset.fetch('row')
+      def url
+        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
       end
 
+      private
+
       def rowset
-        @rowset ||= result.fetch('rowset')
+        result.fetch('rowset')
       end
+      memoize :rowset
 
-      def url
-        "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
+      def row
+        rowset.fetch('row')
       end
+      memoize :row
     end
   end
 end

data/lib/eve_online/characters/calendar_event_attendees.rb

@@ -4,6 +4,8 @@ module EveOnline
     class CalendarEventAttendees < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/CalendarEventAttendees.xml.aspx'.freeze
 
+      ACCESS_MASK = 4
+
       attr_reader :key_id, :v_code, :character_id, :event_id
 
       def initialize(key_id, v_code, character_id, event_id)

data/lib/eve_online/characters/character_sheet.rb

@@ -4,6 +4,8 @@ module EveOnline
     class CharacterSheet < BaseXML
       API_ENDPOINT = 'https://api.eveonline.com/char/CharacterSheet.xml.aspx'.freeze
 
+      ACCESS_MASK = 8
+
       attr_reader :key_id, :v_code, :character_id
 
       def initialize(key_id, v_code, character_id)
@@ -44,152 +46,160 @@ module EveOnline
       end
 
       def name
-        @name ||= result.fetch('name')
+        result.fetch('name')
       end
 
       def home_station_id
-        @home_station_id ||= result.fetch('homeStationID').to_i
+        result.fetch('homeStationID').to_i
       end
 
       def dob
-        @dob ||= parse_datetime_with_timezone(result.fetch('DoB'))
+        parse_datetime_with_timezone(result.fetch('DoB'))
       end
 
       def race
-        @race ||= result.fetch('race')
+        result.fetch('race')
       end
 
       def blood_line_id
-        @blood_line_id ||= result.fetch('bloodLineID').to_i
+        result.fetch('bloodLineID').to_i
       end
 
       def blood_line
-        @blood_line ||= result.fetch('bloodLine')
+        result.fetch('bloodLine')
       end
 
       def ancestry_id
-        @ancestry_id ||= result.fetch('ancestryID').to_i
+        result.fetch('ancestryID').to_i
       end
 
       def ancestry
-        @ancestry ||= result.fetch('ancestry')
+        result.fetch('ancestry')
       end
 
       def gender
-        @gender ||= result.fetch('gender').downcase.to_sym
+        result.fetch('gender').downcase.to_sym
       end
 
       def corporation_name
-        @corporation_name ||= result.fetch('corporationName')
+        result.fetch('corporationName')
       end
 
       def corporation_id
-        @corporation_id ||= result.fetch('corporationID').to_i
+        result.fetch('corporationID').to_i
       end
 
       def alliance_name
         # TODO: Corporation "Federal Navy Academy" doesn't have allianceName in response
-        @alliance_name ||= result.fetch('allianceName')
+        result.fetch('allianceName')
       end
 
       def alliance_id
         # TODO: Corporation "Federal Navy Academy" doesn't have allianceID in response
-        @alliance_id ||= result.fetch('allianceID').to_i
+        result.fetch('allianceID').to_i
       end
 
       def faction_name
         # TODO: Corporation "Federal Navy Academy" doesn't have factionName in response
-        @faction_name ||= result.fetch('factionName')
+        result.fetch('factionName')
       end
 
       def faction_id
         # TODO: Corporation "Federal Navy Academy" doesn't have factionID in response
-        @faction_id ||= result.fetch('factionID').to_i
+        result.fetch('factionID').to_i
       end
 
       def clone_type_id
-        @clone_type_id ||= result.fetch('cloneTypeID').to_i
+        result.fetch('cloneTypeID').to_i
       end
 
       def clone_name
-        @clone_name ||= result.fetch('cloneName')
+        result.fetch('cloneName')
       end
 
       def clone_skill_points
-        @clone_skill_points ||= result.fetch('cloneSkillPoints').to_i
+        result.fetch('cloneSkillPoints').to_i
       end
 
       def free_skill_points
-        @free_skill_points ||= result.fetch('freeSkillPoints').to_i
+        result.fetch('freeSkillPoints').to_i
       end
 
       def free_respecs
-        @free_respecs ||= result.fetch('freeRespecs').to_i
+        result.fetch('freeRespecs').to_i
       end
 
       def clone_jump_date
-        @clone_jump_date ||= parse_datetime_with_timezone(result.fetch('cloneJumpDate'))
+        parse_datetime_with_timezone(result.fetch('cloneJumpDate'))
       end
 
       def last_respec_date
-        @last_respec_date ||= parse_datetime_with_timezone(result.fetch('lastRespecDate'))
+        parse_datetime_with_timezone(result.fetch('lastRespecDate'))
       end
 
       def last_timed_respec
-        @last_timed_respec ||= parse_datetime_with_timezone(result.fetch('lastTimedRespec'))
+        parse_datetime_with_timezone(result.fetch('lastTimedRespec'))
       end
 
       def remote_station_date
-        @remote_station_date ||= parse_datetime_with_timezone(result.fetch('remoteStationDate'))
+        parse_datetime_with_timezone(result.fetch('remoteStationDate'))
       end
 
       def jump_activation
-        @jump_activation ||= parse_datetime_with_timezone(result.fetch('jumpActivation'))
+        parse_datetime_with_timezone(result.fetch('jumpActivation'))
       end
 
       def jump_fatigue
-        @jump_fatigue ||= parse_datetime_with_timezone(result.fetch('jumpFatigue'))
+        parse_datetime_with_timezone(result.fetch('jumpFatigue'))
       end
 
       def jump_last_update
-        @jump_last_update ||= parse_datetime_with_timezone(result.fetch('jumpLastUpdate'))
+        parse_datetime_with_timezone(result.fetch('jumpLastUpdate'))
       end
 
       def balance
-        @balance ||= result.fetch('balance')
+        result.fetch('balance').to_f
       end
 
       def base_intelligence
-        @intelligence ||= attributes.fetch('intelligence').to_i
+        attributes.fetch('intelligence').to_i
       end
 
       def base_memory
-        @memory ||= attributes.fetch('memory').to_i
+        attributes.fetch('memory').to_i
       end
 
       def base_charisma
-        @charisma ||= attributes.fetch('charisma').to_i
+        attributes.fetch('charisma').to_i
       end
 
       def base_perception
-        @perception ||= attributes.fetch('perception').to_i
+        attributes.fetch('perception').to_i
       end
 
       def base_willpower
-        @willpower ||= attributes.fetch('willpower').to_i
+        attributes.fetch('willpower').to_i
       end
 
       def implants
-        @implants ||= CharacterImplants.new(result).implants
+        CharacterImplants.new(result).implants
       end
+      memoize :implants
 
       def skills
-        @skills ||= CharacterSkills.new(result).skills
+        CharacterSkills.new(result).skills
       end
+      memoize :skills
 
       def jump_clones
-        @jump_clones ||= CharacterJumpClones.new(result).jump_clones
+        CharacterJumpClones.new(result).jump_clones
+      end
+      memoize :jump_clones
+
+      def jump_clone_implants
+        CharacterJumpCloneImplants.new(result).jump_clone_implants
       end
+      memoize :jump_clone_implants
 
       def url
         "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
@@ -198,8 +208,9 @@ module EveOnline
       private
 
       def attributes
-        @attributes ||= result.fetch('attributes')
+        result.fetch('attributes')
       end
+      memoize :attributes
     end
   end
 end