reve 0.0.99 → 0.0.109

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2007, 2008 Lisa Seelye <lisa@thedoh.com>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -35,13 +35,14 @@ Rake::RDocTask.new("doc") { |rdoc|
 
 spec = Gem::Specification.new do |s|
   s.name = "reve"
+  s.rubyforge_project = "reve"
   s.version = "0.0.#{REVE_RELEASE.chomp || '1'}"
   s.author = "Lisa Seelye"
   s.email = "lisa@thedoh.com"
   s.homepage = "http://revetrac.crudvision.com"
   s.platform = Gem::Platform::RUBY
   s.summary = "Reve is a Ruby library to interface with the Eve Online API"
-  s.files = FileList["Rakefile","lib/**/*.rb","reve.rb","tester.rb","init.rb"].to_a
+  s.files = FileList["Rakefile","LICENSE", "lib/**/*.rb","reve.rb","tester.rb","init.rb"].to_a
   s.require_path = "lib"
   s.test_files = FileList["test/test_reve.rb","test/xml/**/*.xml"].to_a
   s.has_rdoc = true

data/lib/reve/classes.rb

@@ -11,6 +11,14 @@
 module Reve #:nodoc:
   module Classes #:nodoc:
     
+    class Name
+      attr_reader :id, :name
+      def initialize(elem) #:nodoc:
+        @id = elem['id'].to_i
+        @id = elem['name']        
+      end
+    end
+    
     # Represents an Alliance as it appears in the Reve::API#alliances call.
     # Attributes
     # * name ( String ) - Full Name of the Alliance
@@ -285,6 +293,7 @@ module Reve #:nodoc:
     # * id ( Fixnum ) - ID of the Character that was killed.
     # * name ( String ) - The name of the Character that was killed.
     # * corporation_id ( Fixnum ) - The ID of the Corporation that the victim belongs to.
+    # * corporation_name ( String ) - Name of the Corporation that the victim belongs to.
     # * alliance_id ( Fixnum | NilClass ) - The ID of the Alliance that the victim belongs to, if applicable. Will be nil unless the victim was in an Alliance
     # * damage_taken ( Fixnum ) - The amount of damage the victim took before being killed.
     # * ship_type_id ( Fixnum ) - ID of the ship type (references CCP data dump) that the victim was flying.
@@ -294,7 +303,8 @@ module Reve #:nodoc:
       def initialize(elem) #:nodoc:
         @id = elem['characterID'].to_i
         @name = elem['characterName']
-        @corporation_id = elem['corporationName']
+        @corporation_id = elem['corporationID']
+        @corporation_name = elem['corporationName']
         @alliance_id = elem['allianceID'] == "0" ? nil : elem['allianceID'].to_i
         @damage_taken = elem['damageTaken'].to_i
         @ship_type_id = elem['shipTypeID'].to_i
@@ -441,6 +451,77 @@ module Reve #:nodoc:
     class PerceptionEnhancer < AttributeEnhancer; end
     class CharismaEnhancer < AttributeEnhancer; end
     class WillpowerEnhancer < AttributeEnhancer; end
+    
+    
+    # Certificate tree container. This looks like:
+    # [CertificateCategory]
+    #   [CertificateClass]
+    #     [Certificate]
+    #       [CertificateRequiredSkill]
+    #       [CertificateRequiredCertificate]
+    class CertificateTree
+      attr_accessor :categories
+      def initialize(categories = []) #:nodoc:
+        @categories = categories
+      end
+    end
+    
+    # Category of Certificates.
+    # Attributes:
+    # * id ( Fixnum ) - ID of the CertificateCategory
+    # * name ( String ) - Name of the CertificateCategory
+    # * classes ( [ CertificateClass ] ) - Array of CertificateClass objects under this Category
+    class CertificateCategory
+      attr_reader :name, :id
+      attr_accessor :classes
+      def initialize(elem) #:nodoc:
+        @name = elem['categoryName']
+        @id = elem['categoryID'].to_i
+        @classes = []
+      end
+    end
+    
+    # A class of Certificates.
+    # Attributes:
+    # * id ( Fixnum ) - ID of the CertificateClass
+    # * name ( String ) - Name of the CertificateClass
+    # * classes ( [ Certificate ] ) - Array of Certificate objects under this class
+    class CertificateClass
+      attr_reader :name, :id
+      attr_accessor :certificates
+      def initialize(elem) #:nodoc:
+        @name = elem['className']
+        @id = elem['classID'].to_i
+        @certificates = []
+      end
+    end
+    class Certificate
+      attr_reader :id, :grade, :corporation_id, :description
+      attr_accessor :required_skills, :required_certificates
+      def initialize(elem)
+        @id = elem['certificateID'].to_i
+        @grade = elem['grade'].to_i
+        @corporation_id = elem['corporationID'].to_i
+        @description = elem['description']
+        @required_certificates = []
+        @required_skills = []
+      end
+    end
+    class CertificateRequiredSkill
+      attr_reader :id, :level
+      def initialize(elem)
+        @id = elem["typeID"].to_i
+        @level = elem["level"].to_i
+      end
+    end
+    
+    class CertificateRequiredCertificate
+      attr_reader :id, :grade
+      def initialize(elem)
+        @id = elem["certificateID"].to_i
+        @grade = elem["grade"].to_i
+      end
+    end
 
     # Represents a Character for the Reve::API#characters, Reve::API#character_name and Reve::API#character_id calls.
     # Attributes
@@ -458,6 +539,7 @@ module Reve #:nodoc:
         @corporation_id   = elem['corporationID'].to_i
       end
     end
+  
 
     # Holds the result of the Reve::API#character_sheet call.
     # This has all of the stuff that appears in the in-game 'character sheet'
@@ -482,11 +564,29 @@ module Reve #:nodoc:
     # See Also: Reve::API#character_sheet, AttributeEnhancer (and subclasses), Skill
     class CharacterSheet
       attr_accessor :name, :race, :bloodline, :gender, :id, :corporation_name, :corporation_id, :balance
-      attr_accessor :intelligence, :memory, :charisma, :perception, :willpower
-      attr_accessor :skills, :enhancers
+      attr_accessor :intelligence, :memory, :charisma, :perception, :willpower, :clone_name, :clone_skill_points
+      attr_accessor :skills, :enhancers, :roles, :certificate_ids, :corporate_titles
+      attr_accessor :corporationRolesAtHQ, :corporationRoles, :corporationRolesAtBase, :corporationRolesAtOther
+      alias_method :corporate_roles_at_hq,    :corporationRolesAtHQ
+      alias_method :corporate_roles,          :corporationRoles
+      alias_method :corporate_roles_at_base,  :corporationRolesAtBase
+      alias_method :corporate_roles_at_other, :corporationRolesAtOther
       def initialize #:nodoc:
         @skills = []
         @enhancers = []
+        @roles = []
+        @certificate_ids = []
+        @corporate_titles = []
+        @corporationRolesAtHQ = []
+        @corporationRoles = []
+        @corporationRolesAtBase = []
+        @corporationRolesAtOther = []
+      end
+      def clonename=(n) #:nodoc:
+        @clone_name = n
+      end
+      def cloneskillpoints=(i) #:nodoc:
+        @clone_skill_points = i
       end
       def characterid=(i) #:nodoc:
         @id = i.to_i
@@ -519,6 +619,7 @@ module Reve #:nodoc:
         @corporation_name = elem['corporationName']
       end
     end
+    class ConquerableStation < ConqurableStation; end
     
     # Part of the CorporationSheet; represnets a Corporation's in-game logo
     # All of these values are internal to CCP; +shape_1+ matches with +color_1+ and so on.
@@ -543,6 +644,33 @@ module Reve #:nodoc:
       end      
     end
     
+    
+    # Part of the CharacterSheet; represents a grantable Corporation role to a
+    # Character.
+    # Attributes:
+    # * id ( Fixnum ) - Bitmask/ID of the role
+    # * name ( String ) - Name of the role
+    class CorporateRole
+      attr_reader :id, :name
+      def initialize(elem) #:nodoc:
+        @id = elem['roleID'].to_i
+        @name = elem['roleName']
+      end
+    end
+    
+    # Part of the CharacterSheet; represents a grantable Corporation title to a
+    # Character.
+    # Attributes:
+    # * id ( Fixnum ) - Bitmask/ID of the title
+    # * name ( String ) - Name of the title
+    class CorporateTitle
+      attr_reader :id, :name
+      def initialize(elem) #:nodoc:
+        @id = elem['titleID'].to_i
+        @name = elem['titleName']
+      end
+    end
+    
     # Part of the CorporationSheet. Describes a division in the wallet
     # Attributes
     # * key ( Fixnum ) - Account key. Used for things like WalletBalance and such.
@@ -627,6 +755,117 @@ module Reve #:nodoc:
       end
     end
     
+    
+    # Container for the CharacterMedal since there's two kinds returned in XML
+    # Attributes:
+    # * current_corporation ( [ CharacterMedal ] ) - Array of CharacterMedal for the Corporation this Character is currently in
+    # * other_corporation ( [ CharacterOtherCorporateMedal ] ) - Array of CharacterOtherCorporateMedal from other Corporations
+    # See also: Medal, CharacterMedal, Reve::API#character_medals
+    class CharacterMedals
+      attr_reader :current_corporation, :other_corporation
+      def initialize(current, other)
+        @current_corporation = current
+        @other_corporation = other
+      end      
+    end
+    
+    # Parent class for Medals
+    # Attributes:
+    # * id ( Fixnum ) - ID for the Medal
+    # * issued_at ( Time ) - When the Medal was issued (Note: Not valid/present on the CorporateMedal)
+    # See Also: CharacterMedal, CharacterOtherCorporateMedal, CorporateMemberMedal, CorporateMedal
+    class Medal
+      attr_reader :id, :issued_at
+      def initialize(elem) #:nodoc:
+        @id = elem["medalID"].to_i
+        @issued_at = elem["issued"].to_time
+      end
+    end
+    
+    # Composed in CharacterMedals. Issued by the Corporation the Character is a member
+    # Attributes:
+    # * reason ( String ) - Why the CharacterMedal was issued
+    # * issuer_id ( Fixnum ) - Who issued the CharacterMedal
+    # * status ( String ) - public or private (presumably), if this CharacterMedal is public or private.
+    # See Also: Medal, CharacterOtherCorporateMedal, CorporateMemberMedal, CorporateMedal
+    class CharacterMedal < Medal
+      attr_reader :reason, :issuer_id, :status
+      def initialize(elem) #:nodoc:
+        super(elem)
+        @reason = elem["reason"]
+        @issuer_id = elem["issuerID"].to_i
+        @status = elem["status"]
+      end
+      # If the CharacterMedal is public
+      def is_public?
+        @status == "public"
+      end
+      # If the CharacterMedal is private (not public)
+      def is_private?
+        ! is_public?
+      end
+    end
+    
+    # Composed in CharacterMedals. Issued by the Corporation the Character is a member
+    # Attributes:
+    # * corporation_id ( Fixnum ) - ID of the Corporation that issued the CharacterOtherCorporateMedal
+    # * title ( String ) - The title this CharacterOtherCorporateMedal bestows on the Character
+    # * description ( String ) - Description of the CharacterOtherCorporateMedal.
+    # See Also: Medal, CharacterMedal, CorporateMemberMedal, CorporateMedal
+    class CharacterOtherCorporateMedal < CharacterMedal
+      attr_reader :corporation_id, :title, :description
+      def initialize(elem) #:nodoc:
+        super(elem)
+        @corporation_id = elem["corporationID"].to_i
+        @title = elem["title"]
+        @description = elem["description"]
+      end      
+    end
+    
+    # All of the Medals that the members of a Corporation have.
+    # Attributes:
+    # * character_id ( Fixnum ) - ID of the Character that has this CorporateMemberMedal
+    # * reason ( String ) - Why the CorporateMemberMedal is bestowed
+    # * issuer_id ( Fixnum ) - Who issued the CorporateMemberMedal
+    # * status ( String ) - public or private (presumably), if this CorporateMemberMedal is public or private.
+    # See Also: Medal, CharacterMedal, CharacterOtherCorporateMedal, CorporateMedal
+    class CorporateMemberMedal < Medal
+      attr_reader :character_id, :reason, :issuer_id, :status
+      def initialize(elem) #:nodoc:
+        super(elem)
+        @character_id = elem["characterID"].to_i
+        @reason = elem["reason"]
+        @issuer_id = elem["issuerID"].to_i
+        @status = elem["status"]
+      end
+      # If the CharacterMedal is public
+      def is_public?
+        @status == "public"
+      end
+      # If the CorporateMemberMedal is private (not public)
+      def is_private?
+        ! is_public?
+      end
+    end
+    
+    # The medals a Corporation can give out.
+    # Attributes
+    # * title ( String ) - Title that this CorporateMedal gives
+    # * creator_id ( Fixnum ) - Who created the CorporateMedal
+    # * description ( String ) Description of the CorporateMedal
+    # * created_at ( Time ) - When the CorporateMedal was created.
+    # See Also: Medal, CharacterMedal, CharacterOtherCorporateMedal, CorporateMemberMedal, 
+    class CorporateMedal < Medal
+      attr_reader :title, :creator_id, :description, :created_at
+      def initialize(elem) #:nodoc:
+        super(elem)
+        @title = elem["title"]
+        @creator_id = elem["creatorID"].to_i
+        @description = elem["description"]
+        @created_at = elem["created"].to_time
+      end
+    end
+    
     # Used for the Reve::API#map_jumps method. If there are no jumps it is not listed.
     # Attributes
     # * system_id ( Fixnum ) - ID of the System
@@ -754,7 +993,7 @@ module Reve #:nodoc:
 
     # Holds the result of the Reve::API#member_tracking call for big brother.
     # * character_id ( Fixnum ) - ID of the Character
-    # * character_name ( Fixnum ) - Name of the Character
+    # * character_name ( String ) - Name of the Character
     # * start_time ( Time ) - When the Character joined the Corporation
     # * base_id ( Fixnum ) - ID of the Station (Starbase too?) where the Character calls home
     # * base ( String ) - Name of the Station (Starbase?) where the Character calls home

data/lib/reve/exceptions.rb

@@ -129,6 +129,10 @@ module Reve
         raise CharacterRetrevialFailure.new(msg)
       when 523
         raise CorporationRetrevialFailure.new(msg)
+      when 524
+        raise FactionMemberInformationFailure.new(msg)
+      when 525
+        raise MedalInformationFetchFailure.new(msg)
       when 900
         raise BetaAccessDenied.new(msg)
       when 901
@@ -316,6 +320,12 @@ module Reve
     # 523
     class CorporationRetrevialFailure < ReveError #:nodoc:
     end
+    # 524
+    class FactionMemberInformationFailure < ReveError #:nodoc:
+    end
+    # 525
+    class MedalInformationFetchFailure < ReveError #:nodoc:
+    end
 
     # 900
     class BetaAccessDenied < ReveError #:nodoc:

data/lib/reve.rb

@@ -80,6 +80,10 @@ module Reve
     @@general_faction_war_stats_url= 'http://api.eve-online.com/eve/FacWarStats.xml.aspx'
     @@top_faction_war_stats_url    = 'http://api.eve-online.com/eve/FacWarTopStats.xml.aspx'
     @@faction_war_occupancy_url    = 'http://api.eve-online.com/map/FacWarSystems.xml.aspx'
+    @@certificate_tree_url         = 'http://api.eve-online.com/eve/CertificateTree.xml.aspx'
+    @@character_medals_url         = 'http://api.eve-online.com/char/Medals.xml.aspx'
+    @@corporate_medals_url         = 'http://api.eve-online.com/corp/Medals.xml.aspx'
+    @@corp_member_medals_url       = 'http://api.eve-online.com/corp/MemberMedals.xml.aspx'
 
     cattr_accessor :character_sheet_url, :training_skill_url, :characters_url, :personal_wallet_journal_url,
                    :corporate_wallet_journal_url, :personal_wallet_trans_url, :corporate_wallet_trans_url,
@@ -90,8 +94,9 @@ module Reve
                    :personal_industry_jobs_url, :corporate_industry_jobs_url, :personal_assets_url,
                    :corporate_assets_url, :personal_kills_url, :corporate_kills_url,
                    :personal_faction_war_stats_url, :corporate_faction_war_stats_url,
-                   :general_faction_war_stats_url, :top_faction_war_stats_url, :faction_war_occupancy_url
-  
+                   :general_faction_war_stats_url, :top_faction_war_stats_url, :faction_war_occupancy_url,
+                   :certificate_tree_url, :character_medals_url, :corporate_medals_url, 
+                   :corp_member_medals_url
 
 
     attr_accessor :key, :userid, :charid
@@ -128,20 +133,11 @@ module Reve
       @save_path = p
     end
     
-    # Convert Character names to Character ids.
+    # Convert a list of names to their ids.
     # Expects a Hash as a parameter with these keys:
-    # * names ( Array ) - An Array of Character names to fetch the IDs of.
+    # * names ( Array ) - An Array of Names to fetch the IDs of.
     # See Also: character_name, Reve::Classes::Character, character_sheet
-    #--
-    # This is an odd method because the XML from this looks like:
-    # <rowset ...>
-    #   <row:name name="CCP Garthagk" characterID="797400947" xmlns:row="characterID" />
-    # </rowset>
-    # I have to hack the Hpricot::Doc document coming from process_query to
-    # gsub out the row:name -> row to make the XPath work. Hope it doesn't
-    # perform too slowly! (We don't, of course, care about the xmlns:row bit)
-    #++ 
-    def character_id(opts = {} )
+    def names_to_ids(opts = {} )
       names = opts[:names] || []
       return [] if names.empty? # No names were passed.
       opts[:names] = names.join(',')
@@ -149,7 +145,6 @@ module Reve
       h = compute_hash(  opts.merge(:url => @@character_id_url) )
       return h if h
       xml = process_query(nil,opts[:url] || @@character_id_url, true,opts)
-      xml = Hpricot::XML(xml.to_s.gsub('row:name','row')) # Namespaces are evil!!
       ret = []
       xml.search("//rowset/row").each do |elem|
         ret << Reve::Classes::Character.new(elem)
@@ -157,7 +152,9 @@ module Reve
       ret
     end
     
-    # Convert Character names to Character names.
+    alias_method  :character_id, :names_to_ids
+    
+    # Convert  ids to Character names.
     # Expects a Hash as a parameter with these keys:
     # * ids ( Array ) - An Array of Character IDs to fetch the names of.
     # See Also: character_name, Reve::Classes::Character, character_sheet
@@ -230,11 +227,13 @@ module Reve
     # Returns a list of ConqurableStations and outposts from
     # http://api.eve-online.com/eve/ConquerableStationList.xml.aspx
     # See also: Reve::Classes::ConqurableStation
-    def conqurable_stations(opts = {})
+    def conquerable_stations(opts = {})
       compute_hash(  opts.merge(:url => @@conqurable_outposts_url) ) ||
-          process_query(Reve::Classes::ConqurableStation, opts[:url] || @@conqurable_outposts_url, false)
+          process_query(Reve::Classes::ConquerableStation, opts[:url] || @@conqurable_outposts_url, false)
     end
     
+    alias_method :conqurable_stations, :conquerable_stations
+    
     # Returns a list of Reve::Classes::MarketOrder objects for market orders that are up
     # Pass the characterid of the Character to check for
     def personal_market_orders(opts = {:characterid => nil})
@@ -348,10 +347,10 @@ module Reve
     # http://api.eve-online.com/char/WalletTransactions.xml.aspx
     # Expects:
     # * characterid ( Integer | String ) - Look at this player's WalletTransaction list
-    # * before_trans_id ( Integer | String ) - Gets a list of WalletTransaction objects from before this Transaction ID.
+    # * beforetransid ( Integer | String ) - Gets a list of WalletTransaction objects from before this Transaction ID.
     # See also: Reve::Classes::WalletTransaction and
     # corporate_wallet_transactions
-    def personal_wallet_transactions(opts = { :characterid => nil, :before_trans_id => nil })
+    def personal_wallet_transactions(opts = { :characterid => nil, :beforetransid => nil })
       args = postfields(opts)
       h = compute_hash(args.merge(:url => @@personal_wallet_trans_url) )
       return h if h
@@ -363,7 +362,7 @@ module Reve
     # Expects:
     # * account_key ( Integer | String ) - Account key (1000-1006) to look at.
     # * characterid ( Integer | String ) - Look at WalletTransaction objects from this Character's Corporation
-    # * before_trans_id ( Integer | String ) - Gets a list of WalletTransaction objects from before this Transaction ID.
+    # * beforetransid ( Integer | String ) - Gets a list of WalletTransaction objects from before this Transaction ID.
     # See also: Reve::Classes::WalletTransaction and
     # personal_wallet_transactions
     def corporate_wallet_transactions(opts = {:accountkey => nil, :characterid => nil, :beforerefid => nil})
@@ -378,7 +377,7 @@ module Reve
     # Expects:
     # * account_key ( Integer | String ) - Account key (1000-1006) to look at.
     # * characterid ( Integer | String ) - Look at WalletJournal objects from this Character's Corporation
-    # * before_ref_id ( Integer | String ) - Gets a list of  WalletTransaction objects from before this RefID.
+    # * beforerefid ( Integer | String ) - Gets a list of  WalletTransaction objects from before this RefID.
     # See also: Reve::Classes::WalletJournal and personal_wallet_journal
     def corporate_wallet_journal(opts = {:accountkey => nil, :characterid => nil, :beforerefid => nil})
       args = postfields(opts)
@@ -391,7 +390,7 @@ module Reve
     # http://api.eve-online.com/char/WalletJournal.xml.aspx
     # Expects:
     # * characterid ( Integer | String ) - Look at this player's WalletJournal list
-    # * before_ref_id ( Integer | String ) - Gets a list of WalletJournal objects from before this RefID.
+    # * beforerefid ( Integer | String ) - Gets a list of WalletJournal objects from before this RefID.
     # See also: Reve::Classes::WalletJournal and corporate_wallet_journal
     def personal_wallet_journal(opts = { :characterid => nil, :beforerefid => nil} )
       args = postfields(opts)
@@ -400,7 +399,49 @@ module Reve
       process_query(Reve::Classes::WalletJournal,opts[:url] || @@personal_wallet_journal_url,false,args)
     end
     
-    # Gets the PersonalFactionWarStat for a character.
+    # Get the medals a Corporation can give out. Returns a list of 
+    # Reve::Classes::CorporateMedal objects.
+    # Expects:
+    # * characterid ( Integer | String ) - Get this Medals this Character's Corporation can give out
+    # See also: Reve::Classes::CorporateMedal, Reve::Classes::Medal
+    def corporate_medals(opts = { :characterid => nil })
+      args = postfields(opts)
+      h = compute_hash(args.merge(:url => @@corporate_medals_url))
+      return h if h
+      process_query(Reve::Classes::CorporateMedal, opts[:url] || @@corporate_medals_url,false,args)
+    end
+    
+    
+    # Gets the medals the Corporation has given out. Returns a list of
+    # Reve::Classes::CorporateMemberMedal
+    # Expects:
+    # * characterid ( Integer | String ) - Get this Medals this Character's Corporation has given out
+    # See also: Reve::Classes::CorporateMedal, Reve::Classes::Medal
+    def corporate_member_medals(opts = { :characterid => nil })
+      args = postfields(opts)
+      h = compute_hash(args.merge(:url => @@corp_member_medals_url))
+      return h if h
+      process_query(Reve::Classes::CorporateMemberMedal, opts[:url] || @@corp_member_medals_url,false,args)
+    end
+    
+    
+    # Gets the list of Medals awarded to a Character. Returns a
+    # Reve::Classes::CharacterMedals object.
+    def character_medals(opts = { :characterid => nil })
+      args = postfields(opts)
+      h = compute_hash(args.merge(:url => @@character_medals_url))
+      return h if h
+      xml = process_query(nil,opts[:url] || @@character_medals_url,true,args)
+      current = xml.search("/eveapi/result/rowset[@name=currentCorporation]/row").inject([]) do |cur,elem|
+        cur << Reve::Classes::CharacterMedal.new(elem)
+      end
+      other = xml.search("/eveapi/result/rowset[@name=otherCorporations]/row").inject([]) do |cur,elem|
+        cur << Reve::Classes::CharacterMedal.new(elem)
+      end
+      Reve::Classes::CharacterMedals.new(current,other)
+    end
+    
+    # Gets the Reve::Classes::PersonalFactionWarStat for a character.
     # Expects:
     # * characterid ( Integer | String ) - Get this character's PersonalFactionWarStat.
     # See Also Reve::Classes::PersonalFactionWarStat and corporate_faction_war_stats
@@ -680,6 +721,39 @@ module Reve
 
       Reve::Classes::CorporationSheet.new res, divisions, wallet_divisions, corporate_logo  
     end
+    
+    
+    # Returns a Reve::Classes::CertificateTree object that contains the
+    # Certificate tree structure. See the rdoc for Reve::Classes::CertificateTree
+    # for details.
+    # See also: Reve::Classes::CertificateTree
+    def certificate_tree(opts = {})
+      args = postfields(opts)
+      h = compute_hash(args.merge(:url => @@certificate_tree_url))
+      return h if h
+      xml = process_query(nil,opts[:url] || @@certificate_tree_url,true,args)
+      
+      tree = Reve::Classes::CertificateTree.new
+      xml.search("/eveapi/result/rowset[@name=categories]/row").each do |category|
+        cat = Reve::Classes::CertificateCategory.new(category)
+        category.search("rowset[@name=classes]/row").each do |klass|
+          kl = Reve::Classes::CertificateClass.new(klass)
+          klass.search("rowset[@name=certificates]/row").each do |certificate|
+            cert = Reve::Classes::Certificate.new(certificate)
+            certificate.search("rowset[@name=requiredSkills]/row").each do |skill|
+              cert.required_skills << Reve::Classes::CertificateRequiredSkill.new(skill)
+            end
+            certificate.search("rowset[@name=requiredCertificates]/row").each do |requiredcert|
+              cert.required_certificates << Reve::Classes::CertificateRequiredCertificate.new(requiredcert)
+            end
+            kl.certificates << cert
+          end
+          cat.classes << kl
+        end
+        tree.categories << cat
+      end
+      tree
+    end
 
     # Gets the CharacterSheet from
     # http://api.eve-online.com/char/CharacterSheet.xml.aspx
@@ -694,42 +768,44 @@ module Reve
       xml = process_query(nil,opts[:url] || @@character_sheet_url,true,args)
       cs = Reve::Classes::CharacterSheet.new
 
-      xml.search("//result/attributeEnhancers").each do |enh|
-        for kind in ['intelligenceBonus', 'memoryBonus', 'charismaBonus', 'perceptionBonus','willpowerBonus']
-          thing = nil
-          case kind
-          when 'intelligenceBonus'
-            thing = Reve::Classes::IntelligenceEnhancer
-          when 'memoryBonus'
-            thing = Reve::Classes::MemoryEnhancer
-          when 'charismaBonus'
-            thing = Reve::Classes::CharismaEnhancer
-          when 'perceptionBonus'
-            thing = Reve::Classes::PerceptionEnhancer
-          when 'willpowerBonus'
-            thing = Reve::Classes::WillpowerEnhancer
-          end
-          (enh/kind).each do |b|
-            name = (b/:augmentatorname).inner_html
-            value = (b/:augmentatorvalue).inner_html
-            cs.enhancers << thing.new(name,value)
-          end
-        end
+      [ Reve::Classes::IntelligenceEnhancer, Reve::Classes::MemoryEnhancer, Reve::Classes::CharismaEnhancer,
+        Reve::Classes::PerceptionEnhancer, Reve::Classes::WillpowerEnhancer
+      ].each do |klass|
+        xml_attr = klass.to_s.split("::").last.sub("Enhancer",'').downcase + "Bonus"
+        i = klass.new(xml.search("/eveapi/result/attributeEnhancers/#{xml_attr}").search("augmentatorName/").first.to_s,
+                      xml.search("/eveapi/result/attributeEnhancers/#{xml_attr}").search("augmentatorValue/").first.to_s.to_i)
+        cs.enhancers << i
       end
 
-      (xml/:result).each do |elem|
-        for field in [ 'characterID', 'name', 'race', 'bloodLine', 'gender','corporationName','corporationID','balance' ]
-          cs.send("#{field.downcase}=",(elem/field.intern).first.inner_html)
-        end
+      [ 'characterID', 'name', 'race', 'bloodLine', 'gender','corporationName',
+        'corporationID','balance', 'cloneName', 'cloneSkillPoints' 
+      ].each do |field|
+        cs.send("#{field.downcase}=",xml.search("/eveapi/result/#{field}/").first.to_s)
       end
-      (xml/:result/:attributes).each do |elem|
-        for attrib in [ 'intelligence','memory','charisma','perception','willpower' ]
-          cs.send("#{attrib}=",(elem/attrib.intern).first.inner_html)
-        end
+      
+      [ 'intelligence','memory','charisma','perception','willpower' ].each do |attrib|
+        cs.send("#{attrib}=",xml.search("/eveapi/result/attributes/#{attrib}/").first.to_s.to_i) 
       end
-      (xml/:result/:rowset/:row).each do |elem|
+      xml.search("rowset[@name=skills]/row").each do |elem|
         cs.skills << Reve::Classes::Skill.new(elem)
       end
+      
+      xml.search("rowset[@name=certificates]/row").each do |elem|
+        cs.certificate_ids << elem['certificateID'].to_i
+      end
+      [ :corporationRolesAtHQ, :corporationRoles, :corporationRolesAtBase, :corporationRolesAtOther ].each do |role_kind|
+        xml.search("rowset[@name=#{role_kind.to_s}]/row").each do |elem|
+          arry = []
+          role = Reve::Classes::CorporateRole.new(elem)
+          arry << role
+          cs.send("#{role_kind}=".to_sym,arry)
+        end
+      end
+      
+      xml.search("rowset[@name=corporationTitles]/row").each do |elem|
+        cs.corporate_titles << Reve::Classes::CorporateTitle.new(elem)
+      end
+      
       cs
     end