steam-condenser 0.11.3 → 0.11.4

data/Rakefile

@@ -6,7 +6,6 @@
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rubygems'
-require 'jeweler'
 
 src_files = Dir.glob(File.join("lib", "**", "*.rb"))
 test_files = Dir.glob(File.join("test", "**", "*.rb"))

data/lib/datagram_channel.rb

@@ -24,8 +24,7 @@ class DatagramChannel
     if args[0].is_a? IPAddr
       ip_address = args[0].to_s
     elsif args[0].is_a? String
-      sockaddr = (Socket.gethostbyname args[0])[3]
-      ip_address = "#{sockaddr[0]}.#{sockaddr[1]}.#{sockaddr[2]}.#{sockaddr[3]}"
+      ip_address = IPSocket.getaddress args[0]
     else
       raise ArgumentError
     end

data/lib/steam-condenser/version.rb

@@ -7,6 +7,6 @@ require 'yaml'
 
 module SteamCondenser
 
-  VERSION = '0.11.3'
+  VERSION = '0.11.4'
 
 end

data/lib/steam/community/css/css_stats.rb

@@ -8,7 +8,9 @@ require 'steam/community/css/css_weapon'
 
 # The CSSStats class represents the game statistics for a single user in
 # Counter-Strike: Source
-class CSSStats < GameStats
+class CSSStats
+
+  include GameStats
 
   MAPS = [ 'cs_assault', 'cs_compound', 'cs_havana', 'cs_italy', 'cs_militia',
            'cs_office', 'de_aztec', 'de_cbble', 'de_chateau', 'de_dust',
@@ -31,45 +33,45 @@ class CSSStats < GameStats
       @last_match_stats = {}
       @total_stats      = {}
 
-      @last_match_stats[:cost_per_kill]   = @xml_data.elements['stats/lastmatch/costkill'].text.to_f
-      @last_match_stats[:ct_wins]         = @xml_data.elements['stats/lastmatch/ct_wins'].text.to_i
-      @last_match_stats[:damage]          = @xml_data.elements['stats/lastmatch/dmg'].text.to_i
-      @last_match_stats[:deaths]          = @xml_data.elements['stats/lastmatch/deaths'].text.to_i
-      @last_match_stats[:dominations]     = @xml_data.elements['stats/lastmatch/dominations'].text.to_i
-      @last_match_stats[:favorite_weapon] = @xml_data.elements['stats/lastmatch/favwpn'].text
-      @last_match_stats[:kills]           = @xml_data.elements['stats/lastmatch/kills'].text.to_i
-      @last_match_stats[:max_players]     = @xml_data.elements['stats/lastmatch/max_players'].text.to_i
-      @last_match_stats[:money]           = @xml_data.elements['stats/lastmatch/money'].text.to_i
-      @last_match_stats[:revenges]        = @xml_data.elements['stats/lastmatch/revenges'].text.to_i
-      @last_match_stats[:stars]           = @xml_data.elements['stats/lastmatch/stars'].text.to_i
-      @last_match_stats[:t_wins]          = @xml_data.elements['stats/lastmatch/t_wins'].text.to_i
-      @last_match_stats[:wins]            = @xml_data.elements['stats/lastmatch/wins'].text.to_i
-      @total_stats[:blind_kills]          = @xml_data.elements['stats/lifetime/blindkills'].text.to_i
-      @total_stats[:bombs_defused]        = @xml_data.elements['stats/lifetime/bombsdefused'].text.to_i
-      @total_stats[:bombs_planted]        = @xml_data.elements['stats/lifetime/bombsplanted'].text.to_i
-      @total_stats[:damage]               = @xml_data.elements['stats/lifetime/dmg'].text.to_i
-      @total_stats[:deaths]               = @xml_data.elements['stats/summary/deaths'].text.to_i
-      @total_stats[:domination_overkills] = @xml_data.elements['stats/lifetime/dominationoverkills'].text.to_i
-      @total_stats[:dominations]          = @xml_data.elements['stats/lifetime/dominations'].text.to_i
-      @total_stats[:earned_money]         = @xml_data.elements['stats/lifetime/money'].text.to_i
-      @total_stats[:enemy_weapon_kills]   = @xml_data.elements['stats/lifetime/enemywpnkills'].text.to_i
-      @total_stats[:headshots]            = @xml_data.elements['stats/lifetime/headshots'].text.to_i
-      @total_stats[:hits]                 = @xml_data.elements['stats/summary/shotshit'].text.to_i
-      @total_stats[:hostages_rescued]     = @xml_data.elements['stats/lifetime/hostagesrescued'].text.to_i
-      @total_stats[:kills]                = @xml_data.elements['stats/summary/kills'].text.to_i
-      @total_stats[:knife_kills]          = @xml_data.elements['stats/lifetime/knifekills'].text.to_i
-      @total_stats[:logos_sprayed]        = @xml_data.elements['stats/lifetime/decals'].text.to_i
-      @total_stats[:nightvision_damage]   = @xml_data.elements['stats/lifetime/nvgdmg'].text.to_i
-      @total_stats[:pistol_rounds_won]    = @xml_data.elements['stats/lifetime/pistolrounds'].text.to_i
-      @total_stats[:revenges]             = @xml_data.elements['stats/lifetime/revenges'].text.to_i
-      @total_stats[:rounds_played]        = @xml_data.elements['stats/summary/rounds'].text.to_i
-      @total_stats[:rounds_won]           = @xml_data.elements['stats/summary/wins'].text.to_i
-      @total_stats[:seconds_played]       = @xml_data.elements['stats/summary/timeplayed'].text.to_i
-      @total_stats[:shots]                = @xml_data.elements['stats/summary/shots'].text.to_i
-      @total_stats[:stars]                = @xml_data.elements['stats/summary/stars'].text.to_i
-      @total_stats[:weapons_donated]      = @xml_data.elements['stats/lifetime/wpndonated'].text.to_i
-      @total_stats[:windows_broken]       = @xml_data.elements['stats/lifetime/winbroken'].text.to_i
-      @total_stats[:zoomed_sniper_kills]  = @xml_data.elements['stats/lifetime/zsniperkills'].text.to_i
+      @last_match_stats[:cost_per_kill]      = @xml_data.elements['stats/lastmatch/costkill'].text.to_f
+      @last_match_stats[:ct_wins]            = @xml_data.elements['stats/lastmatch/ct_wins'].text.to_i
+      @last_match_stats[:damage]             = @xml_data.elements['stats/lastmatch/dmg'].text.to_i
+      @last_match_stats[:deaths]             = @xml_data.elements['stats/lastmatch/deaths'].text.to_i
+      @last_match_stats[:dominations]        = @xml_data.elements['stats/lastmatch/dominations'].text.to_i
+      @last_match_stats[:favorite_weapon_id] = @xml_data.elements['stats/lastmatch/favwpnid'].text.to_i
+      @last_match_stats[:kills]              = @xml_data.elements['stats/lastmatch/kills'].text.to_i
+      @last_match_stats[:max_players]        = @xml_data.elements['stats/lastmatch/max_players'].text.to_i
+      @last_match_stats[:money]              = @xml_data.elements['stats/lastmatch/money'].text.to_i
+      @last_match_stats[:revenges]           = @xml_data.elements['stats/lastmatch/revenges'].text.to_i
+      @last_match_stats[:stars]              = @xml_data.elements['stats/lastmatch/stars'].text.to_i
+      @last_match_stats[:t_wins]             = @xml_data.elements['stats/lastmatch/t_wins'].text.to_i
+      @last_match_stats[:wins]               = @xml_data.elements['stats/lastmatch/wins'].text.to_i
+      @total_stats[:blind_kills]             = @xml_data.elements['stats/lifetime/blindkills'].text.to_i
+      @total_stats[:bombs_defused]           = @xml_data.elements['stats/lifetime/bombsdefused'].text.to_i
+      @total_stats[:bombs_planted]           = @xml_data.elements['stats/lifetime/bombsplanted'].text.to_i
+      @total_stats[:damage]                  = @xml_data.elements['stats/lifetime/dmg'].text.to_i
+      @total_stats[:deaths]                  = @xml_data.elements['stats/summary/deaths'].text.to_i
+      @total_stats[:domination_overkills]    = @xml_data.elements['stats/lifetime/dominationoverkills'].text.to_i
+      @total_stats[:dominations]             = @xml_data.elements['stats/lifetime/dominations'].text.to_i
+      @total_stats[:earned_money]            = @xml_data.elements['stats/lifetime/money'].text.to_i
+      @total_stats[:enemy_weapon_kills]      = @xml_data.elements['stats/lifetime/enemywpnkills'].text.to_i
+      @total_stats[:headshots]               = @xml_data.elements['stats/lifetime/headshots'].text.to_i
+      @total_stats[:hits]                    = @xml_data.elements['stats/summary/shotshit'].text.to_i
+      @total_stats[:hostages_rescued]        = @xml_data.elements['stats/lifetime/hostagesrescued'].text.to_i
+      @total_stats[:kills]                   = @xml_data.elements['stats/summary/kills'].text.to_i
+      @total_stats[:knife_kills]             = @xml_data.elements['stats/lifetime/knifekills'].text.to_i
+      @total_stats[:logos_sprayed]           = @xml_data.elements['stats/lifetime/decals'].text.to_i
+      @total_stats[:nightvision_damage]      = @xml_data.elements['stats/lifetime/nvgdmg'].text.to_i
+      @total_stats[:pistol_rounds_won]       = @xml_data.elements['stats/lifetime/pistolrounds'].text.to_i
+      @total_stats[:revenges]                = @xml_data.elements['stats/lifetime/revenges'].text.to_i
+      @total_stats[:rounds_played]           = @xml_data.elements['stats/summary/rounds'].text.to_i
+      @total_stats[:rounds_won]              = @xml_data.elements['stats/summary/wins'].text.to_i
+      @total_stats[:seconds_played]          = @xml_data.elements['stats/summary/timeplayed'].text.to_i
+      @total_stats[:shots]                   = @xml_data.elements['stats/summary/shots'].text.to_i
+      @total_stats[:stars]                   = @xml_data.elements['stats/summary/stars'].text.to_i
+      @total_stats[:weapons_donated]         = @xml_data.elements['stats/lifetime/wpndonated'].text.to_i
+      @total_stats[:windows_broken]          = @xml_data.elements['stats/lifetime/winbroken'].text.to_i
+      @total_stats[:zoomed_sniper_kills]     = @xml_data.elements['stats/lifetime/zsniperkills'].text.to_i
 
       @last_match_stats[:kdratio] = @last_match_stats[:kills].to_f / @last_match_stats[:deaths]
       @total_stats[:accuracy]     = @total_stats[:hits].to_f / @total_stats[:shots]

data/lib/steam/community/defense_grid/defense_grid_stats.rb

@@ -1,13 +1,15 @@
 # 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/game_stats'
 
 # The DefenseGridStats class represents the game statistics for a single user in
 # Defense Grid: The Awakening
-class DefenseGridStats < GameStats
+class DefenseGridStats
+
+  include GameStats
 
   attr_reader :bronze_medals, :damage_done, :damage_campaign, :damage_challenge,
               :encountered, :gold_medals, :heat_damage, :interest, :killed,

data/lib/steam/community/dods/dods_class.rb

@@ -1,12 +1,14 @@
 # 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/game_class'
 
 # Represents the stats for a DoD:S class for a specific user
-class DoDSClass < GameClass
+class DoDSClass
+
+  include GameClass
 
   attr_reader :blocks, :bombs_defused, :bombs_planted, :captures, :deaths,
               :dominations, :key, :kills, :name, :rounds_lost, :rounds_won,

data/lib/steam/community/dods/dods_stats.rb

@@ -6,7 +6,9 @@
 require 'steam/community/dods/dods_weapon'
 require 'steam/community/game_stats'
 
-class DoDSStats < GameStats
+class DoDSStats
+
+  include GameStats
 
   # Creates a DoDSStats object by calling the super constructor with the game
   # name "DoD:S"

data/lib/steam/community/dods/dods_weapon.rb

@@ -1,12 +1,14 @@
 # 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/game_weapon'
 
 # Represents the stats for a Day of Defeat: Source weapon for a specific user
-class DoDSWeapon < GameWeapon
+class DoDSWeapon
+
+  include GameWeapon
 
   attr_reader :headshots, :name, :hits
 

data/lib/steam/community/game_class.rb

@@ -1,14 +1,10 @@
 # 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
-
-require 'abstract_class'
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 # Super class for classes representing player classes
-class GameClass
-
-  include AbstractClass
+module GameClass
 
   attr_reader :name, :play_time
 

data/lib/steam/community/game_stats.rb

@@ -10,9 +10,7 @@ require 'steam/community/game_achievement'
 
 # The GameStats class represents the game statistics for a single user and a
 # specific game
-class GameStats
-
-  protected :initialize
+module GameStats
 
   attr_reader :app_id, :custom_url, :game_friendly_name, :game_name,
               :hours_played, :privacy_state, :steam_id64

data/lib/steam/community/game_weapon.rb

@@ -3,12 +3,8 @@
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'abstract_class'
-
 # Super class for classes representing game weapons
-class GameWeapon
-
-  include AbstractClass
+module GameWeapon
 
   attr_reader :kills, :id, :shots
 

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

@@ -1,17 +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) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'steam/community/game_stats'
 
 # AbstractL4DStats is an abstract base class for statistics for Left4Dead and
 # Left4Dead 2. As both games have more or less the same statistics available in
 # the Steam Community the code for both is pretty much the same.
