steam-condenser 0.10.1 → 0.11.0

data/lib/steam/community/dods/dods_stats.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) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 require 'steam/community/dods/dods_weapon'
 require 'steam/community/game_stats'
@@ -22,7 +22,7 @@ class DoDSStats < GameStats
     if @class_stats.nil?
       @class_stats = {}
       @xml_data.elements.each('stats/classes/class') do |class_data|
-        @class_stats[class_data.attributes["key"]] = DoDSClass.new class_data
+        @class_stats[class_data.attributes['key']] = DoDSClass.new class_data
       end
     end
 
@@ -43,5 +43,5 @@ class DoDSStats < GameStats
 
     @weapon_stats
   end
-  
+
 end

data/lib/steam/community/game_stats.rb

@@ -1,21 +1,12 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "open-uri"
-require "rexml/document"
+require 'open-uri'
+require 'rexml/document'
 
-require "steam/community/game_achievement"
-
-class GameStats
-end
-
-require 'steam/community/defense_grid/defense_grid_stats'
-require "steam/community/dods/dods_stats"
-require "steam/community/l4d/l4d_stats"
-require "steam/community/l4d/l4d2_stats"
-require "steam/community/tf2/tf2_stats"
+require 'steam/community/game_achievement'
 
 # The GameStats class represents the game statistics for a single user and a
 # specific game
@@ -30,15 +21,23 @@ class GameStats
   # depending on the game selected
   def self.create_game_stats(steam_id, game_name)
     case game_name
+      when 'cs:s'
+        require 'steam/community/css/css_stats'
+        CSSStats.new(steam_id)
       when 'defensegrid:awakening'
+        require 'steam/community/defense_grid/defense_grid_stats'
         DefenseGridStats.new(steam_id)
       when 'dod:s'
+        require 'steam/community/dods/dods_stats'
         DoDSStats.new(steam_id)
       when 'l4d'
+        require 'steam/community/l4d/l4d_stats'
         L4DStats.new(steam_id)
       when 'l4d2'
+        require 'steam/community/l4d/l4d2_stats'
         L4D2Stats.new(steam_id)
       when 'tf2'
+        require 'steam/community/tf2/tf2_stats'
         TF2Stats.new(steam_id)
       else
         new(steam_id, game_name)
@@ -61,8 +60,10 @@ class GameStats
     @privacy_state = @xml_data.elements['privacyState'].text
     if public?
       @app_id             = @xml_data.elements['game/gameLink'].text.match(/http:\/\/store.steampowered.com\/app\/([1-9][0-9]+)/)[1]
+      @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
+      @steam_id64         = @xml_data.elements['player/steamID64'].text.to_i if @steam_id64.nil?
     end
   end
 

data/lib/steam/community/game_weapon.rb

@@ -1,13 +1,13 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 require 'abstract_class'
 
 # Super class for classes representing game weapons
 class GameWeapon
-  
+
   include AbstractClass
 
   attr_reader :kills, :id, :shots
@@ -19,9 +19,7 @@ class GameWeapon
   # Returns the average number of shots needed for a kill with this weapon.
   # Calculates the value if needed.
   def avg_shots_per_kill
-    if @avg_shots_per_kill.nil?
-      @avg_shots_per_kill = @shots.to_f / @kills
-    end
+    @avg_shots_per_kill = @shots.to_f / @kills if @avg_shots_per_kill.nil?
 
     @avg_shots_per_kill
   end

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

@@ -58,7 +58,6 @@ class AbstractL4DStats < GameStats
       @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['finales_survived_percentage'] = @lifetime_stats['finales_survived'].to_f / @lifetime_stats['games_played']
       @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
@@ -66,6 +65,8 @@ class AbstractL4DStats < GameStats
       @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_percentage'] = @lifetime_stats['finales_survived'].to_f / @lifetime_stats['games_played']
     end
 
     @lifetime_stats
@@ -122,13 +123,14 @@ class AbstractL4DStats < GameStats
       @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['finales_survived_percentage'] = @versus_stats['finales_survived'].to_f / @versus_stats['games_played']
       @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['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

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

@@ -11,8 +11,8 @@ class L4DExplosive < GameWeapon
   def initialize(weapon_data)
     super weapon_data
 
-    @id                   = weapon_data.name
-    @shots                = weapon_data.elements['thrown'].text.to_i
+    @id    = weapon_data.name
+    @shots = weapon_data.elements['thrown'].text.to_i
   end
 
   # Returns the average number of kills for one shot of this explosive.

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

@@ -16,9 +16,9 @@ class L4DMap
 
   # Creates a new instance of L4DMap based on the assigned XML data
   def initialize(map_data)
-    @best_time = map_data.elements['besttimeseconds'].text.to_f
-    @id = map_data.name
-    @name = map_data.elements['name'].text
+    @best_time    = map_data.elements['besttimeseconds'].text.to_f
+    @id           = map_data.name
+    @name         = map_data.elements['name'].text
     @times_played = map_data.elements['timesplayed'].text.to_i
 
     case map_data.elements['medal'].text

data/lib/steam/community/steam_group.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) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
 require 'open-uri'
 require 'rexml/document'
