steam-condenser 1.1.0 → 1.2.0

data/lib/steam/community/game_leaderboard_entry.rb

@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2012, Sebastian Staudt
 
 # The GameLeaderboard class represents a single entry in a leaderboard
 #
@@ -30,13 +30,13 @@ class GameLeaderboardEntry
 
   # Creates new entry instance for the given XML data and leaderboard
   #
-  # @param [REXML::Element] entry_data The XML data of the leaderboard of the
-  #        leaderboard entry
+  # @param [Hash<String, Object>] entry_data The XML data of the leaderboard of
+  #        the leaderboard entry
   # @param [GameLeaderboard] leaderboard The leaderboard this entry belongs to
   def initialize(entry_data, leaderboard)
-    @steam_id    = SteamId.new entry_data.elements['steamid'].text.to_i, false
-    @score       = entry_data.elements['score'].text.to_i
-    @rank        = entry_data.elements['rank'].text.to_i
+    @steam_id    = SteamId.new entry_data['steamid'].to_i, false
+    @score       = entry_data['score'].to_i
+    @rank        = entry_data['rank'].to_i
     @leaderboard = leaderboard
   end
 

data/lib/steam/community/game_stats.rb

@@ -1,13 +1,11 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2008-2011, Sebastian Staudt
-
-require 'open-uri'
-require 'rexml/document'
+# Copyright (c) 2008-2012, Sebastian Staudt
 
 require 'steam/community/game_achievement'
 require 'steam/community/game_leaderboard'
+require 'steam/community/xml_data'
 
 # This class represents the game statistics for a single user and a specific
 # game
@@ -18,25 +16,12 @@ require 'steam/community/game_leaderboard'
 # @author Sebastian Staudt
 class GameStats
 
-  # Returns the Steam application ID of the game these stats belong to
-  #
-  # @return [Fixnum] The Steam application ID of the game
-  attr_reader :app_id
-
-  # Returns the custom URL of the player these stats belong to
-  #
-  # @return [String] The custom URL of the player
-  attr_reader :custom_url
-
-  # Returns the friendly name of the game these stats belong to
-  #
-  # @return [String ]The frienldy name of the game
-  attr_reader :game_friendly_name
+  include XMLData
 
-  # Returns the full name of the game these stats belong to
+  # Returns the game these stats belong to
   #
-  # @return [String] The name of the game
-  attr_reader :game_name
+  # @return [SteamGame] The game object
+  attr_reader :game
 
   # Returns the number of hours this game has been played by the player
   #
@@ -48,10 +33,26 @@ class GameStats
   # @return [String] The privacy setting of the Steam ID
   attr_reader :privacy_state
 
-  # Returns the 64bit numeric SteamID of the player these stats belong to
+  # Returns the Steam ID of the player these stats belong to
   #
-  # @return [Fixnum] The 64bit numeric SteamID of the player
-  attr_reader :steam_id64
+  # @return [SteamId] The Steam ID instance of the player
+  attr_reader :user
+
+  # Returns the base Steam Communtiy URL for the given player and game IDs
+  #
+  # @param [Fixnum, String] user_id The 64bit SteamID or custom URL of the user
+  # @param [Fixnum, String] game_id The application ID or short name of the
+  #        game
+  # @return The base URL used for the given stats IDs
+  def self.base_url(user_id, game_id)
+    game_url = game_id.is_a?(Fixnum) ? "appid/#{game_id}" : game_id
+
+    if user_id.is_a? Fixnum
+      "http://steamcommunity.com/profiles/#{user_id}/stats/#{game_url}"
+    else
+      "http://steamcommunity.com/id/#{user_id}/stats/#{game_url}"
+    end
+  end
 
   # Creates a `GameStats` (or one of its subclasses) instance for the given
   # user and game
@@ -94,31 +95,23 @@ class GameStats
   # Creates a `GameStats` object and fetches data from the Steam Community for
   # the given user and game
   #
-  # @param [String, Fixnum] id The custom URL or the 64bit Steam ID of the
+  # @param [String, Fixnum] user_id The custom URL or the 64bit Steam ID of the
   #        user