-class AbstractL4DStats < GameStats
+module AbstractL4DStats
 
-  include AbstractClass
+  include GameStats
 
   SPECIAL_INFECTED = %w(boomer hunter smoker tank)
 

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

@@ -3,12 +3,11 @@
 #
 # Copyright (c) 2009-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'steam/community/game_weapon'
 
-class AbstractL4DWeapon < GameWeapon
+module AbstractL4DWeapon
 
-  include AbstractClass
+  include GameWeapon
 
   attr_reader :accuracy, :headshots_percentage, :kill_percentage
 

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

@@ -7,7 +7,9 @@ require 'steam/community/l4d/abstract_l4d_stats'
 require 'steam/community/l4d/l4d2_map'
 require 'steam/community/l4d/l4d2_weapon'
 
-class L4D2Stats < AbstractL4DStats
+class L4D2Stats
+
+  include AbstractL4DStats
 
   SPECIAL_INFECTED = SPECIAL_INFECTED + %w{charger jockey spitter}
 

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

@@ -1,11 +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 'steam/community/l4d/abstract_l4d_weapon'
 
-class L4D2Weapon < AbstractL4DWeapon
+class L4D2Weapon
+
+  include AbstractL4DWeapon
 
   attr_reader :damage, :weapon_group
 

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

