reve 0.0.80 → 0.0.83

data/Rakefile

@@ -1,3 +1,7 @@
+STATS_DIRECTORIES = [
+  %w(Libraries          lib/),
+  %w(tests test/)
+]
 require 'rubygems'
 
 require 'rake'
@@ -9,6 +13,13 @@ require 'rake/gempackagetask'
 
 task :default => :redoc
 
+desc "Code Statistics"
+task :stats do
+  require 'code_statistics'
+  CodeStatistics.new(*STATS_DIRECTORIES).to_s  
+end
+
+
 REVE_RELEASE=`svn up &>/dev/null && svn info|grep ^Revision| cut -d ' ' -f 2`
 
 desc "Generate Docs"

data/lib/reve/classes.rb

@@ -25,11 +25,11 @@ module Reve #:nodoc:
       attr_accessor :member_corporations
       def initialize(elem) #:nodoc:
         @name             = elem['name']
-        @short_name       = elem['shortname']
-        @id               = elem['allianceid'].to_i
-        @executor_corp_id = elem['executorcorpid'].to_i
-        @member_count     = elem['membercount'].to_i
-        @start_date       = elem['startdate'].to_time
+        @short_name       = elem['shortName']
+        @id               = elem['allianceID'].to_i
+        @executor_corp_id = elem['executorCorpID'].to_i
+        @member_count     = elem['memberCount'].to_i
+        @start_date       = elem['startDate'].to_time
         @member_corporations = []
       end
     end
@@ -41,8 +41,8 @@ module Reve #:nodoc:
     class Corporation
       attr_reader :id, :start_date
       def initialize(elem) #:nodoc:
-        @id = elem['corporationid'].to_i
-        @start_date = elem['startdate'].to_time
+        @id = elem['corporationID'].to_i
+        @start_date = elem['startDate'].to_time
       end      
     end
     
@@ -77,12 +77,12 @@ module Reve #:nodoc:
     class KillVictim
       attr_reader :id, :name, :corporation_id, :corporation_name, :alliance_id, :damage_taken, :ship_type_id
       def initialize(elem) #:nodoc:
-        @id = elem['characterid'].to_i
-        @name = elem['charactername']
-        @corporation_id = 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
+        @id = elem['characterID'].to_i
+        @name = elem['characterName']
+        @corporation_id = 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
       end
     end
     
@@ -105,17 +105,17 @@ module Reve #:nodoc:
       attr_reader :id, :name, :corporation_id, :corporation_name, :alliance_id, :alliance_name,
                   :security_status, :damage_done, :final_blow, :weapon_type_id, :ship_type_id
       def initialize(elem) #:nodoc:
-        @id = elem['characterid'] == "0" ? nil : elem['characterid'].to_i
-        @name = elem['charactername'].empty? ? nil : elem['charactername']
-        @corporation_id = elem['corporationid'].to_i
-        @corporation_name = elem['corporationname']
-        @alliance_id = elem['allianceid'] == "0" ? nil : elem['allianceid'].to_i
-        @alliance_name = elem['alliancename'].empty? ? nil : elem['alliancename']
-        @security_status = elem['securitystatus'].to_f
-        @damage_done = elem['damagedone'].to_i
-        @final_blow = elem['finalblow'] == "1"
-        @weapon_type_id = elem['weapontypeid'] == "0" ? nil : elem['weapontypeid'].to_i
-        @ship_type_id = elem['shiptypeid'].to_i
+        @id = elem['characterID'] == "0" ? nil : elem['characterID'].to_i
+        @name = elem['characterName'].empty? ? nil : elem['characterName']
+        @corporation_id = elem['corporationID'].to_i
+        @corporation_name = elem['corporationName']
+        @alliance_id = elem['allianceID'] == "0" ? nil : elem['allianceID'].to_i
+        @alliance_name = elem['allianceName'].empty? ? nil : elem['allianceName']
+        @security_status = elem['securityStatus'].to_f
+        @damage_done = elem['damageDone'].to_i
+        @final_blow = elem['finalBlow'] == "1"
+        @weapon_type_id = elem['weaponTypeID'] == "0" ? nil : elem['weaponTypeID'].to_i
+        @ship_type_id = elem['shipTypeID'].to_i
       end
     end
     
