eve_online 0.7.0 → 0.8.0

data/lib/eve_online/account/status.rb

@@ -12,7 +12,7 @@ module EveOnline
         @v_code = v_code
       end
 
-      def as_json(*args)
+      def as_json
         {
           current_time: current_time,
           paid_until: paid_until,
@@ -24,11 +24,11 @@ module EveOnline
       end
 
       def paid_until
-        @paid_until ||= ActiveSupport::TimeZone['UTC'].parse(result.fetch('paidUntil'))
+        @paid_until ||= parse_datetime_with_timezone(result.fetch('paidUntil'))
       end
 
       def create_date
-        @create_date ||= ActiveSupport::TimeZone['UTC'].parse(result.fetch('createDate'))
+        @create_date ||= parse_datetime_with_timezone(result.fetch('createDate'))
       end
 
       def logon_count

data/lib/eve_online/base.rb

@@ -7,7 +7,7 @@ module EveOnline
     end
 
     def user_agent
-      @user_agent ||= "EveOnline API (https://github.com/biow0lf/eve_online) v#{ EveOnline::VERSION }"
+      @user_agent ||= "EveOnline API (https://github.com/biow0lf/eve_online) v#{ VERSION }"
     end
 
     def content

data/lib/eve_online/base_xml.rb

@@ -14,11 +14,11 @@ module EveOnline
     end
 
     def cached_until
-      @cached_until ||= ActiveSupport::TimeZone['UTC'].parse(eveapi.fetch('cachedUntil'))
+      @cached_until ||= parse_datetime_with_timezone(eveapi.fetch('cachedUntil'))
     end
 
     def current_time
-      @current_time ||= ActiveSupport::TimeZone['UTC'].parse(eveapi.fetch('currentTime'))
+      @current_time ||= parse_datetime_with_timezone(eveapi.fetch('currentTime'))
     end
 
     def version
@@ -28,5 +28,11 @@ module EveOnline
     def eveapi
       @eveapi ||= response.fetch('eveapi')
     end
+
+    private
+
+    def parse_datetime_with_timezone(value)
+      ActiveSupport::TimeZone['UTC'].parse(value)
+    end
   end
 end

data/lib/eve_online/blueprint.rb

@@ -2,11 +2,11 @@ module EveOnline
   class Blueprint
     attr_reader :options
 
-    def initialize(options = {})
+    def initialize(options)
       @options = options
     end
 
-    def as_json(*args)
+    def as_json
       {
         item_id: item_id,
         location_id: location_id,

data/lib/eve_online/bookmark.rb

@@ -2,11 +2,11 @@ module EveOnline
   class Bookmark
     attr_reader :options
 
-    def initialize(options = {})
+    def initialize(options)
       @options = options
     end
 
-    def as_json(*args)
+    def as_json
       {
         bookmark_id: bookmark_id,
         creator_id: creator_id,

data/lib/eve_online/bookmark_folder.rb

@@ -2,11 +2,11 @@ module EveOnline
   class BookmarkFolder
     attr_reader :options
 
-    def initialize(options = {})
+    def initialize(options)
       @options = options
     end
 
-    def as_json(*args)
+    def as_json
       {
         folder_id: folder_id,
         folder_name: folder_name
@@ -20,5 +20,32 @@ module EveOnline
     def folder_name
       @folder_name ||= options.fetch('@folderName')
     end
+
+    def bookmarks
+      @bookmarks ||= begin
+        case row
+        when Hash
+          [Bookmark.new(row)]
+        when Array
+          bookmarks = []
+          row.each do |bookmark|
+            bookmarks << Bookmark.new(bookmark)
+          end
+          bookmarks
+        else
+          raise ArgumentError
+        end
+      end
+    end
+
+    private
+
+    def rowset
+      @rowset ||= options.fetch('rowset')
+    end
+
+    def row
+      @row ||= rowset.fetch('row')
+    end
   end
 end

data/lib/eve_online/character.rb

@@ -2,11 +2,11 @@ module EveOnline
   class Character
     attr_reader :options
 
-    def initialize(options = {})
+    def initialize(options)
       @options = options
     end
 
-    def as_json(*args)
+    def as_json
       {
         character_id: character_id,
         character_name: character_name,

data/lib/eve_online/character_implants.rb

@@ -0,0 +1,23 @@
+module EveOnline
+  class CharacterImplants
+    attr_reader :result
+
+    def initialize(result)
+      @result = result
+    end
+
+    def implants
+      output = []
+      rowset.each do |implant|
+        output << Implant.new(implant)
+      end
+      output
+    end
+
+    private
+
+    def rowset
+      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'implants' }.first.fetch('row')
+    end
+  end
+end

data/lib/eve_online/character_jump_clones.rb

@@ -0,0 +1,23 @@
+module EveOnline
+  class CharacterJumpClones
+    attr_reader :result
+
+    def initialize(result)
+      @result = result
+    end
+
+    def jump_clones
+      output = []
+      rowset.each do |jump_clone|
+        output << JumpClone.new(jump_clone)
+      end
+      output
+    end
+
+    private
+
+    def rowset
+      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'jumpClones' }.first.fetch('row')
+    end
+  end
+end

data/lib/eve_online/character_skills.rb

@@ -0,0 +1,23 @@
+module EveOnline
+  class CharacterSkills
+    attr_reader :result
+
+    def initialize(result)
+      @result = result
+    end
+
+    def skills
+      output = []
+      rowset.each do |skill|
+        output << Skill.new(skill)
+      end
+      output
+    end
+
+    private
+
+    def rowset
+      @rowset ||= result.fetch('rowset').reject { |a| a.fetch('@name') != 'skills' }.first.fetch('row')
+    end
+  end
+end

data/lib/eve_online/characters/account_balance.rb

@@ -13,7 +13,7 @@ module EveOnline
         @character_id = character_id
       end
 
-      def as_json(*args)
+      def as_json
         {
           account_id: account_id,
           account_key: account_key,

data/lib/eve_online/characters/asset_list.rb

@@ -17,11 +17,11 @@ module EveOnline
       def assets
         case row
         when Hash
-          [EveOnline::Item.new(row)]
+          [Item.new(row)]
         when Array
           output = []
           row.each do |item|
-            output << EveOnline::Item.new(item)
+            output << Item.new(item)
           end
           output
         else

data/lib/eve_online/characters/blueprints.rb

@@ -16,11 +16,11 @@ module EveOnline
       def blueprints
         case row
         when Hash
-          [EveOnline::Blueprint.new(row)]
+          [Blueprint.new(row)]
         when Array
           output = []
           row.each do |blueprint|
-            output << EveOnline::Blueprint.new(blueprint)
+            output << Blueprint.new(blueprint)
           end
           output
         else

data/lib/eve_online/characters/bookmarks.rb

@@ -17,11 +17,11 @@ module EveOnline
         @bookmark_folders ||= begin
           case row
           when Hash
-            [EveOnline::BookmarkFolder.new(row)]
+            [BookmarkFolder.new(row)]
           when Array
             bookmark_folders = []
             row.each do |bookmark_folder|
-              bookmark_folders << EveOnline::BookmarkFolder.new(bookmark_folder)
+              bookmark_folders << BookmarkFolder.new(bookmark_folder)
             end
             bookmark_folders
           else

data/lib/eve_online/characters/character_sheet.rb

@@ -13,9 +13,193 @@ module EveOnline
         @character_id = character_id
       end
 
+      def as_json
+        {
+          character_id: character_id,
+          name: name,
+          home_station_id: home_station_id,
+          dob: dob,
+          race: race,
+          blood_line_id: blood_line_id,
+          blood_line: blood_line,
+          ancestry_id: ancestry_id,
+          ancestry: ancestry,
+          gender: gender,
+          corporation_name: corporation_name,
+          corporation_id: corporation_id,
+          alliance_name: alliance_name,
+          alliance_id: alliance_id,
+          faction_name: faction_name,
+          faction_id: faction_id,
+          clone_type_id: clone_type_id,
+          clone_name: clone_name,
+          clone_skill_points: clone_skill_points,
+          free_skill_points: free_skill_points,
+          free_respecs: free_respecs,
+          clone_jump_date: clone_jump_date,
+          last_respec_date: last_respec_date,
+          last_timed_respec: last_timed_respec,
+          remote_station_date: remote_station_date
+        }
+      end
+
+      def name
+        @name ||= result.fetch('name')
+      end
+
+      def home_station_id
+        @home_station_id ||= result.fetch('homeStationID').to_i
+      end
+
+      def dob
+        @dob ||= parse_datetime_with_timezone(result.fetch('DoB'))
+      end
+
+      def race
+        @race ||= result.fetch('race')
+      end
+
+      def blood_line_id
+        @blood_line_id ||= result.fetch('bloodLineID').to_i
+      end
+
+      def blood_line
+        @blood_line ||= result.fetch('bloodLine')
+      end
+
+      def ancestry_id
+        @ancestry_id ||= result.fetch('ancestryID').to_i
+      end
+
+      def ancestry
+        @ancestry ||= result.fetch('ancestry')
+      end
+
+      def gender
+        @gender ||= result.fetch('gender').downcase.to_sym
+      end
+
+      def corporation_name
+        @corporation_name ||= result.fetch('corporationName')
+      end
+
+      def corporation_id
+        @corporation_id ||= 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')
+      end
+
+      def alliance_id
+        # TODO: Corporation "Federal Navy Academy" doesn't have allianceID in response
+        @alliance_id ||= 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')
+      end
+
+      def faction_id
+        # TODO: Corporation "Federal Navy Academy" doesn't have factionID in response
+        @faction_id ||= result.fetch('factionID').to_i
+      end
+
+      def clone_type_id
+        @clone_type_id ||= result.fetch('cloneTypeID').to_i
+      end
+
+      def clone_name
+        @clone_name ||= result.fetch('cloneName')
+      end
+
+      def clone_skill_points
+        @clone_skill_points ||= result.fetch('cloneSkillPoints').to_i
+      end
+
+      def free_skill_points
+        @free_skill_points ||= result.fetch('freeSkillPoints').to_i
+      end
+
+      def free_respecs
+        @free_respecs ||= result.fetch('freeRespecs').to_i
+      end
+
+      def clone_jump_date
+        @clone_jump_date ||= parse_datetime_with_timezone(result.fetch('cloneJumpDate'))
+      end
+
+      def last_respec_date
+        @last_respec_date ||= parse_datetime_with_timezone(result.fetch('lastRespecDate'))
+      end
+
+      def last_timed_respec
+        @last_timed_respec ||= parse_datetime_with_timezone(result.fetch('lastTimedRespec'))
+      end
+
+      def remote_station_date
+        @remote_station_date ||= parse_datetime_with_timezone(result.fetch('remoteStationDate'))
+      end
+
+      def jump_activation
+        @jump_activation ||= parse_datetime_with_timezone(result.fetch('jumpActivation'))
+      end
+
+      def jump_fatigue
+        @jump_fatigue ||= parse_datetime_with_timezone(result.fetch('jumpFatigue'))
+      end
+
+      def jump_last_update
+        @jump_last_update ||= parse_datetime_with_timezone(result.fetch('jumpLastUpdate'))
+      end
+
+      def balance
+        @balance ||= result.fetch('balance')
+      end
+
+      def base_intelligence
+        @intelligence ||= attributes.fetch('intelligence').to_i
+      end
+
+      def base_memory
+        @memory ||= attributes.fetch('memory').to_i
+      end
+
+      def base_charisma
+        @charisma ||= attributes.fetch('charisma').to_i
+      end
+
+      def base_perception
+        @perception ||= attributes.fetch('perception').to_i
+      end
+
+      def base_willpower
+        @willpower ||= attributes.fetch('willpower').to_i
+      end
+
+      def implants
+        @implants ||= CharacterImplants.new(result).implants
+      end
+
+      def skills
+        @skills ||= CharacterSkills.new(result).skills
+      end
+
+      def jump_clones
+        @jump_clones ||= CharacterJumpClones.new(result).jump_clones
+      end
+
       def url
         "#{ API_ENDPOINT }?keyID=#{ key_id }&vCode=#{ v_code }&characterID=#{ character_id }"
       end
+
+      private
+
+      def attributes
+        @attributes ||= result.fetch('attributes')
+      end
     end
   end
 end