@@ -1,11 +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 'steam/community/game_weapon'
 
-class L4DExplosive < GameWeapon
+class L4DExplosive
+
+  include GameWeapon
 
   # Creates a new instance of L4DExplosive based on the assigned XML data
   def initialize(weapon_data)

data/lib/steam/community/l4d/l4d_map.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
 
 # L4DMap holds statistical information about maps played by a player in
 # Survival mode of Left4Dead.

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

@@ -1,14 +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) 2009, Sebastian Staudt
+# Copyright (c) 2009-2010, Sebastian Staudt
 
 require 'steam/community/l4d/abstract_l4d_stats'
 require 'steam/community/l4d/l4d_explosive'
 require 'steam/community/l4d/l4d_map'
 require 'steam/community/l4d/l4d_weapon'
 
-class L4DStats < AbstractL4DStats
+class L4DStats
+
+  include AbstractL4DStats
 
   # Creates a L4DStats object by calling the super constructor with the game
   # name "l4d".

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

@@ -1,11 +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 'steam/community/l4d/abstract_l4d_weapon'
 
-class L4DWeapon < AbstractL4DWeapon
+class L4DWeapon
+
+  include AbstractL4DWeapon
 
   attr_reader :accuracy, :headshots_percentage, :kill_percentage
 

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