-  # @param [String] game_name The friendly name of the game
+  # @param [String] game_id The application ID or friendly name of the game
   # @raise [SteamCondenserError] if the stats cannot be fetched
-  def initialize(id, game_name)
-    if id.is_a? Numeric
-      @steam_id64 = id
-    else
-      @custom_url = id.downcase
-    end
-    @game_friendly_name = game_name
+  def initialize(user_id, game_id)
+    @xml_data = parse "#{self.class.base_url(user_id, game_id)}?xml=all"
 
-    url = base_url + '?xml=all'
-    @xml_data = REXML::Document.new(open(url, {:proxy => true}).read).root
+    @user = SteamId.new user_id, false
 
-    error = @xml_data.elements['error']
-    raise SteamCondenserError, error.text unless error.nil?
+    error = @xml_data['error']
+    raise SteamCondenserError, error unless error.nil?
 
-    @privacy_state = @xml_data.elements['privacyState'].text
+    @privacy_state = @xml_data['privacyState']
     if public?
-      @app_id       = @xml_data.elements['game/gameLink'].text.match(/http:\/\/store.steampowered.com\/app\/([1-9][0-9]+)/)[1].to_i
-      @custom_url   = @xml_data.elements['player/customURL'].text if @custom_url.nil?
-      @game_name    = @xml_data.elements['game/gameName'].text
-      @hours_played = @xml_data.elements['stats/hoursPlayed'].text unless @xml_data.elements['stats/hoursPlayed'].nil?
-      @steam_id64   = @xml_data.elements['player/steamID64'].text.to_i if @steam_id64.nil?
+      app_id        = @xml_data['game']['gameLink'].match(/http:\/\/store.steampowered.com\/app\/([1-9][0-9]+)/)[1].to_i
+      @game         = SteamGame.new app_id, @xml_data['game']
+      @hours_played = @xml_data['stats']['hoursPlayed'] unless @xml_data['stats']['hoursPlayed'].nil?
     end
   end
 
@@ -132,8 +125,8 @@ class GameStats
 
     if @achievements.nil?
       @achievements = Array.new
-      @xml_data.elements.each('achievements/achievement') do |achievement_data|
-        @achievements << GameAchievement.new(@steam_id64, @app_id, achievement_data)
+      @xml_data['achievements']['achievement'].each do |achievement|
+        @achievements << GameAchievement.new(@user, @game, achievement)
       end
 
       @achievements_done = @achievements.reject{ |a| !a.unlocked? }.size
@@ -169,26 +162,7 @@ class GameStats
   #
   # @return [String] The base URL used for queries on these stats
   def base_url
-    if @custom_url.nil?
-      "http://steamcommunity.com/profiles/#{@steam_id64}/stats/#{@game_friendly_name}"
-    else
-      "http://steamcommunity.com/id/#{@custom_url}/stats/#{@game_friendly_name}"
-    end
-  end
-
-  # Returns the leaderboard for this game and the given leaderboard ID or name
-  #
-  # @param [Fixnum, String] id The ID or name of the leaderboard to return
-  # @return [GameLeaderboard] The matching leaderboard if available
-  def leaderboard(id)
-    GameLeaderboard.leaderboard @game_friendly_name, id
-  end
-
-  # Returns an array containing all of this game's leaderboards
-  #
-  # @return [Array<GameLeaderboard>] The leaderboards for this game
-  def leaderboards
-    GameLeaderboard.leaderboards @game_friendly_name
+    self.class.base_url @user.id, @game.id
   end
 
   # Returns whether this Steam ID is publicly accessible

data/lib/steam/community/game_weapon.rb

@@ -26,9 +26,9 @@ module GameWeapon
 
   # Creates a new game weapon instance with the data provided
   #
-  # @param [REXML::Element] weapon_data The data representing this weapon
+  # @param [Hash<String, Object>] weapon_data The data representing this weapon
   def initialize(weapon_data)
