steam-condenser 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 6e724ccb42cf8919d3c93f337b3aa9d318731c632c7d4f3a847c563e05d7a307c374df5e430bcedc0905f33addd5ad8d8b45fc3732fe281aebc622816d03c575
-  data.tar.gz: f0a334cb4fb78275d8b9bd54e1e57647fe6d32be8f43d29eac6636f339947c3eb095e9df1f5336f885b83cbf29a423f82328623c7e43d9457af5a8adf6c933af
 SHA1: 
-  metadata.gz: 4df93af96fcac8cf99dfcfe7898c39db94619635
-  data.tar.gz: 39366be0313e83bedb40fa1e1e735ca714e93763
+  metadata.gz: 16627283b79e75d800e64e9718e9828c739a2bfb
+  data.tar.gz: b4ec72489e29d4403a77e15e7da36b1770e34f89
+SHA512: 
+  metadata.gz: af373818b41b9297e576f4154255a2f5f081f062ccd587acf5fad6e3c6dc7a131730efe373bf95a913e0911321f8522234ce18beb44c236ed8d641ca1d7896cd
+  data.tar.gz: e1c19250df122451b026a11c10076568b63472aaf5d8cc2c5db9454c3c93cffccdb0fe171903b91d4d09693b975c7b91d359e475af3eb252f9ed6fde5dfafa2a

data/CHANGELOG.md