@@ -51,9 +51,7 @@ class SteamGroup
       url = open("#{base_url}/memberslistxml?p=#{page}", {:proxy => true})
       member_data = REXML::Document.new(url.read).root
 
-      if page == 1
-        @group_id64 = member_data.elements['groupID64'].text.to_i
-      end
+      @group_id64 = member_data.elements['groupID64'].text.to_i if page == 1
       total_pages = member_data.elements['totalPages'].text.to_i
 
       member_data.elements['members'].elements.each do |member|

data/lib/steam/community/steam_id.rb

@@ -54,8 +54,8 @@ class SteamId
 
   # Creates a new SteamId object using the SteamID64 converted from a server
   # SteamID given by +steam_id+
-  def self.get_from_steam_id(steam_id)
-    self.new(self.convert_steam_id_to_community_id(steam_id))
+  def self.from_steam_id(steam_id)
+    new(convert_steam_id_to_community_id(steam_id))
   end
 
   # Creates a new SteamId object for the given SteamID +id+, either numeric or

data/lib/steam/community/tf2/tf2_class.rb

@@ -1,31 +1,31 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
 require 'steam/community/game_class'
 
 # Represents the stats for a Team Fortress 2 class for a specific user
 class TF2Class < GameClass
-  
+
   attr_reader :max_buildings_destroyed, :max_captures, :max_damage,
               :max_defenses, :max_dominations, :max_kill_assists, :max_kills,
               :max_revenges, :max_score, :max_time_alive
-  
+
   # Creates a new instance of TF2Class based on the assigned XML data
   def initialize(class_data)
-    @name                    = class_data.elements["className"].text
-    @max_buildings_destroyed = class_data.elements["ibuildingsdestroyed"].text.to_i
-    @max_captures            = class_data.elements["ipointcaptures"].text.to_i
-    @max_damage              = class_data.elements["idamagedealt"].text.to_i
-    @max_defenses            = class_data.elements["ipointdefenses"].text.to_i
-    @max_dominations         = class_data.elements["idominations"].text.to_i
-    @max_kill_assists        = class_data.elements["ikillassists"].text.to_i
-    @max_kills               = class_data.elements["inumberofkills"].text.to_i
-    @max_revenges            = class_data.elements["irevenge"].text.to_i
-    @max_score               = class_data.elements["ipointsscored"].text.to_i
-    @max_time_alive          = class_data.elements["iplaytime"].text.to_i
-    @play_time               = class_data.elements["playtimeSeconds"].text.to_i
+    @name                    = class_data.elements['className'].text
+    @max_buildings_destroyed = class_data.elements['ibuildingsdestroyed'].text.to_i
+    @max_captures            = class_data.elements['ipointcaptures'].text.to_i
+    @max_damage              = class_data.elements['idamagedealt'].text.to_i
+    @max_defenses            = class_data.elements['ipointdefenses'].text.to_i
+    @max_dominations         = class_data.elements['idominations'].text.to_i
+    @max_kill_assists        = class_data.elements['ikillassists'].text.to_i
+    @max_kills               = class_data.elements['inumberofkills'].text.to_i
+    @max_revenges            = class_data.elements['irevenge'].text.to_i
+    @max_score               = class_data.elements['ipointsscored'].text.to_i
+    @max_time_alive          = class_data.elements['iplaytime'].text.to_i
+    @play_time               = class_data.elements['playtimeSeconds'].text.to_i
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_class_factory.rb

@@ -1,36 +1,36 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "abstract_class"
-require "steam/community/tf2/tf2_class"
-require "steam/community/tf2/tf2_engineer"
-require "steam/community/tf2/tf2_medic"
-require "steam/community/tf2/tf2_sniper"
-require "steam/community/tf2/tf2_spy"
+require 'abstract_class'
+require 'steam/community/tf2/tf2_class'
+require 'steam/community/tf2/tf2_engineer'
+require 'steam/community/tf2/tf2_medic'
+require 'steam/community/tf2/tf2_sniper'
+require 'steam/community/tf2/tf2_spy'
 
 # The TF2ClassFactory is used to created instances of TF2Class based on the XML
 # input data
 class TF2ClassFactory
-  
+
   include AbstractClass
-  
+
   # Creates a new instance of TF2Class storing the statistics for a Team
   # Fortress 2 class with the assigned XML data
-  def self.get_tf2_class(class_data)
-    case class_data.elements("className")[0].text
-      when "Engineer" then
+  def self.tf2_class(class_data)
+    case class_data.elements['className'].text
+      when 'Engineer' then
         return TF2Engineer.new(class_data)