-    @kills = weapon_data.elements['kills'].text.to_i
+    @kills = weapon_data['kills'].to_i
   end
 
   # Returns the average number of shots needed for a kill with this weapon

data/lib/steam/community/l4d/abstract_l4d_stats.rb

@@ -15,6 +15,11 @@ module AbstractL4DStats
   # The names of the special infected in Left4Dead
   SPECIAL_INFECTED = %w(boomer hunter smoker tank)
 
+  # Returns a hash of statistics for this user's most recently played game
+  #
+  # @return [Hash<String, Object>] The most recent statistics for this user
+  attr_reader :most_recent_game
+
   # Creates a new instance of statistics for both, Left4Dead and Left4Dead 2
   # parsing basic common data
   #
@@ -25,11 +30,11 @@ module AbstractL4DStats
 
     if public?
       @most_recent_game = {}
-      if @xml_data.elements['stats/mostrecentgame'].has_elements?
-        @most_recent_game[:difficulty]  = @xml_data.elements['stats/mostrecentgame/difficulty'].text
-        @most_recent_game[:escaped]     = (@xml_data.elements['stats/mostrecentgame/bEscaped'].text == 1)
-        @most_recent_game[:movie]       = @xml_data.elements['stats/mostrecentgame/movie'].text
-        @most_recent_game[:time_played] = @xml_data.elements['stats/mostrecentgame/time'].text
+      unless @xml_data['stats']['mostrecentgame'].nil?
+        @most_recent_game[:difficulty]  = @xml_data['stats']['mostrecentgame']['difficulty']
+        @most_recent_game[:escaped]     = (@xml_data['stats']['mostrecentgame']['bEscaped'] == 1)
+        @most_recent_game[:movie]       = @xml_data['stats']['mostrecentgame']['movie']
+        @most_recent_game[:time_played] = @xml_data['stats']['mostrecentgame']['time']
       end
     end
   end
@@ -44,14 +49,14 @@ module AbstractL4DStats
 
     if @favorites.nil?
       @favorites = {}
-      @favorites[:campaign]                 = @xml_data.elements['stats/favorites/campaign'].text
-      @favorites[:campaign_percentage]      = @xml_data.elements['stats/favorites/campaignpct'].text.to_i
-      @favorites[:character]                = @xml_data.elements['stats/favorites/character'].text
-      @favorites[:character_percentage]     = @xml_data.elements['stats/favorites/characterpct'].text.to_i
-      @favorites[:level1_weapon]            = @xml_data.elements['stats/favorites/weapon1'].text
-      @favorites[:level1_weapon_percentage] = @xml_data.elements['stats/favorites/weapon1pct'].text.to_i
-      @favorites[:level2_weapon]            = @xml_data.elements['stats/favorites/weapon2'].text
-      @favorites[:level2_weapon_percentage] = @xml_data.elements['stats/favorites/weapon2pct'].text.to_i
+      @favorites[:campaign]                 = @xml_data['stats']['favorites']['campaign']
+      @favorites[:campaign_percentage]      = @xml_data['stats']['favorites']['campaignpct'].to_i
+      @favorites[:character]                = @xml_data['stats']['favorites']['character']
+      @favorites[:character_percentage]     = @xml_data['stats']['favorites']['characterpct'].to_i
+      @favorites[:level1_weapon]            = @xml_data['stats']['favorites']['weapon1']
+      @favorites[:level1_weapon_percentage] = @xml_data['stats']['favorites']['weapon1pct'].to_i
+      @favorites[:level2_weapon]            = @xml_data['stats']['favorites']['weapon2']
+      @favorites[:level2_weapon_percentage] = @xml_data['stats']['favorites']['weapon2pct'].to_i
     end
 
     @favorites
@@ -68,15 +73,15 @@ module AbstractL4DStats
 
     if @lifetime_stats.nil?
       @lifetime_stats = {}