@@ -0,0 +1,228 @@
+## Version 1.3.6 / Unreleased
+
+ * [SECURITY] Use HTTPS for Web API by default
+ * [ENHANCEMENT] bzip2-ruby is optional again for compatibility with Ruby 2.0.0
+                 and JRuby
+ * [ENHANCEMENT] Improved code style in various places
+ * [BUGFIX] Changed to the correct GoldSrc master server port
+ * [BUGFIX] Fixed SourceSocket not failing when it should
+ * [BUGFIX] Fixed creating SteamId instances with `U_` IDs
+
+## Version 1.3.5 / 2013-03-29
+
+ * [ENHANCEMENT] Adapted game item parsing to *DotA 2* API changes
+ * [SECURITY] Strip Wep API keys from debug output
+ * [BUGFIX] Fixed creating SteamId instances with `STEAM_` IDs
+
+## Version 1.3.4.1 / 2013-02-13
+
+ * [BUGFIX] Corrected gem build for version 1.3.4
+
+## Version 1.3.4 / 2013-02-13
+
+ * [BUGFIX] Fixed a regression in community error handling
+
+## Version 1.3.3 / 2013-02-12
+
+ * [FEATURE] Added support for game ID in server info
+ * [ENHANCEMENT] Improved error handling for XML data
+ * [ENHANCEMENT] Simplified server info packets
+
+## Version 1.3.2 / 2013-02-04
+
+ * [ENHANCEMENT] Improved detection of RCON bans
+
+## Version 1.3.1 / 2013-01-20
+
+ * [ENHANCEMENT] Added support for preliminary inventory items
+ * [ENHANCEMENT] Further improved RCON connection handling
+ * [BUGFIX] Do not cache failed user groups and friends
+ * [BUGFIX] Fixed errors when creating cacheable classes
+
+## Version 1.3.0 / 2012-12-29
+
+ * [FEATURE] Added support for new Web API interfaces
+ * [FEATURE] Added support for new Steam ID format ("[U:#:#####]")
+ * [ENHANCEMENT] Vastly improved inventories
+ * [ENHANCEMENT] Better handling of RCON edge cases
+ * [ENHANCEMENT] Improved connection handling for RCON edge cases
+ * [BUGFIX] Fixed several community parsing issues
+
+## Version 1.2.1 / 2012-07-21
+
+ * [FEATURE] Support for *DotA 2* (beta) inventories
+ * [ENHANCEMENT] Improved behavior of cacheable classes
+ * [ENHANCEMENT] Workaround for game URLs with duplicate slashes
+
+## Version 1.2.0 / 2012-04-24
+
+ * [FEATURE] Support for game version checks
+ * [FEATURE] Support query for all Web API interfaces
+ * [FEATURE] Check game versions using its `steam.inf` file
+ * [FEATURE] Support for new Steam profile attributes
+ * [ENHANCEMENT] Improved fetching of community groups
+ * [ENHANCEMENT] Improved unit tests
+ * [ENHANCEMENT] Cleaned up community-related code
+ * [ENHANCEMENT] Use multi_xml for parsing XML
+ * [BUGFIX] Use `A2S_PLAYER` packet to challenge game servers
+ * [BUGFIX] Fixed several URL related problems
+ * [BUGFIX] Fixed Web API not working without an API key
+ * [PERFORMACE] Optimized fetching of Steam group members
+
+## Version 1.1.0 / 2011-12-13
+
+ * [FEATURE] Support for leaderboards
+ * [FEATURE] Support for *Team Fortress 2* beta stats
+ * [ENHANCEMENT] Allow use of service names instead of port numbers
+ * [BUGFIX] Fixed sending master server heartbeats
+ * [BUGFIX] Fixed check for profile links
+
+## Version 1.0.2 / 2011-10-24
+
+ * [ENHANCEMENT] Added API name and description to achievements
+ * [BUGFIX] Fixed handling of empty RCON responses
+ * [BUGFIX] Fixed `SourceServer.master`
+ * [BUGFIX] Fixed parsing rules with empty values
+ * [BUGFIX] Fixed server info for some Source servers
+ * [BUGFIX] Fixed Rakefile encoding for Ruby 1.9
+
+## Version 1.0.1 / 2011-08-23
+
+ * [BUGFIX] Fixed several packaging problems
+
+## Version 1.0.0 / 2011-08-18
+
+ * [ENHANCEMENT] Added intuitive way to get master servers
+ * [ENHANCEMENT] Added a shortcut to get stats for a SteamGame
+ * [ENHANCEMENT] Added a way to bypass master server problems
+ * [ENHANCEMENT] Updated documentation
+ * [ENHANCEMENT] Improved code style
+ * [ENHANCEMENT] Updated achievement Web API to version 2
+ * [ENHANCEMENT] Updated application news Web API to version 2
+ * [ENHANCEMENT] Use Bundler instead of Ore
+ * [ENHANCEMENT] Use multi_json instead of json
+ * [BUGFIX] Fixed author field for application news
+
+## Version 0.14.0 / 2011-06-01
+
+ * [FEATURE] Support for *Portal 2* stats
+ * [ENHANCEMENT] Updated documentation
+ * [ENHANCEMENT] Use `IEconItems` Web API interfaces for inventories
+ * [BUGFIX] Fixed consecutive Source RCON requests
+ * [BUGFIX] Fixed inventory caching
+
+## Version 0.13.1 / 2011-04-15
+
+* [BUGFIX] Fixed several problems when parsing RCON `status` output
+
+## Version 0.13.0 / 2011-04-12
+
+* [FEATURE] Support for Steam's Web API
+* [FEATURE] Support for Steam application news
+* [FEATURE] Support for *Team Fortress 2* inventories, golden wrenches
+* [FEATURE] Support for master server heartbeating
+* [FEATURE] Dynamic name resolution and automatic failover for master servers
+* [ENHANCEMENT] Improved parsing of RCON `status` output
+* [BUGFIX] Fixed pinging game servers
+* [BUGFIX] Fixed `A2S_PLAYER` and `A2S_RULES` packet creation
+* [BUGFIX] Fixed regular expression for game links
+* [PERFORMANCE] Optimized RCON queries
+* [PERFORMANCE] Fixed timeout calculation in `SteamSocket`
+* [PERFORMANCE] Lazy load zlib for compressed packets
+
+## Version 0.12.0 / 2010-12-29
+
+ * [FEATURE] Support for *Alien Swarm* stats
+ * [FEATURE] Allow customization of socket timeouts
+ * [ENHANCEMENT] Moved from Jeweler to Ore
+ * [BUGFIX] Fixed stats for games without a specific implementation
+
+## Version 0.11.4 / 2010-11-07
+
+ * [BUGFIX] Fixed split packet handling
+ * [BUGFIX] Fixed compatibility with Ruby 1.9
+ * [BUGFIX] Fix for a change in *CS:S*' stats XML data
+
+## Version 0.11.3 / 2010-10-05
+
+ * [BUGFIX] Fix for `SteamId#game_stats`
+
+## Version 0.11.2 / 2010-09-08
+
+ * [ENHANCEMENT] Provide the unlock date of achievements if available
+ * [BUGFIX] Removed workaround for GoldSrc master servers
+ * [BUGFIX] Compatibility fix for `StringIO` additions
+
+## Version 0.11.1 / 2010-07-05
+
+ * [BUGFIX] Fixed parsing of RCON replies
+
+## Version 0.11.0 / 2010-07-02
+
+ * [FEATURE] Support for *Counter-Strike: Source* stats
+ * [ENHANCEMENT] Adapt to common Ruby code conventions
+ * [BUGFIX] Fixed timouts for unresponsive master servers
+ * [BUGFIX] Fixed querying GoldSrc master servers
+
+## Version 0.10.1 / 2010-04-05
+
+ * [FEATURE] Load servers' Steam IDs from `S2A_INFO2` replies
+ * [BUGFIX] Fixed fetching group members
+ * [BUGFIX] Fixed cacheable community data
+ * [BUGFIX] Fixed check for EDF in `S2A_INFO2` replies
+
+## Version 0.10.0 / 2010-02-24
+
+ * [FEATURE] Support for *Left4Dead 2* stats
+ * [FEATURE] Added conversion from 64bit to `STEAM_` IDs
+ * [ENHANCEMENT] Parse XML data to get a user's games
+ * [BUGFIX] Fixed parsing of deactivated community profiles
+ * [BUGFIX] Fixed loading additional player information for Source servers
+
+## Version 0.9.0 / 2009-09-16
+
+ * [FEATURE] Support loading community groups of a user
+ * [FEATURE] Support for *Defense Grid: The Awakening* stats
+ * [ENHANCEMENT] Workaround for corrupt `S2A_RULES` replies
+ * [ENHANCEMENT] Supply a `VERSION` constant
+ * [BUGFIX] Fixed gem packaging
+ * [BUGFIX] Fixed handling of really long RCON replies
+ * [BUGFIX] Improved parsing of `S2A_RULES` packets
+ * [BUGFIX] Fixed compatibility with Ruby 1.9
+ * [PERFORMANCE] Added caching to `SteamGroup` and `SteamId`
+
+## Version 0.8.0 / 2009-06-15
+
+ * [FEATURE] Load additional player information via RCON
+ * [FEATURE] Support for *Day of Defeat: Source* stats
+ * [FEATURE] Support for *Left4Dead* stats
+ * [FEATURE] Support loading games of a user
+ * [ENHANCEMENT] Let `SteamCondenserError` inherit from `StandardError`
+ * [ENHANCEMENT] Several improvements to Steam Community features
+ * [ENHANCEMENT] Several improvements to server queries
+ * [ENHANCEMENT] Use Jeweler for packaging
+ * [BUGFIX] Fixed problems with compressed packets
+ * [BUGFIX] Fixed parsing profiles without favorite or most played games
+ * [PERFORMANCE] Optimized server queries
+
+## Version 0.7.0 / 2009-03-02
+
+ * [FEATURE] Support for *Team Fortress 2* stats and achievements
+ * [FEATURE] Support for split RCON replies
+ * [FEATURE] Support for compressed query replies
+ * [ENHANCEMENT] Better support for HTLV servers
+ * [ENHANCEMENT] XML cache for `GameStats`
+ * [ENHANCEMENT] Use correct packet names
+ * [BUGFIX] Fixed fetching of `SteamId` data
+ * [BUGFIX] Fixed several GoldSrc RCON problems
+
+## Version 0.6.0 / 2008-10-23
+
+ * [FEATURE] Support for Steam Community profiles
+ * [FEATURE] Support for game statistics
+ * [FEATURE] Support for RCON
+
+## Version 0.5.0 / 2008-08-10
+
+ * [FEATURE] Support for GoldSrc and Source server queries
+ * [FEATURE] Support for master server queries