-      when "Medic" then
+      when 'Medic' then
         return TF2Medic.new(class_data)
-      when "Sniper" then
+      when 'Sniper' then
         return TF2Sniper.new(class_data)
-      when "Spy" then
+      when 'Spy' then
         return TF2Spy.new(class_data)
       else
         return TF2Class.new(class_data)
     end
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_engineer.rb

@@ -1,23 +1,23 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "steam/community/tf2/tf2_class"
+require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 engineer class for a specific
 # user
 class TF2Engineer < TF2Class
 
   attr_reader :max_buildings_built, :max_teleports, :max_sentry_kills
-  
+
   # Creates a new instance of TF2Engineer based on the assigned XML data
   def initialize(class_data)
     super class_data
-    
-    @max_buildings_built = class_data.elements["ibuildingsbuilt"].text.to_i
-    @max_teleports       = class_data.elements["inumteleports"].text.to_i
-    @max_sentry_kills    = class_data.elements["isentrykills"].text.to_i
+
+    @max_buildings_built = class_data.elements['ibuildingsbuilt'].text.to_i
+    @max_teleports       = class_data.elements['inumteleports'].text.to_i
+    @max_sentry_kills    = class_data.elements['isentrykills'].text.to_i
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_medic.rb

@@ -1,20 +1,20 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "steam/community/tf2/tf2_class"
+require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 medic class for a specific user
 class TF2Medic < TF2Class
-  
+
   attr_reader :max_health_healed, :max_ubercharges
-  
+
   def initialize(class_data)
     super class_data
-    
-    @max_health_healed = class_data.elements["ihealthpointshealed"].text.to_i
-    @max_ubercharges   = class_data.elements["inuminvulnerable"].text.to_i
+
+    @max_health_healed = class_data.elements['ihealthpointshealed'].text.to_i
+    @max_ubercharges   = class_data.elements['inuminvulnerable'].text.to_i
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_sniper.rb

@@ -1,18 +1,18 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "steam/community/tf2/tf2_class"
+require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 sniper class for a specific user
 class TF2Sniper < TF2Class
-  
+
   # Creates a new instance of TF2Sniper based on the assigned XML data
   def initialize(class_data)
     super class_data
-    
-    @max_headshots = class_data.elements["iheadshots"].text.to_i
+
+    @max_headshots = class_data.elements['iheadshots'].text.to_i
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_spy.rb

@@ -1,21 +1,21 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "steam/community/tf2/tf2_class"
+require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 spy class for a specific user
 class TF2Spy < TF2Class
-  
+
   attr_reader :max_backstabs, :max_health_leeched
-  
+
   # Creates a new instance of TF2Spy based on the assigned XML data
   def initialize(class_data)
     super class_data
-    
-    @max_backstabs      = class_data.elements["ibackstabs"].text.to_i
-    @max_health_leeched = class_data.elements["ihealthpointsleached"].text.to_i
+
+    @max_backstabs      = class_data.elements['ibackstabs'].text.to_i
+    @max_health_leeched = class_data.elements['ihealthpointsleached'].text.to_i
   end
-  
-end
+
+end

data/lib/steam/community/tf2/tf2_stats.rb

@@ -1,16 +1,16 @@
 # This code is free software; you can redistribute it and/or modify it under the
 # terms of the new BSD License.
 #
-# Copyright (c) 2008-2009, Sebastian Staudt
+# Copyright (c) 2008-2010, Sebastian Staudt
 
-require "steam/community/tf2/tf2_class"
+require 'steam/community/tf2/tf2_class_factory'
 
 # The TF2Stats class represents the game statistics for a single user in Team
 # Fortress 2
 class TF2Stats < GameStats
 
   attr_reader :accumulated_points
-  
+
   # Creates a TF2Stats object by calling the super constructor with the game
   # name "tf2"
   def initialize(steam_id)
@@ -20,7 +20,7 @@ class TF2Stats < GameStats
       @accumulated_points = @xml_data.elements['stats/accumulatedPoints'].text.to_i
     end
   end
-  
+
   # Returns a Hash of TF2Class for this user containing all Team Fortress 2
   # classes. If the classes haven't been parsed already, parsing is done now.
   def class_stats
@@ -29,11 +29,11 @@ class TF2Stats < GameStats
     if @class_stats.nil?
       @class_stats = Hash.new
       @xml_data.elements.each('stats/classData') do |class_data|
-        @class_stats[class_data.elements['className'].text] = TF2Class.new(class_data)
+        @class_stats[class_data.elements['className'].text] = TF2ClassFactory.tf2_class(class_data)
       end
     end
-    
-    return @class_stats
+
+    @class_stats
   end
-  
-end
+
+end