-      @lifetime_stats[:finales_survived] = @xml_data.elements['stats/lifetime/finales'].text.to_i
-      @lifetime_stats[:games_played]     = @xml_data.elements['stats/lifetime/gamesplayed'].text.to_i
-      @lifetime_stats[:infected_killed]  = @xml_data.elements['stats/lifetime/infectedkilled'].text.to_i
-      @lifetime_stats[:kills_per_hour]   = @xml_data.elements['stats/lifetime/killsperhour'].text.to_f
-      @lifetime_stats[:avg_kits_shared]  = @xml_data.elements['stats/lifetime/kitsshared'].text.to_f
-      @lifetime_stats[:avg_kits_used]    = @xml_data.elements['stats/lifetime/kitsused'].text.to_f
-      @lifetime_stats[:avg_pills_shared] = @xml_data.elements['stats/lifetime/pillsshared'].text.to_f
-      @lifetime_stats[:avg_pills_used]   = @xml_data.elements['stats/lifetime/pillsused'].text.to_f
-      @lifetime_stats[:time_played]      = @xml_data.elements['stats/lifetime/timeplayed'].text
+      @lifetime_stats[:finales_survived] = @xml_data['stats']['lifetime']['finales'].to_i
+      @lifetime_stats[:games_played]     = @xml_data['stats']['lifetime']['gamesplayed'].to_i
+      @lifetime_stats[:infected_killed]  = @xml_data['stats']['lifetime']['infectedkilled'].to_i
+      @lifetime_stats[:kills_per_hour]   = @xml_data['stats']['lifetime']['killsperhour'].to_f
+      @lifetime_stats[:avg_kits_shared]  = @xml_data['stats']['lifetime']['kitsshared'].to_f
+      @lifetime_stats[:avg_kits_used]    = @xml_data['stats']['lifetime']['kitsused'].to_f
+      @lifetime_stats[:avg_pills_shared] = @xml_data['stats']['lifetime']['pillsshared'].to_f
+      @lifetime_stats[:avg_pills_used]   = @xml_data['stats']['lifetime']['pillsused'].to_f
+      @lifetime_stats[:time_played]      = @xml_data['stats']['lifetime']['timeplayed']
 
       @lifetime_stats[:finales_survived_percentage] = @lifetime_stats[:finales_survived].to_f / @lifetime_stats[:games_played]
     end
@@ -95,11 +100,11 @@ module AbstractL4DStats
 
     if @survival_stats.nil?
       @survival_stats = {}
-      @survival_stats[:gold_medals]   = @xml_data.elements['stats/survival/goldmedals'].text.to_i
-      @survival_stats[:silver_medals] = @xml_data.elements['stats/survival/silvermedals'].text.to_i
-      @survival_stats[:bronze_medals] = @xml_data.elements['stats/survival/bronzemedals'].text.to_i
-      @survival_stats[:rounds_played] = @xml_data.elements['stats/survival/roundsplayed'].text.to_i
-      @survival_stats[:best_time]     = @xml_data.elements['stats/survival/besttime'].text.to_f
+      @survival_stats[:gold_medals]   = @xml_data['stats']['survival']['goldmedals'].to_i
+      @survival_stats[:silver_medals] = @xml_data['stats']['survival']['silvermedals'].to_i
+      @survival_stats[:bronze_medals] = @xml_data['stats']['survival']['bronzemedals'].to_i
+      @survival_stats[:rounds_played] = @xml_data['stats']['survival']['roundsplayed'].to_i
+      @survival_stats[:best_time]     = @xml_data['stats']['survival']['besttime'].to_f
     end
 
     @survival_stats
@@ -116,17 +121,17 @@ module AbstractL4DStats
 
     if @teamplay_stats.nil?
       @teamplay_stats = {}