@@ -131,10 +131,10 @@ module Reve #:nodoc:
       attr_reader :type_id, :flag, :quantity_dropped, :quantity_destroyed
       attr_accessor :contained_losses
       def initialize(elem)
-        @type_id = elem['typeid'].to_i
+        @type_id = elem['typeID'].to_i
         @flag = elem['flag'].to_i
-        @quantity_dropped = elem['qtydropped'].to_i
-        @quantity_destroyed = elem['qtydestroyed'].to_i
+        @quantity_dropped = elem['qtyDropped'].to_i
+        @quantity_destroyed = elem['qtyDestroyed'].to_i
         @contained_losses = []        
       end
     end
@@ -155,10 +155,10 @@ module Reve #:nodoc:
       attr_reader :system_id, :created_at, :id, :moon_id
       def initialize(elem, victim, attackers, losses) #:nodoc:
         @victim, @attackers, @losses = victim, attackers, losses
-        @system_id = elem['solarsystemid'].to_i
-        @created_at = elem['killtime'].to_time
-        @id = elem['killid'].to_i
-        @moon_id = elem['moonid'] == "0" ? nil : elem['moonid'].to_i
+        @system_id = elem['solarSystemID'].to_i
+        @created_at = elem['killTime'].to_time
+        @id = elem['killID'].to_i
+        @moon_id = elem['moonID'] == "0" ? nil : elem['moonID'].to_i
       end
     end
     
@@ -177,9 +177,9 @@ module Reve #:nodoc:
       attr_reader :item_id, :location_id, :type_id, :quantity, :flag, :singleton
       attr_accessor :assets
       def initialize(elem)
-        @item_id = elem['itemid'].to_i
-        @location_id = elem['locationid'].to_i
-        @type_id = elem['typeid'].to_i
+        @item_id = elem['itemID'].to_i
+        @location_id = elem['locationID'].to_i
+        @type_id = elem['typeID'].to_i
         @quantity = elem['quantity'].to_i
         @flag = elem['flag'].to_i
         @singleton = elem['singleton'] == "1"
@@ -197,8 +197,8 @@ module Reve #:nodoc:
     class Asset
       attr_reader :item_id, :type_id, :quantity, :flag, :singleton
       def initialize(elem) #:nodoc:
-        @item_id = elem['itemid'].to_i
-        @type_id = elem['typeid'].to_i
+        @item_id = elem['itemID'].to_i
+        @type_id = elem['typeID'].to_i
         @quantity = elem['quantity'].to_i
         @flag = elem['flag'].to_i
         @singleton = elem['singleton'].to_i
@@ -237,10 +237,10 @@ module Reve #:nodoc:
     class Character
       attr_reader :name, :id, :corporation_name, :corporation_id
       def initialize(elem) #:nodoc:
-        @id               = elem['characterid'].to_i
+        @id               = elem['characterID'].to_i
         @name             = elem['name']
-        @corporation_name = elem['corporationname']
-        @corporation_id   = elem['corporationid'].to_i
+        @corporation_name = elem['corporationName']
+        @corporation_id   = elem['corporationID'].to_i
       end
     end
 
@@ -296,12 +296,12 @@ module Reve #:nodoc:
     class ConqurableStation
       attr_reader :id, :name, :type_id, :type_name, :system_id, :system_name, :corporation_id, :corporation_name
       def initialize(elem) #:nodoc:
-        @id = elem['stationid'].to_i
-        @name = elem['stationname']
-        @type_id = elem['stationtypeid'].to_i
-        @type_name = elem['stationtypename']
-        @corporation_id = elem['corporationid'].to_i
-        @corporation_name = elem['corporationname']
+        @id = elem['stationID'].to_i
+        @name = elem['stationName']
+        @type_id = elem['stationTypeID'].to_i
+        @type_name = elem['stationTypeName']
+        @corporation_id = elem['corporationID'].to_i
+        @corporation_name = elem['corporationName']
       end
     end
     
@@ -318,7 +318,7 @@ module Reve #:nodoc:
     class CorporateLogo
       attr_reader :graphic_id, :shape_1, :shape_2, :shape_3, :color_1, :color_2, :color_3
       def initialize(elem) #:nodoc:
-        @graphic_id = elem['graphicid'].to_i
+        @graphic_id = elem['graphicID'].to_i
         @shape_1    = elem['shape1'].to_i
         @shape_2    = elem['shape2'].to_i
         @shape_3    = elem['shape3'].to_i
@@ -336,7 +336,7 @@ module Reve #:nodoc:
     class WalletDivision
       attr_reader :key, :description
       def initialize(elem) #:nodoc:
-        @key = elem['accountkey'].to_i
+        @key = elem['accountKey'].to_i
         @description = elem['description'].split(/\n/).collect { |s| s.strip }.join(' ') # newlines to spaces
       end
     end
@@ -349,7 +349,7 @@ module Reve #:nodoc:
     class CorporateDivision
       attr_reader :key, :description
       def initialize(elem) #:nodoc:
-        @key = elem['accountkey'].to_i
+        @key = elem['accountKey'].to_i
         @description = elem['description'].split(/\n/).collect { |s| s.strip }.join(' ') # newlines to spaces
       end
     end
@@ -407,8 +407,8 @@ module Reve #:nodoc:
     class APIError #:nodoc:
       attr_reader :code, :text
       def initialize(elem)
-        @code = elem['errorcode'].to_i
-        @text = elem['errortext']
+        @code = elem['errorCode'].to_i
+        @text = elem['errorText']
       end
     end
     
@@ -420,8 +420,8 @@ module Reve #:nodoc:
     class MapJump
       attr_reader :system_id, :jumps
       def initialize(elem) #:nodoc:
-        @system_id = elem['solarsystemid'].to_i
-        @jumps     = elem['shipjumps'].to_i
+        @system_id = elem['solarSystemID'].to_i
+        @jumps     = elem['shipJumps'].to_i
       end
     end
     
@@ -448,13 +448,13 @@ module Reve #:nodoc:
       attr_reader :id, :character_id, :station_id, :volume_entered, :volume_remaining, :minimum_volume,
                   :order_state, :type_id, :range, :account_key, :duration, :escrow, :price, :bid, :created_at
       def initialize(elem) #:nodoc:
-        @id = elem['orderid'].to_i
-        @character_id = elem['characterid'].to_i
-        @station_id = elem['station_id'].to_i
-        @volume_entered = elem['volentered'].to_i
-        @volume_remaining = elem['volremaining'].to_i
-        @minimum_volume = elem['minvolume'].to_i
-        @order_state = case elem['orderstate'].to_i
+        @id = elem['orderID'].to_i
+        @character_id = elem['characterID'].to_i
+        @station_id = elem['stationID'].to_i
+        @volume_entered = elem['volEntered'].to_i
+        @volume_remaining = elem['volRemaining'].to_i
+        @minimum_volume = elem['minVolume'].to_i
+        @order_state = case elem['orderState'].to_i
                        when 0
                          'Active'
                        when 1
@@ -468,9 +468,9 @@ module Reve #:nodoc:
                        when 5
                          'Character Deleted'
                        end
-        @type_id = elem['typeid'].to_i
+        @type_id = elem['typeID'].to_i
         @range = elem['range'].to_i
-        @account_key = elem['accountkey'].to_i
+        @account_key = elem['accountKey'].to_i
         @escrow = elem['escrow'].to_f
         @price = elem['price'].to_f
         @bid = elem['bid'] == '1'
@@ -496,25 +496,25 @@ module Reve #:nodoc:
                   :installed_item_flag, :output_flag, :activity_id, :completed_status, :installed_at, 
                   :begin_production_at, :end_production_at, :pause_production_time
       def initialize(elem) #:nodoc:
-        @id = elem['jobid'].to_i; @assembly_line_id = elem['assemblylineid'].to_i ; @container_id = elem['containerid'].to_i
-        @installed_item_id = elem['installeditemid'].to_i ; @installed_item_location_id = elem['installeditemlocationid'].to_i
-        @installed_item_quantity = elem['installeditemquantity'].to_i
-        @installed_item_productivity_level = elem['installeditemproductivitylevel'].to_i
-        @installed_item_material_level = elem['installeditemmateriallevel'].to_i
-        @installed_item_licensed_production_runs_remaining = elem['installeditemlicensedproductionrunsremaining'].to_i
-        @output_location_id = elem['outputlocationid'].to_i ; @installer_id = elem['installerid'].to_i; @runs = elem['runs'].to_i
-        @licensed_production_runs = elem['licensedproductionruns'].to_i ; @installed_system_id = elem['installedsolarsystemid'].to_i
-        @container_location_id = elem['containerlocationid'].to_i ; @material_multiplier = elem['materialmultiplier'].to_f
-        @char_material_multiplier = elem['charmaterialmultiplier'].to_f; @time_multiplier = elem['timemultiplier'].to_f
-        @char_time_multiplier = elem['chartimemultiplier'].to_f ; @installed_item_type_id = elem['installeditemtypeid'].to_i
-        @output_type_id = elem['outputtypeid'].to_i ; @container_type_id = elem['containertypeid'].to_i
-        @installed_item_copy = (elem['installeditemcopy'] == "1") ; @completed = (elem['completed'] == "1")
-        @completed_successfully = (elem['completedsuccessfully'] == "1")
-        @installed_item_flag = elem['installeditemflag'].to_i ; @output_flag = elem['outputflag'].to_i
-        @activity_id = elem['activityid'].to_i ; @completed_status = elem['completedstatus'].to_i
-        @installed_at = elem['installtime'].to_time ; @begin_production_at = elem['beginproductiontime'].to_time
-        @end_production_at = elem['endproductiontime'].to_time
-        @pause_production_time = elem['pauseproductiontime'].to_time
+        @id = elem['jobID'].to_i; @assembly_line_id = elem['assemblyLineID'].to_i ; @container_id = elem['containerID'].to_i
+        @installed_item_id = elem['installedItemID'].to_i ; @installed_item_location_id = elem['installedItemLocationID'].to_i
+        @installed_item_quantity = elem['installedItemQuantity'].to_i
+        @installed_item_productivity_level = elem['installedItemProductivityLevel'].to_i
+        @installed_item_material_level = elem['installedItemMaterialLevel'].to_i
+        @installed_item_licensed_production_runs_remaining = elem['installedItemLicensedProductionRunsRemaining'].to_i
+        @output_location_id = elem['outputLocationID'].to_i ; @installer_id = elem['installerID'].to_i; @runs = elem['runs'].to_i
+        @licensed_production_runs = elem['licensedProductionRuns'].to_i ; @installed_system_id = elem['installedSolarSystemID'].to_i
+        @container_location_id = elem['containerLocationID'].to_i ; @material_multiplier = elem['materialMultiplier'].to_f
+        @char_material_multiplier = elem['charMaterialMultiplier'].to_f; @time_multiplier = elem['timeMultiplier'].to_f
+        @char_time_multiplier = elem['charTimeMultiplier'].to_f ; @installed_item_type_id = elem['installedItemTypeID'].to_i
+        @output_type_id = elem['outputTypeID'].to_i ; @container_type_id = elem['containerTypeID'].to_i
+        @installed_item_copy = (elem['installedItemCopy'] == "1") ; @completed = (elem['completed'] == "1")
+        @completed_successfully = (elem['completedSuccessfully'] == "1")
+        @installed_item_flag = elem['installedItemFlag'].to_i ; @output_flag = elem['outputFlag'].to_i
+        @activity_id = elem['activityID'].to_i ; @completed_status = elem['completedStatus'].to_i
+        @installed_at = elem['installTime'].to_time ; @begin_production_at = elem['beginProductionTime'].to_time
+        @end_production_at = elem['endProductionTime'].to_time
+        @pause_production_time = elem['pauseProductionTime'].to_time
       end
     end
     class PersonalIndustryJob < IndustryJob; end
@@ -530,10 +530,10 @@ module Reve #:nodoc:
     class MapKill
       attr_reader :system_id, :ship_kills, :faction_kills, :pod_kills
       def initialize(elem) #:nodoc:        