@@ -6,7 +6,9 @@
 require 'steam/community/game_class'
 
 # Represents the stats for a Team Fortress 2 class for a specific user
-class TF2Class < GameClass
+module TF2Class
+
+  include GameClass
 
   attr_reader :max_buildings_destroyed, :max_captures, :max_damage,
               :max_defenses, :max_dominations, :max_kill_assists, :max_kills,

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

@@ -3,7 +3,6 @@
 #
 # 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'
@@ -12,9 +11,7 @@ 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
+module TF2ClassFactory
 
   # Creates a new instance of TF2Class storing the statistics for a Team
   # Fortress 2 class with the assigned XML data

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

@@ -7,7 +7,9 @@ require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 engineer class for a specific
 # user
-class TF2Engineer < TF2Class
+class TF2Engineer
+
+  include TF2Class
 
   attr_reader :max_buildings_built, :max_teleports, :max_sentry_kills
 

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

@@ -6,7 +6,9 @@
 require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 medic class for a specific user
-class TF2Medic < TF2Class
+class TF2Medic
+
+  include TF2Class
 
   attr_reader :max_health_healed, :max_ubercharges
 

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

@@ -6,7 +6,9 @@
 require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 sniper class for a specific user
-class TF2Sniper < TF2Class
+class TF2Sniper
+
+  include TF2Class
 
   # Creates a new instance of TF2Sniper based on the assigned XML data
   def initialize(class_data)

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

@@ -6,7 +6,9 @@
 require 'steam/community/tf2/tf2_class'
 
 # Represents the stats for the Team Fortress 2 spy class for a specific user
-class TF2Spy < TF2Class
+class TF2Spy
+
+  include TF2Class
 
   attr_reader :max_backstabs, :max_health_leeched
 

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

@@ -3,11 +3,14 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
+require 'steam/community/game_stats'
 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
+class TF2Stats
+
+  include GameStats
 
   attr_reader :accumulated_points
 

data/lib/steam/packets/a2a_ack_packet.rb

@@ -3,19 +3,22 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
+require 'exceptions/packet_format_exception'
 require 'steam/packets/steam_packet'
 
 # The A2A_ACK_Packet class represents the response to a A2A_PING
 # request send to the server.
-class A2A_ACK_Packet < SteamPacket
+class A2A_ACK_Packet
+
+  include SteamPacket
 
   # Creates a A2A_ACK response object based on the data received.
   def initialize(data)
     if data != "\0" && data != "00000000000000\0"
-      raise Exception.new('Wrong formatted A2A_ACK packet.')
+      raise PacketFormatException.new('Wrong formatted A2A_ACK packet.')
     end
 
-    super SteamPacket::A2A_ACK_HEADER, data
+    super A2A_ACK_HEADER, data
   end
 
 end

data/lib/steam/packets/a2a_ping_packet.rb

@@ -7,7 +7,9 @@ require 'steam/packets/steam_packet'
 
 # The A2A_PING_Packet class represents a A2A_PING request send to the
 # server.