-      @teamplay_stats[:revived]                       = @xml_data.elements['stats/teamplay/revived'].text.to_i
-      @teamplay_stats[:most_revived_difficulty]       = @xml_data.elements['stats/teamplay/reviveddiff'].text
-      @teamplay_stats[:avg_revived]                   = @xml_data.elements['stats/teamplay/revivedavg'].text.to_f
-      @teamplay_stats[:avg_was_revived]               = @xml_data.elements['stats/teamplay/wasrevivedavg'].text.to_f
-      @teamplay_stats[:protected]                     = @xml_data.elements['stats/teamplay/protected'].text.to_i
-      @teamplay_stats[:most_protected_difficulty]     = @xml_data.elements['stats/teamplay/protecteddiff'].text
-      @teamplay_stats[:avg_protected]                 = @xml_data.elements['stats/teamplay/protectedavg'].text.to_f
-      @teamplay_stats[:avg_was_protected]             = @xml_data.elements['stats/teamplay/wasprotectedavg'].text.to_f
-      @teamplay_stats[:friendly_fire_damage]          = @xml_data.elements['stats/teamplay/ffdamage'].text.to_i
-      @teamplay_stats[:most_friendly_fire_difficulty] = @xml_data.elements['stats/teamplay/ffdamagediff'].text
-      @teamplay_stats[:avg_friendly_fire_damage]      = @xml_data.elements['stats/teamplay/ffdamageavg'].text.to_f
+      @teamplay_stats[:revived]                       = @xml_data['stats']['teamplay']['revived'].to_i
+      @teamplay_stats[:most_revived_difficulty]       = @xml_data['stats']['teamplay']['reviveddiff']
+      @teamplay_stats[:avg_revived]                   = @xml_data['stats']['teamplay']['revivedavg'].to_f
+      @teamplay_stats[:avg_was_revived]               = @xml_data['stats']['teamplay']['wasrevivedavg'].to_f
+      @teamplay_stats[:protected]                     = @xml_data['stats']['teamplay']['protected'].to_i
+      @teamplay_stats[:most_protected_difficulty]     = @xml_data['stats']['teamplay']['protecteddiff']
+      @teamplay_stats[:avg_protected]                 = @xml_data['stats']['teamplay']['protectedavg'].to_f
+      @teamplay_stats[:avg_was_protected]             = @xml_data['stats']['teamplay']['wasprotectedavg'].to_f
+      @teamplay_stats[:friendly_fire_damage]          = @xml_data['stats']['teamplay']['ffdamage'].to_i
+      @teamplay_stats[:most_friendly_fire_difficulty] = @xml_data['stats']['teamplay']['ffdamagediff']
+      @teamplay_stats[:avg_friendly_fire_damage]      = @xml_data['stats']['teamplay']['ffdamageavg'].to_f
     end
 
     @teamplay_stats
@@ -143,22 +148,22 @@ module AbstractL4DStats
 
     if @versus_stats.nil?
       @versus_stats = {}
-      @versus_stats[:games_played]                = @xml_data.elements['stats/versus/gamesplayed'].text.to_i
-      @versus_stats[:games_completed]             = @xml_data.elements['stats/versus/gamescompleted'].text.to_i
-      @versus_stats[:finales_survived]            = @xml_data.elements['stats/versus/finales'].text.to_i
-      @versus_stats[:points]                      = @xml_data.elements['stats/versus/points'].text.to_i
-      @versus_stats[:most_points_infected]        = @xml_data.elements['stats/versus/pointsas'].text
-      @versus_stats[:games_won]                   = @xml_data.elements['stats/versus/gameswon'].text.to_i
-      @versus_stats[:games_lost]                  = @xml_data.elements['stats/versus/gameslost'].text.to_i
-      @versus_stats[:highest_survivor_score]      = @xml_data.elements['stats/versus/survivorscore'].text.to_i
+      @versus_stats[:games_played]                = @xml_data['stats']['versus']['gamesplayed'].to_i
+      @versus_stats[:games_completed]             = @xml_data['stats']['versus']['gamescompleted'].to_i
+      @versus_stats[:finales_survived]            = @xml_data['stats']['versus']['finales'].to_i
+      @versus_stats[:points]                      = @xml_data['stats']['versus']['points'].to_i
+      @versus_stats[:most_points_infected]        = @xml_data['stats']['versus']['pointsas']
+      @versus_stats[:games_won]                   = @xml_data['stats']['versus']['gameswon'].to_i
+      @versus_stats[:games_lost]                  = @xml_data['stats']['versus']['gameslost'].to_i
+      @versus_stats[:highest_survivor_score]      = @xml_data['stats']['versus']['survivorscore'].to_i
 
       @versus_stats[:finales_survived_percentage] = @versus_stats[:finales_survived].to_f / @versus_stats[:games_played]
 
       self.class.const_get(:SPECIAL_INFECTED).each do |infected|
         @versus_stats[infected] = {}