-        @system_id     = elem['solarsystemid'].to_i
-        @ship_kills    = elem['shipkills'].to_i
-        @faction_kills = elem['factionkills'].to_i
-        @pod_kills     = elem['podkills'].to_i
+        @system_id     = elem['solarSystemID'].to_i
+        @ship_kills    = elem['shipJills'].to_i
+        @faction_kills = elem['factionKills'].to_i
+        @pod_kills     = elem['podKills'].to_i
       end            
     end
 
@@ -557,20 +557,20 @@ module Reve #:nodoc:
       attr_reader :character_id, :character_name, :start_time, :base_id, :base, :title, :logon_time, :logoff_time, 
                   :location_id, :location, :ship_type_id, :ship_type, :roles, :grantable_roles
       def initialize(elem) #:nodoc:
-        @character_id    = elem['characterid'].to_i
+        @character_id    = elem['characterID'].to_i
         @character_name  = elem['name']
-        @start_time      = elem['startdatetime'].to_time
-        @base_id         = elem['baseid'].to_i
+        @start_time      = elem['startDateTime'].to_time
+        @base_id         = elem['baseID'].to_i
         @base            = elem['base']
         @title           = elem['title']
-        @logon_time      = elem['logondatetime'].to_time rescue nil # can be nil for non CEOs
-        @logoff_time     = elem['logoffdatetime'].to_time rescue nil # Can be nil for non CEOs
-        @location_id     = elem['locationid']
+        @logon_time      = elem['logonDateTime'].to_time rescue nil # can be nil for non CEOs
+        @logoff_time     = elem['logoffDateTime'].to_time rescue nil # Can be nil for non CEOs
+        @location_id     = elem['locationID']
         @location        = elem['location']
-        @ship_type_id    = elem['shiptypeid'].to_i
-        @ship_type       = elem['shiptype']
+        @ship_type_id    = elem['shipTypeID'].to_i
+        @ship_type       = elem['shipType']
         @roles           = elem['roles']
-        @grantable_roles = elem['grantableroles']
+        @grantable_roles = elem['grantableRoles']
       end
     end
 
@@ -582,8 +582,8 @@ module Reve #:nodoc:
     class RefType
       attr_reader :id, :name
       def initialize(elem) #:nodoc:
-        @id   = elem['reftypeid'].to_i
-        @name = elem['reftypename']
+        @id   = elem['refTypeID'].to_i
+        @name = elem['refTypeName']
       end
     end
 
@@ -596,8 +596,8 @@ module Reve #:nodoc:
     class Skill
       attr_accessor :id, :unpublished, :skillpoints, :level
       def initialize(elem) #:nodoc:
-        @id          = elem['typeid'].to_i
-        @skillpoints = elem['skillpoints'].to_i
+        @id          = elem['typeID'].to_i
+        @skillpoints = elem['skillPoints'].to_i
         @level       = elem['level'].to_i
       end
     end
@@ -610,8 +610,8 @@ module Reve #:nodoc:
     class SkillBonus
       attr_reader :type, :value
       def initialize(elem) #:nodoc:
-        @type = elem['bonustype']
-        @value = elem['bonusvalue']
+        @type = elem['bonusType']
+        @value = elem['bonusValue']
       end
     end
     
@@ -624,8 +624,8 @@ module Reve #:nodoc:
       attr_reader :type_id, :level
       alias_method :id, :type_id
       def initialize(elem)
-        @type_id = elem['typeid'].to_i
-        @level = elem['skilllevel'].to_i
+        @type_id = elem['typeID'].to_i
+        @level = elem['skillLevel'].to_i
       end
     end
 
@@ -672,14 +672,14 @@ module Reve #:nodoc:
     class SkillInTraining
       attr_reader :tranquility_time, :end_time, :start_time, :type_id, :start_sp, :end_sp, :to_level, :skill_in_training
       def initialize(elem) #:nodoc:
-        @tranquility_time = elem['currenttqtime'].to_time
-        @end_time         = elem['trainingendtime'].to_time
-        @start_time       = elem['trainingstarttime'].to_time
-        @type_id          = elem['trainingtypeid'].to_i
-        @start_sp         = elem['trainingstartsp'].to_i
-        @end_sp           = elem['trainingdestinationsp'].to_i
-        @to_level         = elem['trainingtolevel'].to_i
-        @skill_in_training= elem['skillintraining'] == '1'
+        @tranquility_time = elem['currentTQTime'].to_time
+        @end_time         = elem['trainingEndTime'].to_time
+        @start_time       = elem['trainingStartTime'].to_time
+        @type_id          = elem['trainingTypeID'].to_i
+        @start_sp         = elem['trainingStartSP'].to_i
+        @end_sp           = elem['trainingDestinationSP'].to_i
+        @to_level         = elem['trainingToLevel'].to_i
+        @skill_in_training= elem['skillInTraining'] == '1'
       end
     end
 
@@ -692,15 +692,16 @@ module Reve #:nodoc:
     # * faction_id ( Fixnum ) - ID of the Faction that controls the System
     # * system_name ( String ) - Name of the System
     # See Also: Alliance, Reve::API#alliances
+    # TODO: Find out what constellationSovereignty is
     class Sovereignty
       attr_reader :system_id, :alliance_id, :constellation_sovereignty, :level, :faction_id, :system_name
       def initialize(elem) #:nodoc:
-        @system_id                 = elem['solarsystemid'].to_i
-        @alliance_id               = elem['allianceid'] == '0' ? nil : elem['allianceid'].to_i
-        @constellation_sovereignty = elem['constellationsovereignty']
-        @level                     = elem['sovereigntylevel'].to_i if elem['sovereigntylevel']
-        @faction_id                = elem['factionid'] == '0' ? nil : elem['factionid'].to_i
-        @system_name               = elem['solarsystemname']
+        @system_id                 = elem['solarSystemID'].to_i
+        @alliance_id               = elem['allianceID'] == '0' ? nil : elem['allianceID'].to_i
+        @constellation_sovereignty = elem['constellationSovereignty']
+        @level                     = elem['sovereigntyLevel'].to_i if elem['sovereigntyLevel']
+        @faction_id                = elem['factionID'] == '0' ? nil : elem['factionID'].to_i
+        @system_name               = elem['solarSystemName']
       end
     end
     
@@ -718,11 +719,11 @@ module Reve #:nodoc:
       alias_method :location_id,:system_id
       alias_method :location_name, :system_name
       def initialize(elem) #:nodoc:
-        @type_id = elem['typeid'].to_i
-        @type_name = elem['typename']
-        @id = elem['itemid'].to_i
-        @system_id = elem['locationid'].to_i
-        @system_name = elem['locationname']
+        @type_id = elem['typeID'].to_i
+        @type_name = elem['typeName']
+        @id = elem['itemID'].to_i
+        @system_id = elem['locationID'].to_i
+        @system_name = elem['locationName']
       end
     end
     
@@ -737,7 +738,7 @@ module Reve #:nodoc:
       attr_reader :type_id, :quantity
       attr_accessor :starbase_id
       def initialize(elem) #:nodoc:
-        @type_id = elem['typeid'].to_i
+        @type_id = elem['typeID'].to_i
         @quantity = elem['quantity'].to_i
       end
     end
@@ -752,8 +753,8 @@ module Reve #:nodoc:
     class WalletBalance
       attr_reader :account_id, :account_key, :balance
       def initialize(elem)
-        @account_id  = elem['accountid'].to_i
-        @account_key = elem['accountkey']
+        @account_id  = elem['accountID'].to_i
+        @account_key = elem['accountKey']
         @balance     = elem['balance'].to_f
       end
     end
@@ -778,14 +779,14 @@ module Reve #:nodoc:
       alias_method :id, :ref_id
       def initialize(elem) #:nodoc:
         @date        = elem['date'].to_time
-        @ref_id      = elem['refid'].to_i
-        @reftype_id  = elem['reftypeid'].to_i
-        @owner_name1 = elem['ownername1']
-        @owner_name2 = elem['ownername2']
-        @owner_id1   = elem['ownerid1'].to_i if elem['ownerid1']
-        @owner_id2   = elem['ownerid2'].to_i if elem['ownerid2']
-        @arg_name1   = elem['argname1']
-        @arg_id1     = elem['argid1'].to_i if elem['argid1']
+        @ref_id      = elem['refID'].to_i
+        @reftype_id  = elem['refTypeID'].to_i
+        @owner_name1 = elem['ownerName1']
+        @owner_name2 = elem['ownerName2']
+        @owner_id1   = elem['ownerID1'].to_i if elem['ownerID1']
+        @owner_id2   = elem['ownerID2'].to_i if elem['ownerID2']
+        @arg_name1   = elem['argName1']
+        @arg_id1     = elem['argID1'].to_i if elem['argID1']
         @amount      = elem['amount'].to_f
         @balance     = elem['balance'].to_f
         @reason      = elem['reason']