-class A2A_PING_Packet < SteamPacket
+class A2A_PING_Packet
+
+  include SteamPacket
 
   # Creates a new A2A_PING request object
   def initialize

data/lib/steam/packets/a2m_get_servers_batch2_packet.rb

@@ -6,11 +6,13 @@
 require 'steam/packets/steam_packet'
 require 'steam/servers/master_server'
 
-class A2M_GET_SERVERS_BATCH2_Packet < SteamPacket
+class A2M_GET_SERVERS_BATCH2_Packet
+
+  include SteamPacket
 
   # Creates a master server request, filtering by the given paramters.
   def initialize(region_code = MasterServer::REGION_ALL, start_ip = '0.0.0.0:0', filter = '')
-    super SteamPacket::A2M_GET_SERVERS_BATCH2_HEADER
+    super A2M_GET_SERVERS_BATCH2_HEADER
 
     @filter = filter
     @region_code = region_code

data/lib/steam/packets/a2s_info_packet.rb

@@ -7,11 +7,13 @@ require 'steam/packets/steam_packet'
 
 # The A2S_INFO_Packet class represents a A2S_INFO request send to the
 # server.
-class A2S_INFO_Packet < SteamPacket
+class A2S_INFO_Packet
+
+  include SteamPacket
 
   # Creates a new A2S_INFO request object
   def initialize
-    super SteamPacket::A2S_INFO_HEADER, "Source Engine Query\0"
+    super A2S_INFO_HEADER, "Source Engine Query\0"
   end
 
 end

data/lib/steam/packets/a2s_player_packet.rb

@@ -8,13 +8,14 @@ require 'steam/packets/steam_packet'
 
 # The A2S_PLAYER_Packet class represents a A2S_PLAYER request send to the
 # server.
-class A2S_PLAYER_Packet < SteamPacket
+class A2S_PLAYER_Packet
 
   include RequestWithChallenge
+  include SteamPacket
 
   # Creates a new A2S_PLAYER request object including the challenge_number
   def initialize(challenge_number = -1)
-    super SteamPacket::A2S_PLAYER_HEADER, challenge_number
+    super A2S_PLAYER_HEADER, challenge_number
   end
 
 end

data/lib/steam/packets/a2s_rules_packet.rb

@@ -7,13 +7,14 @@ require 'steam/packets/request_with_challenge'
 require 'steam/packets/steam_packet'
 
 # Creates a new A2A_RULES request object including the challenge_number
-class A2S_RULES_Packet < SteamPacket
+class A2S_RULES_Packet
 
   include RequestWithChallenge
+  include SteamPacket
 
   # Creates a new A2S_RULES request object including the challenge_number
   def initialize(challenge_number = -1)
-    super SteamPacket::A2S_RULES_HEADER, challenge_number
+    super A2S_RULES_HEADER, challenge_number
   end
 
 end

data/lib/steam/packets/a2s_serverquery_getchallenge_packet.rb

@@ -7,11 +7,13 @@ require 'steam/packets/steam_packet'
 
 # The A2S_SERVERQUERY_GETCHALLENGE_Packet class represents a
 # A2S_SERVERQUERY_GETCHALLENGE request send to the server.
-class A2S_SERVERQUERY_GETCHALLENGE_Packet < SteamPacket
+class A2S_SERVERQUERY_GETCHALLENGE_Packet
+
+  include SteamPacket
 
   # Creates a new A2S_SERVERQUERY_GETCHALLENGE request object
   def initialize
-    super SteamPacket::A2S_SERVERQUERY_GETCHALLENGE_HEADER
+    super A2S_SERVERQUERY_GETCHALLENGE_HEADER
   end
 
 end

data/lib/steam/packets/m2a_server_batch_packet.rb

@@ -5,12 +5,14 @@
 
 require 'steam/packets/steam_packet'
 
-class M2A_SERVER_BATCH_Packet < SteamPacket
+class M2A_SERVER_BATCH_Packet
+
+  include SteamPacket
 
   attr_reader :servers
 
   def initialize(data)
-    super SteamPacket::M2A_SERVER_BATCH_HEADER, data
+    super M2A_SERVER_BATCH_HEADER, data
 
     unless @content_data.byte == 0x0A
       raise PacketFormatException.new('Master query response is missing additional 0x0A byte.')

data/lib/steam/packets/rcon/rcon_auth_request.rb

@@ -5,10 +5,12 @@
 
 require 'steam/packets/rcon/rcon_packet'
 
-class RCONAuthRequest < RCONPacket
+class RCONAuthRequest
+
+  include RCONPacket
 
   def initialize(request_id, rcon_password)
-    super request_id, RCONPacket::SERVERDATA_AUTH, rcon_password
+    super request_id, SERVERDATA_AUTH, rcon_password
   end
 
 end

data/lib/steam/packets/rcon/rcon_auth_response.rb