-        @versus_stats[infected][:special_attacks] = @xml_data.elements["stats/versus/#{infected}special"].text.to_i
-        @versus_stats[infected][:most_damage]     = @xml_data.elements["stats/versus/#{infected}dmg"].text.to_i
-        @versus_stats[infected]['avg_lifespan']    = @xml_data.elements["stats/versus/#{infected}lifespan"].text.to_i
+        @versus_stats[infected][:special_attacks] = @xml_data['stats']['versus']["#{infected}special"].to_i
+        @versus_stats[infected][:most_damage]     = @xml_data['stats']['versus']["#{infected}dmg"].to_i
+        @versus_stats[infected]['avg_lifespan']    = @xml_data['stats']['versus']["#{infected}lifespan"].to_i
       end
     end
 

data/lib/steam/community/l4d/abstract_l4d_weapon.rb

@@ -42,14 +42,15 @@ module AbstractL4DWeapon
   # Creates a new instance of weapon from the given XML data and parses common
   # data for both, `L4DWeapon` and `L4D2Weapon`
   #
-  # @param [REXML::Element] weapon_data The XML data for this weapon
-  def initialize(weapon_data)
+  # @param [String] weapon_name The name of this weapon
+  # @param [Hash<String, Object>] weapon_data The XML data for this weapon
+  def initialize(weapon_name, weapon_data)
     super weapon_data
 
-    @accuracy             = weapon_data.elements['accuracy'].text.to_f * 0.01
-    @headshots_percentage = weapon_data.elements['headshots'].text.to_f * 0.01
-    @id                   = weapon_data.name
-    @shots                = weapon_data.elements['shots'].text.to_i
+    @accuracy             = weapon_data['accuracy'].to_f * 0.01
+    @headshots_percentage = weapon_data['headshots'].to_f * 0.01
+    @id                   = weapon_name
+    @shots                = weapon_data['shots'].to_i
   end
 
 end

data/lib/steam/community/l4d/l4d2_map.rb

@@ -43,31 +43,31 @@ class L4D2Map < L4DMap
   # information than those for Left4Dead, e.g. the teammates and items are
   # listed.
   #
-  # @param [REXML::Element] map_data The XML data for this map
+  # @param [Hash<String, Object>] map_data The XML data for this map
   def initialize(map_data)
-    @id        = map_data.elements['img'].text.match(/http:\/\/steamcommunity\.com\/public\/images\/gamestats\/550\/(.*).jpg/)[1]
-    @name      = map_data.elements['name'].text
-    @played    = (map_data.elements['hasPlayed'].text.to_i == 1)
+    @id        = map_data['img'].match(/http:\/\/cdn\.steamcommunity\.com\/public\/images\/gamestats\/550\/(.*).jpg/)[1]
+    @name      = map_data['name']
+    @played    = (map_data['hasPlayed'].to_i == 1)
 
     if @played
-      @best_time = map_data.elements['besttimemilliseconds'].text.to_f / 1000
+      @best_time = map_data['besttimemilliseconds'].to_f / 1000
 
       @teammates = []
-      map_data.elements.each('teammates/steamID64') do |teammate|
-        @teammates << SteamId.new(teammate.text, false)
+      map_data['teammates']['steamID64'].each do |teammate|
+        @teammates << SteamId.new(teammate, false)
       end
 
       @items = {}
       ITEMS.each do |item|
-        @items[item] = map_data.elements["items_#{item}"].text.to_i
+        @items[item] = map_data["items_#{item}"].to_i
       end
 
       @kills = {}
       INFECTED.each do |infected|
-        @kills[infected] = map_data.elements["kills_#{infected}"].text.to_i
+        @kills[infected] = map_data["kills_#{infected}"].to_i
       end
 