@@ -812,19 +813,19 @@ module Reve #:nodoc:
                   :client_id, :client_name, :character_id, :station_id, :station_name, :type,
                   :transaction_for
       def initialize(elem) #:nodoc:
-        @created_at       = elem['transactiondatetime'].to_time rescue nil
-        @id               = elem['transactionid'].to_i
+        @created_at       = elem['transactionDateTime'].to_time
+        @id               = elem['transactionID'].to_i
         @quantity         = elem['quantity'].to_i
-        @type_name        = elem['typename']
-        @type_id          = elem['typeid'].to_i
+        @type_name        = elem['typeName']
+        @type_id          = elem['typeID'].to_i
         @price            = elem['price'].to_f
-        @client_id        = elem['clientid'].to_i if elem['clientid']
-        @client_name      = elem['clientname']
-        @station_id       = elem['stationid'].to_i
-        @station_name     = elem['stationname']
-        @character_id     = elem['characterid'].to_i if elem['characterid'] && elem['characterid'] != '0'
-        @type             = elem['transactiontype']
-        @transaction_for  = elem['transactionfor'] # This is corporate or personal, mirrors the subclasses.
+        @client_id        = elem['clientID'].to_i if elem['clientID']
+        @client_name      = elem['clientName']
+        @station_id       = elem['stationID'].to_i
+        @station_name     = elem['stationName']
+        @character_id     = elem['characterID'].to_i if elem['characterID'] && elem['characterID'] != '0'
+        @type             = elem['transactionType']
+        @transaction_for  = elem['transactionFor'] # This is corporate or personal, mirrors the subclasses.
       end
     end
     # For Corporate WalletTransaction (WalletTransaction#transaction_for == 'corporation')

data/lib/reve.rb

@@ -146,7 +146,7 @@ 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.to_s.gsub('row:name','row')) # Namespaces are evil!!
+      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)
@@ -276,29 +276,29 @@ module Reve
       doc = process_query(nil,opts[:url] || @@skill_tree_url,true)
       skills = []
       (doc/'rowset[@name=skills]/row').each do |skill|
-        name = skill['typename']
-        type_id = skill['typeid']
-        group_id = skill['groupid']
+        name = skill['typeName']
+        type_id = skill['typeID']
+        group_id = skill['groupID']
         rank = (skill/:rank).inner_html
         desc = (skill/:description).inner_html
         required_skills = []
         reqs = (skill/'rowset@name=[requiredskills]/row')
         reqs.each do |required|
           next if required.kind_of? Hpricot::Text # why is this needed? Why is this returned? How can I only get stuff with typeid and skilllevel?
-          required_skills << Reve::Classes::SkillRequirement.new(required) if required['typeid'] && required['skilllevel']
+          required_skills << Reve::Classes::SkillRequirement.new(required) if required['typeID'] && required['skillLevel']
         end
         required_attribs = []
-        (skill/'requiredattributes').each do |req|
-          pri = doc.at(req.xpath + "/primaryattribute")
-          sec = doc.at(req.xpath + "/secondaryattribute")
+        (skill/'requiredAttributes').each do |req|
+          pri = doc.at(req.xpath + "/primaryAttribute")
+          sec = doc.at(req.xpath + "/secondaryAttribute")
           required_attribs << Reve::Classes::PrimaryAttribute.new(pri.inner_html)
           required_attribs << Reve::Classes::SecondaryAttribute.new(sec.inner_html)
         end
         bonuses = []
-        res = (skill/'rowset@name=[skillbonuscollection]/row')
+        res = (skill/'rowset@name=[skillBonusCollection]/row')
         res.each do |bonus|
           next if bonus.kind_of? Hpricot::Text