@@ -5,10 +5,12 @@
 
 require 'steam/packets/rcon/rcon_packet'
 
-class RCONAuthResponse < RCONPacket
+class RCONAuthResponse
+
+  include RCONPacket
 
   def initialize(request_id)
-    super request_id, RCONPacket::SERVERDATA_AUTH_RESPONSE, ''
+    super request_id, SERVERDATA_AUTH_RESPONSE, ''
   end
 
 end

data/lib/steam/packets/rcon/rcon_exec_request.rb

@@ -5,10 +5,12 @@
 
 require 'steam/packets/rcon/rcon_packet'
 
-class RCONExecRequest < RCONPacket
+class RCONExecRequest
+
+  include RCONPacket
 
   def initialize(request_id, rcon_command)
-    super request_id, RCONPacket::SERVERDATA_EXECCOMMAND, rcon_command
+    super request_id, SERVERDATA_EXECCOMMAND, rcon_command
   end
 
 end

data/lib/steam/packets/rcon/rcon_exec_response.rb

@@ -1,14 +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/packets/rcon/rcon_packet"
+require 'steam/packets/rcon/rcon_packet'
 
-class RCONExecResponse < RCONPacket
+class RCONExecResponse
+
+  include RCONPacket
 
   def initialize(request_id, command_response)
-    super request_id, RCONPacket::SERVERDATA_RESPONSE_VALUE, command_response
+    super request_id, SERVERDATA_RESPONSE_VALUE, command_response
   end
 
   def response

data/lib/steam/packets/rcon/rcon_goldsrc_request.rb

@@ -5,7 +5,9 @@
 
 require 'steam/packets/steam_packet'
 
-class RCONGoldSrcRequest < SteamPacket
+class RCONGoldSrcRequest
+
+  include SteamPacket
 
   def initialize(request)
     super 0x00, request

data/lib/steam/packets/rcon/rcon_goldsrc_response.rb

@@ -5,10 +5,12 @@
 
 require 'steam/packets/steam_packet'
 
-class RCONGoldSrcResponse < SteamPacket
+class RCONGoldSrcResponse
+
+  include SteamPacket
 
   def initialize(command_response)
-    super SteamPacket::RCON_GOLDSRC_RESPONSE_HEADER, command_response
+    super RCON_GOLDSRC_RESPONSE_HEADER, command_response
   end
 
   def response

data/lib/steam/packets/rcon/rcon_packet.rb

@@ -3,12 +3,11 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'steam/packets/steam_packet'
 
-class RCONPacket < SteamPacket
+module RCONPacket
 
-  include AbstractClass
+  include SteamPacket
 
   SERVERDATA_AUTH = 3
   SERVERDATA_AUTH_RESPONSE = 2

data/lib/steam/packets/rcon/rcon_packet_factory.rb

@@ -3,16 +3,15 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'stringio_additions'
 require 'exceptions/packet_format_exception'
 require 'steam/packets/steam_packet_factory'
 require 'steam/packets/rcon/rcon_auth_response'
 require 'steam/packets/rcon/rcon_exec_response'
 
-class RCONPacketFactory < SteamPacketFactory
+module RCONPacketFactory
 
-  include AbstractClass
+  include SteamPacketFactory
 
   def self.packet_from_data(raw_data)
     byte_buffer = StringIO.new raw_data

data/lib/steam/packets/s2a_info2_packet.rb

@@ -7,11 +7,13 @@ require 'steam/packets/s2a_info_base_packet'
 
 # The S2A_INFO2_Packet class represents the response to a A2A_INFO
 # request send to a Source server.
-class S2A_INFO2_Packet < S2A_INFO_BasePacket
+class S2A_INFO2_Packet
+
+  include S2A_INFO_BasePacket
 
   # Creates a S2A_INFO2 response object based on the data received.
   def initialize(data)
-    super SteamPacket::S2A_INFO2_HEADER, data
+    super S2A_INFO2_HEADER, data
 
     @protocol_version = @content_data.byte
     @server_name = @content_data.cstring

data/lib/steam/packets/s2a_info_base_packet.rb

@@ -3,14 +3,13 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'steam/packets/steam_packet'
 
 # The S2A_INFO_BasePacket class represents the response to a A2S_INFO
 # request send to the server.
-class S2A_INFO_BasePacket < SteamPacket
+module S2A_INFO_BasePacket
 
-  include AbstractClass
+  include SteamPacket
 
   attr_reader :info_hash
 

data/lib/steam/packets/s2a_info_detailed_packet.rb

@@ -9,11 +9,13 @@ require "steam/packets/s2a_info_base_packet"
 # request send to a GoldSrc server.
 # This is deprecated by 10/24/2008 for GoldSrc servers. They use the same
 # format as Source servers (S2A_INFO2) now.