-      case map_data.elements['medal'].text
+      case map_data['medal']
         when 'gold'
           @medal = L4D2Map::GOLD
         when 'silver'

data/lib/steam/community/l4d/l4d2_stats.rb

@@ -33,10 +33,10 @@ class L4D2Stats < GameStats
     super steam_id, 'l4d2'
 
     @damage_percentages = {
-      :melee    => @xml_data.elements['stats/weapons/meleepctdmg'].text.to_f,
-      :pistols  => @xml_data.elements['stats/weapons/pistolspctdmg'].text.to_f,
-      :rifles   => @xml_data.elements['stats/weapons/bulletspctdmg'].text.to_f,
-      :shotguns => @xml_data.elements['stats/weapons/shellspctdmg'].text.to_f
+      :melee    => @xml_data['stats']['weapons']['meleepctdmg'].to_f,
+      :pistols  => @xml_data['stats']['weapons']['pistolspctdmg'].to_f,
+      :rifles   => @xml_data['stats']['weapons']['bulletspctdmg'].to_f,
+      :shotguns => @xml_data['stats']['weapons']['shellspctdmg'].to_f
     }
   end
 
@@ -56,9 +56,9 @@ class L4D2Stats < GameStats
 
     if @lifetime_stats.nil?
       super
-      @lifetime_stats[:avg_adrenaline_shared]   = @xml_data.elements['stats/lifetime/adrenalineshared'].text.to_f
-      @lifetime_stats[:avg_adrenaline_used]     = @xml_data.elements['stats/lifetime/adrenalineused'].text.to_f
-      @lifetime_stats[:avg_defibrillators_used] = @xml_data.elements['stats/lifetime/defibrillatorsused'].text.to_f
+      @lifetime_stats[:avg_adrenaline_shared]   = @xml_data['stats']['lifetime']['adrenalineshared'].to_f
+      @lifetime_stats[:avg_adrenaline_used]     = @xml_data['stats']['lifetime']['adrenalineused'].to_f
+      @lifetime_stats[:avg_defibrillators_used] = @xml_data['stats']['lifetime']['defibrillatorsused'].to_f
     end
 
     @lifetime_stats
@@ -76,32 +76,32 @@ class L4D2Stats < GameStats
 
     if @scavenge_stats.nil?
       @scavenge_stats = {}
-      @scavenge_stats[:avg_cans_per_round] = @xml_data.elements['stats/scavenge/avgcansperround'].text.to_f
-      @scavenge_stats[:perfect_rounds]     = @xml_data.elements['stats/scavenge/perfect16canrounds'].text.to_i
-      @scavenge_stats[:rounds_lost]        = @xml_data.elements['stats/scavenge/roundslost'].text.to_i
-      @scavenge_stats[:rounds_played]      = @xml_data.elements['stats/scavenge/roundsplayed'].text.to_i
-      @scavenge_stats[:rounds_won]         = @xml_data.elements['stats/scavenge/roundswon'].text.to_i
-      @scavenge_stats[:total_cans]         = @xml_data.elements['stats/scavenge/totalcans'].text.to_i
+      @scavenge_stats[:avg_cans_per_round] = @xml_data['stats']['scavenge']['avgcansperround'].to_f
+      @scavenge_stats[:perfect_rounds]     = @xml_data['stats']['scavenge']['perfect16canrounds'].to_i
+      @scavenge_stats[:rounds_lost]        = @xml_data['stats']['scavenge']['roundslost'].to_i
+      @scavenge_stats[:rounds_played]      = @xml_data['stats']['scavenge']['roundsplayed'].to_i
+      @scavenge_stats[:rounds_won]         = @xml_data['stats']['scavenge']['roundswon'].to_i
+      @scavenge_stats[:total_cans]         = @xml_data['stats']['scavenge']['totalcans'].to_i
 
       @scavenge_stats[:maps] = {}