data/CONTRIBUTING.md

@@ -0,0 +1,59 @@
+Contribution Guidelines
+=======================
+
+First of all, each single contribution is appreciated, whether a typo fix,
+improved documentation, a fixed bug or a whole new feature.
+
+## Making your changes
+
+ 1. Fork the repository on GitHub
+ 2. Create a topic branch with a descriptive name, e.g. `fix-issue-123` or
+    `feature-x`
+ 3. Make your modifications, complying with the
+    [code conventions](#code-conventions)
+ 4. Commit small logical changes, each with a descriptive commit message.
+    Please don't mix unrelated changes in a single commit.
+
+## Commit messages
+
+Please format your commit messages as follows:
+
+    Short summary of the change (up to 50 characters)
+
+    Optionally add a more extensive description of your change after a
+    blank line. Wrap the lines in this and the following paragraphs after
+    72 characters.
+
+## Submitting your changes
+
+ 1. Push your changes to a topic branch in your fork of the repository.
+ 2. [Submit a pull request][pr] to the original repository.
+    Describe your changes as short as possible, but as detailed as needed for
+    others to get an overview of your modifications.
+ 3. *Optionally*, [open an issue][issue] in the meta-repository if your change
+    might be relevant to other implementations of Steam Condenser. Please add a
+    link to your pull request.
+
+## Code conventions
+
+ * White spaces:
+   * Indent using 2 spaces
+   * Line endings must be line feeds (\n)
+   * Add a newline at end of file
+ * Name conventions:
+   * `UpperCamelCase` for classes and modules
+   * `lower_case` for variables and methods
+   * `UPPER_CASE` for constants
+
+## Further information
+
+ * [General GitHub documentation][gh-help]
+ * [GitHub pull request documentation][gh-pr]
+ * [Google group][mail]
+ * \#steam-condenser on freenode.net
+
+ [gh-help]: https://help.github.com
+ [gh-pr]:   https://help.github.com/send-pull-requests
+ [issue]:   https://github.com/koraktor/steam-condenser/issues/new
+ [mail]:    https://groups.google.com/group/steam-condenser
+ [pr]:      https://github.com/koraktor/steam-condenser-ruby/pull/new

data/Gemfile.lock

@@ -1,46 +1,45 @@
 PATH
   remote: .
   specs:
-    steam-condenser (1.3.5)
-      bzip2-ruby (~> 0.2.7)
-      multi_json (~> 1.6.0)
+    steam-condenser (1.3.6)
+      multi_json (~> 1.7.2)
       multi_xml (~> 0.5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bzip2-ruby (0.2.7)
     colorize (0.5.8)
-    coveralls (0.6.2)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
     metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.13.1)
+    mime-types (1.23)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.6.0)
+    multi_json (1.7.3)
     multi_xml (0.5.3)