-class S2A_INFO_DETAILED_Packet < S2A_INFO_BasePacket
+class S2A_INFO_DETAILED_Packet
+
+  include S2A_INFO_BasePacket
 
   # Creates a S2A_INFO_DETAILED response object based on the data received.
   def initialize(data)
-    super SteamPacket::S2A_INFO_DETAILED_HEADER, data
+    super S2A_INFO_DETAILED_HEADER, data
 
     @game_ip = @content_data.cstring
     @server_name = @content_data.cstring

data/lib/steam/packets/s2a_player_packet.rb

@@ -7,7 +7,9 @@ require 'steam/packets/steam_packet'
 
 # The S2A_PLAYER_Packet class represents the response to a A2S_PLAYER
 # request send to the server.
-class S2A_PLAYER_Packet < SteamPacket
+class S2A_PLAYER_Packet
+
+  include SteamPacket
 
   attr_reader :player_hash
 
@@ -15,7 +17,7 @@ class S2A_PLAYER_Packet < SteamPacket
   def initialize(content_data)
     raise Exception.new('Wrong formatted S2A_PLAYER packet.') if content_data.nil?
 
-    super SteamPacket::S2A_PLAYER_HEADER, content_data
+    super S2A_PLAYER_HEADER, content_data
 
     # Ignore player count
     @content_data.byte

data/lib/steam/packets/s2a_rules_packet.rb

@@ -7,7 +7,9 @@ require 'steam/packets/steam_packet'
 
 # The S2A_RULES_Packet class represents the response to a A2S_RULES
 # request send to the server.
-class S2A_RULES_Packet < SteamPacket
+class S2A_RULES_Packet
+
+  include SteamPacket
 
   attr_reader :rules_hash
 

data/lib/steam/packets/s2c_challenge_packet.rb

@@ -7,7 +7,9 @@ require 'steam/packets/steam_packet'
 
 # The S2C_CHALLENGE_Packet class represents the response
 # to a A2S_SERVERQUERY_GETCHALLENGE request send to the server.
-class S2C_CHALLENGE_Packet < SteamPacket
+class S2C_CHALLENGE_Packet
+
+  include SteamPacket
 
   # Creates a AS2C_CHALLENGE response object based on the data received.
   def initialize(challenge_number)

data/lib/steam/packets/steam_packet.rb

@@ -6,7 +6,7 @@
 require 'stringio_additions'
 
 # This class represents a packet used by the Source query protocol
-class SteamPacket
+module SteamPacket
 
   A2A_ACK_HEADER = 0x6A
   A2A_PING_HEADER = 0x69

data/lib/steam/packets/steam_packet_factory.rb

@@ -5,7 +5,6 @@
 
 require 'zlib'
 
-require 'abstract_class'
 require 'exceptions/steam_condenser_exception'
 require 'steam/packets/s2a_info_detailed_packet'
 require 'steam/packets/a2s_info_packet'
@@ -22,13 +21,11 @@ require 'steam/packets/a2m_get_servers_batch2_packet'
 require 'steam/packets/m2a_server_batch_packet'
 require 'steam/packets/rcon/rcon_goldsrc_response'
 
-class SteamPacketFactory
-
-  include AbstractClass
+module SteamPacketFactory
 
   # Creates a new packet object based on the header byte of the given raw data
   def self.packet_from_data(raw_data)
-    header = raw_data[0].to_i
+    header = raw_data[0].ord
     data = raw_data[1..-1]
 
     case header

data/lib/steam/servers/game_server.rb

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'exceptions/steam_condenser_exception'
 require 'steam/steam_player'
 require 'steam/packets/a2s_info_packet'
@@ -16,9 +15,7 @@ require 'steam/packets/s2a_player_packet'
 require 'steam/packets/s2a_rules_packet'
 require 'steam/packets/s2c_challenge_packet'
 
-class GameServer
-
-  include AbstractClass
+module GameServer
 
   REQUEST_CHALLENGE = 0
   REQUEST_INFO = 1
@@ -134,7 +131,7 @@ class GameServer
       players.pop if is_a? GoldSrcServer
 
       players.each do |player|
-        player_data = split_player_status(player)
+        player_data = self.class.split_player_status(player)
         @player_hash[player_data[1]].add_info(*player_data) if @player_hash.key?(player_data[1])
       end
     end

data/lib/steam/servers/goldsrc_server.rb

@@ -6,7 +6,9 @@
 require 'steam/servers/game_server'
 require 'steam/sockets/goldsrc_socket'
 
-class GoldSrcServer < GameServer
+class GoldSrcServer
+
+  include GameServer
 
   # Splits the player status obtained with +rcon status+
   def self.split_player_status(player_status)

data/lib/steam/servers/source_server.rb

@@ -11,7 +11,9 @@ require 'steam/servers/game_server'
 require 'steam/sockets/rcon_socket'
 require 'steam/sockets/source_socket'
 
-class SourceServer < GameServer
+class SourceServer
+
+  include GameServer
 
   # Splits the player status obtained with +rcon status+
   def self.split_player_status(player_status)