-      @xml_data.elements.each('stats/scavenge/mapstats/map') do |map_data|
-        map_id = map_data.elements['name'].text
+      @xml_data['stats']['scavenge']['mapstats']['map'].each do |map_data|
+        map_id = map_data['name']
         @scavenge_stats[:maps][map_id] = {}
-        @scavenge_stats[:maps][map_id]['avg_round_score']     = map_data.elements['avgscoreperround'].text.to_i
-        @scavenge_stats[:maps][map_id]['highest_game_score']  = map_data.elements['highgamescore'].text.to_i
-        @scavenge_stats[:maps][map_id]['highest_round_score'] = map_data.elements['highroundscore'].text.to_i
-        @scavenge_stats[:maps][map_id]['name']                = map_data.elements['fullname'].text
-        @scavenge_stats[:maps][map_id]['rounds_played']       = map_data.elements['roundsplayed'].text.to_i
-        @scavenge_stats[:maps][map_id]['rounds_won']          = map_data.elements['roundswon'].text.to_i
+        @scavenge_stats[:maps][map_id]['avg_round_score']     = map_data['avgscoreperround'].to_i
+        @scavenge_stats[:maps][map_id]['highest_game_score']  = map_data['highgamescore'].to_i
+        @scavenge_stats[:maps][map_id]['highest_round_score'] = map_data['highroundscore'].to_i
+        @scavenge_stats[:maps][map_id]['name']                = map_data['fullname']
+        @scavenge_stats[:maps][map_id]['rounds_played']       = map_data['roundsplayed'].to_i
+        @scavenge_stats[:maps][map_id]['rounds_won']          = map_data['roundswon'].to_i
       end
 
       @scavenge_stats[:infected] = {}
-      @xml_data.elements.each('stats/scavenge/infectedstats/special') do |infected_data|
-        infected_id = infected_data.elements['name'].text
+      @xml_data['stats']['scavenge']['infectedstats']['special'].each do |infected_data|
+        infected_id = infected_data['name']
         @scavenge_stats[:infected][infected_id] = {}
-        @scavenge_stats[:infected][infected_id]['max_damage_per_life']   = infected_data.elements['maxdmg1life'].text.to_i
-        @scavenge_stats[:infected][infected_id]['max_pours_interrupted'] = infected_data.elements['maxpoursinterrupted'].text.to_i
-        @scavenge_stats[:infected][infected_id]['special_attacks']       = infected_data.elements['specialattacks'].text.to_i
+        @scavenge_stats[:infected][infected_id]['max_damage_per_life']   = infected_data['maxdmg1life'].to_i
+        @scavenge_stats[:infected][infected_id]['max_pours_interrupted'] = infected_data['maxpoursinterrupted'].to_i
+        @scavenge_stats[:infected][infected_id]['special_attacks']       = infected_data['specialattacks'].to_i
       end
     end
 
@@ -126,7 +126,7 @@ class L4D2Stats < GameStats
     if @survival_stats.nil?
       super
       @survival_stats[:maps] = {}
-      @xml_data.elements.each('stats/survival/maps/map') do |map_data|
+      @xml_data['stats']['survival']['maps']['map'].each do |map_data|
         map = L4D2Map.new(map_data)
         @survival_stats[:maps][map.id] = map
       end
@@ -146,16 +146,16 @@ class L4D2Stats < GameStats
 
     if @weapon_stats.nil?
       @weapon_stats = {}
-      @xml_data.elements.each('stats/weapons/*') do |weapon_data|
-        next unless weapon_data.has_elements?
+      @xml_data['stats']['weapons'].each do |weapon_data|
+        next if weapon_data.nil?
 
-        unless %w{bilejars molotov pipes}.include? weapon_data.name
-          weapon = L4D2Weapon.new(weapon_data)
+        unless %w{bilejars molotov pipes}.include? weapon_data[0]
+          weapon = L4D2Weapon.new *weapon_data
         else
-          weapon = L4DExplosive.new(weapon_data)
+          weapon = L4DExplosive.new *weapon_data
         end
 
-        @weapon_stats[weapon_data.name] = weapon
+        @weapon_stats[weapon_data[0]] = weapon
       end
     end