-    rake (10.0.3)
+    rake (10.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    shoulda-context (1.0.2)
+    shoulda-context (1.1.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    thor (0.17.0)
-    yard (0.8.3)
+    thor (0.18.1)
+    yard (0.8.6.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   coveralls
   mocha (~> 0.13.0)
   rake (~> 10.0.1)
-  shoulda-context (~> 1.0.0)
+  shoulda-context (~> 1.1.1)
   steam-condenser!
   yard (~> 0.8.0)

data/README.md

@@ -1,7 +1,11 @@
 Steam Condenser
 ===============
 
-[![Build Status](https://secure.travis-ci.org/koraktor/steam-condenser-ruby.png)](http://travis-ci.org/koraktor/steam-condenser-ruby) [![Dependency Status](https://gemnasium.com/koraktor/steam-condenser-ruby.png)](https://gemnasium.com/koraktor/steam-condenser-ruby) [![Code Climate](https://codeclimate.com/github/koraktor/steam-condenser-ruby.png)](https://codeclimate.com/github/koraktor/steam-condenser-ruby) [![Coverage Status](https://coveralls.io/repos/koraktor/steam-condenser-ruby/badge.png?branch=master)](https://coveralls.io/r/koraktor/steam-condenser-ruby)
+[![Gem Version](https://badge.fury.io/rb/steam-condenser.png)](http://badge.fury.io/rb/steam-condenser)
+[![Build Status](https://secure.travis-ci.org/koraktor/steam-condenser-ruby.png)](http://travis-ci.org/koraktor/steam-condenser-ruby)
+[![Dependency Status](https://gemnasium.com/koraktor/steam-condenser-ruby.png)](https://gemnasium.com/koraktor/steam-condenser-ruby)
+[![Code Climate](https://codeclimate.com/github/koraktor/steam-condenser-ruby.png)](https://codeclimate.com/github/koraktor/steam-condenser-ruby)
+[![Coverage Status](https://coveralls.io/repos/koraktor/steam-condenser-ruby/badge.png?branch=master)](https://coveralls.io/r/koraktor/steam-condenser-ruby)
 
 The Steam Condenser is a multi-language library for querying the Steam
 Community, Source and GoldSrc game servers as well as the Steam master servers.
@@ -59,12 +63,13 @@ included LICENSE file.
 
 ## See Also
 
-* [Steam Condenser home](https://koraktor.de/steam-condenser)
+* [Steam Condenser home](http://koraktor.de/steam-condenser)
 * [Documentation](http://rubydoc.info/gems/steam-condenser)
 * [GitHub project page](https://github.com/koraktor/steam-condenser)
 * [Wiki](https://github.com/koraktor/steam-condenser/wiki)
 * [Google group](http://groups.google.com/group/steam-condenser)
 * [Ohloh profile](http://www.ohloh.net/projects/steam-condenser)
 
-Follow Steam Condenser on Twitter
-[@steamcondenser](http://twitter.com/steamcondenser).
+Follow Steam Condenser on Google Plus+ via
+[+Steam Condenser](https://plus.google.com/b/109400543549250623875/109400543549250623875)
+or on Twitter via [@steamcondenser](https://twitter.com/steamcondenser).

data/lib/steam-condenser/version.rb

@@ -6,6 +6,6 @@
 module SteamCondenser
 
   # The current version of Steam Condenser
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
 end

data/lib/steam/community/alien_swarm/alien_swarm_mission.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) 2010-2011, Sebastian Staudt
+# Copyright (c) 2010-2013, Sebastian Staudt
 
 # This class holds statistical information about missions played by a player in
 # Alien Swarm
@@ -106,14 +106,15 @@ class AlienSwarmMission
     @total_games            = mission_data['gamestotal'].to_i
     @total_games_percentage = mission_data['gamestotalpct'].to_f
 
-    @time = {}
-    @time[:average] = mission_data['avgtime']
-    @time[:brutal]  = mission_data['brutaltime']
-    @time[:easy]    = mission_data['easytime']
-    @time[:hard]    = mission_data['hardtime']
-    @time[:insane]  = mission_data['insanetime']
-    @time[:normal]  = mission_data['normaltime']
-    @time[:total]   = mission_data['totaltime']
+    @time = {
+      :average => mission_data['avgtime'],
+      :brutal  => mission_data['brutaltime'],
+      :easy    => mission_data['easytime'],
+      :hard    => mission_data['hardtime'],
+      :insane  => mission_data['insanetime'],
+      :normal  => mission_data['normaltime'],
+      :total   => mission_data['totaltime']
+    }
   end
 
 end

data/lib/steam/community/alien_swarm/alien_swarm_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) 2010-2011, Sebastian Staudt
+# Copyright (c) 2010-2013, Sebastian Staudt
 
 require 'steam/community/alien_swarm/alien_swarm_mission'
 require 'steam/community/alien_swarm/alien_swarm_weapon'
@@ -20,12 +20,11 @@ class AlienSwarmStats < GameStats
   BASE_URL = 'http://cdn.steamcommunity.com/public/images/gamestats/swarm/'
 
   # The names of all weapons in Alien Swarm
-  WEAPONS = [ 'Autogun', 'Cannon_Sentry', 'Chainsaw', 'Flamer',
-              'Grenade_Launcher', 'Hand_Grenades', 'Hornet_Barrage',
-              'Incendiary_Sentry', 'Laser_Mines', 'Marskman_Rifle', 'Minigun',
-              'Mining_Laser', 'PDW', 'Pistol', 'Prototype_Rifle', 'Rail_Rifle',
-              'Rifle', 'Rifle_Grenade', 'Sentry_Gun', 'Shotgun',
-              'Tesla_Cannon', 'Vindicator', 'Vindicator_Grenade' ]
+  WEAPONS = %w(Autogun Cannon_Sentry Chainsaw Flamer Grenade_Launcher
+               Hand_Grenades Hornet_Barrage Incendiary_Sentry Laser_Mines
+               Marskman_Rifle Minigun Mining_Laser PDW Pistol Prototype_Rifle
+               Rail_Rifle Rifle Rifle_Grenade Sentry_Gun Shotgun Tesla_Cannon
+               Vindicator Vindicator_Grenade)
 
   # Creates a new `AlienSwarmStats` instance by calling the super constructor
   # with the game name `'alienswarm'`
@@ -41,28 +40,29 @@ class AlienSwarmStats < GameStats
 
       @hours_played = lifetime_data['timeplayed']
 
-      @lifetime_stats = {}
-      @lifetime_stats[:accuracy]            = lifetime_data['accuracy'].to_f
-      @lifetime_stats[:aliens_burned]       = lifetime_data['aliensburned'].to_i
-      @lifetime_stats[:aliens_killed]       = lifetime_data['alienskilled'].to_i
-      @lifetime_stats[:campaigns]           = lifetime_data['campaigns'].to_i
-      @lifetime_stats[:damage_taken]        = lifetime_data['damagetaken'].to_i
-      @lifetime_stats[:experience]          = lifetime_data['experience'].to_i
-      @lifetime_stats[:experience_required] = lifetime_data['xprequired'].to_i
-      @lifetime_stats[:fast_hacks]          = lifetime_data['fasthacks'].to_i
-      @lifetime_stats[:friendly_fire]       = lifetime_data['friendlyfire'].to_i
-      @lifetime_stats[:games_successful]    = lifetime_data['gamessuccess'].to_i
-      @lifetime_stats[:healing]             = lifetime_data['healing'].to_i
-      @lifetime_stats[:kills_per_hour]      = lifetime_data['killsperhour'].to_f
-      @lifetime_stats[:level]               = lifetime_data['level'].to_i
-      @lifetime_stats[:promotion]           = lifetime_data['promotion'].to_i
-      @lifetime_stats[:promotion_img]       = BASE_URL + lifetime_data['promotionpic'] if @lifetime_stats[:promotion] > 0
-      @lifetime_stats[:next_unlock]         = lifetime_data['nextunlock']
-      @lifetime_stats[:next_unlock_img]     = BASE_URL + lifetime_data['nextunlockimg']
-      @lifetime_stats[:shots_fired]         = lifetime_data['shotsfired'].to_i
-      @lifetime_stats[:total_games]         = lifetime_data['totalgames'].to_i
-
-      @lifetime_stats[:games_successful_percentage] = (@lifetime_stats[:total_games] > 0) ? @lifetime_stats[:games_successful].to_f / @lifetime_stats[:total_games] : 0;
+      @lifetime_stats = {
+        :accuracy                    => lifetime_data['accuracy'].to_f,
+        :aliens_burned               => lifetime_data['aliensburned'].to_i,
+        :aliens_killed               => lifetime_data['alienskilled'].to_i,
+        :campaigns                   => lifetime_data['campaigns'].to_i,
+        :damage_taken                => lifetime_data['damagetaken'].to_i,
+        :experience                  => lifetime_data['experience'].to_i,
+        :experience_required         => lifetime_data['xprequired'].to_i,
+        :fast_hacks                  => lifetime_data['fasthacks'].to_i,
+        :friendly_fire               => lifetime_data['friendlyfire'].to_i,
+        :games_successful            => lifetime_data['gamessuccess'].to_i,
+        :healing                     => lifetime_data['healing'].to_i,
+        :kills_per_hour              => lifetime_data['killsperhour'].to_f,
+        :level                       => lifetime_data['level'].to_i,
+        :promotion                   => lifetime_data['promotion'].to_i,
+        :next_unlock                 => lifetime_data['nextunlock'],
+        :next_unlock_img             => BASE_URL + lifetime_data['nextunlockimg'],
+        :shots_fired                 => lifetime_data['shotsfired'].to_i,
+        :total_games                 => lifetime_data['totalgames'].to_i,
+        :games_successful_percentage => (@lifetime_stats[:total_games] > 0) ? @lifetime_stats[:games_successful].to_f / @lifetime_stats[:total_games] : 0
+      }
+
+      @lifetime_stats[:promotion_img] = BASE_URL + lifetime_data['promotionpic'] if @lifetime_stats[:promotion] > 0
     end
   end
 
@@ -77,27 +77,28 @@ class AlienSwarmStats < GameStats
     if @favorites.nil?
       favorites_data = @xml_data['stats']['favorites']
 
-      @favorites = {}
-      @favorites[:class]                       = favorites_data['class']
-      @favorites[:class_img]                   = favorites_data['classimg']
-      @favorites[:class_percentage]            = favorites_data['classpct'].to_f
-      @favorites[:difficulty]                  = favorites_data['difficulty']
-      @favorites[:difficulty_percentage]       = favorites_data['difficultypct'].to_f
-      @favorites[:extra]                       = favorites_data['extra']
-      @favorites[:extra_img]                   = favorites_data['extraimg']
-      @favorites[:extra_percentage]            = favorites_data['extrapct'].to_f
-      @favorites[:marine]                      = favorites_data['marine']
-      @favorites[:marine_img]                  = favorites_data['marineimg']
-      @favorites[:marine_percentage]           = favorites_data['marinepct'].to_f
-      @favorites[:mission]                     = favorites_data['mission']
-      @favorites[:mission_img]                 = favorites_data['missionimg']
-      @favorites[:mission_percentage]          = favorites_data['missionpct'].to_f
-      @favorites[:primary_weapon]              = favorites_data['primary']
-      @favorites[:primary_weapon_img]          = favorites_data['primaryimg']
-      @favorites[:primary_weapon_percentage]   = favorites_data['primarypct'].to_f
-      @favorites[:secondary_weapon]            = favorites_data['secondary']
-      @favorites[:secondary_weapon_img]        = favorites_data['secondaryimg']
-      @favorites[:secondary_weapon_percentage] = favorites_data['secondarypct'].to_f
+      @favorites = {
+        :class                       => favorites_data['class'],
+        :class_img                   => favorites_data['classimg'],
+        :class_percentage            => favorites_data['classpct'].to_f,
+        :difficulty                  => favorites_data['difficulty'],
+        :difficulty_percentage       => favorites_data['difficultypct'].to_f,
+        :extra                       => favorites_data['extra'],
+        :extra_img                   => favorites_data['extraimg'],
+        :extra_percentage            => favorites_data['extrapct'].to_f,
+        :marine                      => favorites_data['marine'],
+        :marine_img                  => favorites_data['marineimg'],
+        :marine_percentage           => favorites_data['marinepct'].to_f,
+        :mission                     => favorites_data['mission'],
+        :mission_img                 => favorites_data['missionimg'],
+        :mission_percentage          => favorites_data['missionpct'].to_f,
+        :primary_weapon              => favorites_data['primary'],
+        :primary_weapon_img          => favorites_data['primaryimg'],
+        :primary_weapon_percentage   => favorites_data['primarypct'].to_f,
+        :secondary_weapon            => favorites_data['secondary'],
+        :secondary_weapon_img        => favorites_data['secondaryimg'],
+        :secondary_weapon_percentage => favorites_data['secondarypct'].to_f
+      }
     end
 
     @favorites
@@ -115,28 +116,29 @@ class AlienSwarmStats < GameStats
     if @item_stats.nil?
       weapons_data = @xml_data['stats']['weapons']
 
-      @item_stats = {}
-      @item_stats[:ammo_deployed]             = weapons_data['ammo_deployed'].to_i
-      @item_stats[:sentryguns_deployed]       = weapons_data['sentryguns_deployed'].to_i
-      @item_stats[:sentry_flamers_deployed]   = weapons_data['sentry_flamers_deployed'].to_i
-      @item_stats[:sentry_freeze_deployed]    = weapons_data['sentry_freeze_deployed'].to_i
-      @item_stats[:sentry_cannon_deployed]    = weapons_data['sentry_cannon_deployed'].to_i
-      @item_stats[:medkits_used]              = weapons_data['medkits_used'].to_i
-      @item_stats[:flares_used]               = weapons_data['flares_used'].to_i
-      @item_stats[:adrenaline_used]           = weapons_data['adrenaline_used'].to_i
-      @item_stats[:tesla_traps_deployed]      = weapons_data['tesla_traps_deployed'].to_i
-      @item_stats[:freeze_grenades_thrown]    = weapons_data['freeze_grenades_thrown'].to_i
-      @item_stats[:electric_armor_used]       = weapons_data['electric_armor_used'].to_i
-      @item_stats[:healgun_heals]             = weapons_data['healgun_heals'].to_i
-      @item_stats[:healgun_heals_self]        = weapons_data['healgun_heals_self'].to_i
-      @item_stats[:healbeacon_heals]          = weapons_data['healbeacon_heals'].to_i
-      @item_stats[:healbeacon_heals_self]     = weapons_data['healbeacon_heals_self'].to_i
-      @item_stats[:damage_amps_used]          = weapons_data['damage_amps_used'].to_i
-      @item_stats[:healbeacons_deployed]      = weapons_data['healbeacons_deployed'].to_i
-      @item_stats[:healbeacon_heals_pct]      = weapons_data['healbeacon_heals_pct'].to_f
-      @item_stats[:healgun_heals_pct]         = weapons_data['healgun_heals_pct'].to_f
-      @item_stats[:healbeacon_heals_pct_self] = weapons_data['healbeacon_heals_pct_self'].to_f
-      @item_stats[:healgun_heals_pct_self]    = weapons_data['healgun_heals_pct_self'].to_f
+      @item_stats = {
+        :ammo_deployed             => weapons_data['ammo_deployed'].to_i,
+        :sentryguns_deployed       => weapons_data['sentryguns_deployed'].to_i,
+        :sentry_flamers_deployed   => weapons_data['sentry_flamers_deployed'].to_i,
+        :sentry_freeze_deployed    => weapons_data['sentry_freeze_deployed'].to_i,
+        :sentry_cannon_deployed    => weapons_data['sentry_cannon_deployed'].to_i,
+        :medkits_used              => weapons_data['medkits_used'].to_i,
+        :flares_used               => weapons_data['flares_used'].to_i,
+        :adrenaline_used           => weapons_data['adrenaline_used'].to_i,
+        :tesla_traps_deployed      => weapons_data['tesla_traps_deployed'].to_i,
+        :freeze_grenades_thrown    => weapons_data['freeze_grenades_thrown'].to_i,
+        :electric_armor_used       => weapons_data['electric_armor_used'].to_i,
+        :healgun_heals             => weapons_data['healgun_heals'].to_i,
+        :healgun_heals_self        => weapons_data['healgun_heals_self'].to_i,
+        :healbeacon_heals          => weapons_data['healbeacon_heals'].to_i,
+        :healbeacon_heals_self     => weapons_data['healbeacon_heals_self'].to_i,
+        :damage_amps_used          => weapons_data['damage_amps_used'].to_i,
+        :healbeacons_deployed      => weapons_data['healbeacons_deployed'].to_i,
+        :healbeacon_heals_pct      => weapons_data['healbeacon_heals_pct'].to_f,
+        :healgun_heals_pct         => weapons_data['healgun_heals_pct'].to_f,
+        :healbeacon_heals_pct_self => weapons_data['healbeacon_heals_pct_self'].to_f,
+        :healgun_heals_pct_self    => weapons_data['healgun_heals_pct_self'].to_f
+      }
     end
 
     @item_stats