data/lib/steam/sockets/goldsrc_socket.rb

@@ -10,7 +10,9 @@ require 'steam/sockets/steam_socket'
 
 # The SourceSocket class is a sub class of SteamSocket respecting the
 # specifications of the Source query protocol.
-class GoldSrcSocket < SteamSocket
+class GoldSrcSocket
+
+  include SteamSocket
 
   def initialize(ipaddress, port_number = 27015, is_hltv = false)
     super ipaddress, port_number
@@ -29,7 +31,7 @@ class GoldSrcSocket < SteamSocket
       begin
         # Parsing of split packet headers
         request_id = @buffer.long
-        packet_number_and_count = @buffer.byte.to_i
+        packet_number_and_count = @buffer.byte
         packet_count = packet_number_and_count & 0xF
         packet_number = (packet_number_and_count >> 4) + 1
 

data/lib/steam/sockets/master_server_socket.rb

@@ -5,7 +5,9 @@
 
 require 'steam/sockets/steam_socket'
 
-class MasterServerSocket < SteamSocket
+class MasterServerSocket
+
+  include SteamSocket
 
   def reply
     receive_packet 1500

data/lib/steam/sockets/rcon_socket.rb

@@ -9,7 +9,9 @@ require 'steam/packets/rcon/rcon_packet'
 require 'steam/packets/rcon/rcon_packet_factory'
 require 'steam/sockets/steam_socket'
 
-class RCONSocket < SteamSocket
+class RCONSocket
+
+  include SteamSocket
 
   def initialize(ip_address, port_number)
     super ip_address, port_number

data/lib/steam/sockets/source_socket.rb

@@ -8,7 +8,9 @@ require 'steam/sockets/steam_socket'
 
 # The SourceSocket class is a sub class of SteamSocket respecting the
 # specifications of the Source query protocol.
-class SourceSocket < SteamSocket
+class SourceSocket
+
+  include SteamSocket
 
   # Reads a packet from the channel. The Source query protocol specifies a
   # maximum packet size of 1400 byte. Greater packets will be split over several
@@ -24,8 +26,8 @@ class SourceSocket < SteamSocket
         # Parsing of split packet headers
         request_id = @buffer.long
         is_compressed = ((request_id & 0x80000000) != 0)
-        packet_count = @buffer.byte.to_i
-        packet_number = @buffer.byte.to_i + 1
+        packet_count = @buffer.byte
+        packet_number = @buffer.byte + 1
 
         if is_compressed
           @buffer.long

data/lib/steam/sockets/steam_socket.rb

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2008-2010, Sebastian Staudt
 
-require 'abstract_class'
 require 'datagram_channel'
 require 'ipaddr'
 require 'stringio_additions'
@@ -11,13 +10,11 @@ require 'exceptions/timeout_exception'
 
 # Defines common methods for sockets used to connect to game and master
 # servers.
-class SteamSocket
-
-  include AbstractClass
+module SteamSocket
 
   def initialize(*args)
     @channel = DatagramChannel.open
-    @channel.connect *args
+    @channel.connect(*args)
     @channel.configure_blocking false
 
     @remote_socket = Socket.getaddrinfo args[0].to_s, args[1]
@@ -32,7 +29,7 @@ class SteamSocket
     raise TimeoutException if select([@channel.socket], nil, nil, 1).nil?
 
     if buffer_length == 0
-      @buffer.truncate @buffer.size
+      @buffer.rewind
     else
       @buffer = StringIO.allocate buffer_length
     end

data/lib/stringio_additions.rb

@@ -12,7 +12,7 @@ class StringIO
   end
 
   def byte
-    read(1)[0]
+    read(1)[0].ord
   end
 
   def float

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: steam-condenser
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 11
-  - 3
-  version: 0.11.3
+  - 4
+  version: 0.11.4
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
+date: 2010-11-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/abstract_class.rb
 - lib/datagram_channel.rb
 - lib/exceptions/packet_format_exception.rb
 - lib/exceptions/rcon_ban_exception.rb

data/lib/abstract_class.rb

@@ -1,38 +0,0 @@
-# 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
-
-# This module is used to mimic the behavior of abstract classes known from other
-# object-oriented programming languages
-module AbstractClass
-  
-  # If this module is included in a class:
-  # * protect the constructor of the class
-  # * make sure every derived class has a constructor calling the super
-  #   constructor 
-  def self.included(klass)
-    klass.module_eval do
-      
-      class << self 
-        protected :new
-
-        # Each derived class gets a constructor calling the super constructor
-        def inherited(klass)
-          klass.module_eval do
-            
-            # The constructor for derived classes, simply calling the super
-            # constructor
-            def self.new(*args)
-              super
-            end
-            
-          end
-        end
-        
-      end
-      
-    end
-  end
- 
-end