-          bonuses << Reve::Classes::SkillBonus.new(bonus) if bonus['bonustype'] && bonus['bonusvalue']
+          bonuses << Reve::Classes::SkillBonus.new(bonus) if bonus['bonusType'] && bonus['bonusValue']
         end
         skills << Reve::Classes::SkillTree.new(name,type_id,group_id,desc,rank,required_attribs,required_skills,bonuses)
       end
@@ -352,7 +352,7 @@ module Reve
       args = postfields(opts)
       h = compute_hash(args.merge(:url => @@personal_wallet_trans_url) )
       return h if h
-      process_query(Reve::Classes::PersonalWalletTransaction,opts[:url] || @@personal_wallet_trans_url,false,opts)
+      process_query(Reve::Classes::PersonalWalletTransaction,opts[:url] || @@personal_wallet_trans_url,false,args)
     end
 
     # Gets one's corporate WalletTransaction list from
@@ -456,7 +456,6 @@ module Reve
       xml = process_query(nil,opts[:url] || @@training_skill_url,true,args)
       xml.search("//result").each do |elem|
         for field in [ 'currentTQTime', 'trainingEndTime','trainingStartTime','trainingTypeID','trainingStartSP','trainingDestinationSP','trainingToLevel','skillInTraining' ]
-          field.downcase!
           h[field] = (elem/field.intern).inner_html
         end
       end
@@ -576,7 +575,7 @@ module Reve
         :ceoname => :ceo_name, :stationid => :station_id, :stationname => :station_name,
         :description => :description, :url => :url, :allianceid => :alliance_id,
         :alliancename => :alliance_name, :taxrate => :tax_rate, :membercount => :member_count,
-        :memberlimit => :member_limit }.each do |k,v|
+        :memberlimit => :member_limit, :shares => :shares }.each do |k,v|
         res[v] = xml.search("//result/#{k.to_s}/").first.to_s.strip
       end
 
@@ -596,7 +595,7 @@ module Reve
       xml = process_query(nil,opts[:url] || @@character_sheet_url,true,args)
       cs = Reve::Classes::CharacterSheet.new
 
-      (xml/:result/:attributeenhancers).each do |enh|
+      xml.search("//result/attributeEnhancers").each do |enh|
         for kind in ['intelligenceBonus', 'memoryBonus', 'charismaBonus', 'perceptionBonus','willpowerBonus']
           thing = nil
           case kind
@@ -611,7 +610,7 @@ module Reve
           when 'willpowerBonus'
             thing = Reve::Classes::WillpowerEnhancer
           end
-          (enh/kind.downcase.intern).each do |b|
+          (enh/kind).each do |b|
             name = (b/:augmentatorname).inner_html
             value = (b/:augmentatorvalue).inner_html
             cs.enhancers << thing.new(name,value)
@@ -620,8 +619,8 @@ module Reve
       end
 
       (xml/:result).each do |elem|
-        for field in [ 'characterid', 'name', 'race', 'bloodline', 'gender','corporationname','corporationid','balance' ]
-          cs.send("#{field}=",(elem/field.intern).first.inner_html)
+        for field in [ 'characterID', 'name', 'race', 'bloodLine', 'gender','corporationName','corporationID','balance' ]
+          cs.send("#{field.downcase}=",(elem/field.intern).first.inner_html)
         end
       end
       (xml/:result/:attributes).each do |elem|
@@ -762,7 +761,7 @@ module Reve
     # Raises the proper exception (if there is one), otherwise it returns the
     # XML response.
     def check_exception(xml)
-      x = Hpricot(xml)
+      x = Hpricot::XML(xml)
       begin
         out = x.search("//error") # If this fails then there are some big problems with Hpricot#search ?
       rescue Exception => e 
@@ -780,7 +779,7 @@ module Reve
     def save_xml(xml)
       path = build_save_filename
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path,'w') { |f| f.print xml.to_s }
+      File.open(path,'w') { |f| f.print xml.to_original_html }
     end
     def build_save_filename
       method = caller(3).first.match(/\`(.+)'/)[1] # Get the API method that's being called. This is called from save_xml -> process_query -> :real_method