steam-condenser 0.10.0 → 0.10.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 10 
-:patch: 0
+:minor: 10
+:patch: 1

data/lib/steam/community/cacheable.rb

@@ -45,9 +45,9 @@ module Cacheable
     # Otherwise a new object is created.
     # Overrides the default constructor.
     def new(id, fetch = true, bypass_cache = false)
-      if cached?(id) and !bypass_cache
+      if cached?(id) && !bypass_cache
         object = class_variable_get(:@@cache)[id]
-        object.fetch_data if fetch and !object.fetched?
+        object.fetch if fetch && !object.fetched?
         object
       else
         super(id, fetch)

data/lib/steam/community/steam_group.rb

@@ -55,7 +55,7 @@ class SteamGroup
         @group_id64 = member_data.elements['groupID64'].text.to_i
       end
       total_pages = member_data.elements['totalPages'].text.to_i
-    
+
       member_data.elements['members'].elements.each do |member|
         @members << SteamId.new(member.text.to_i, false)
       end
@@ -78,10 +78,10 @@ class SteamGroup
   end
 
   # Returns the members of this group
-  # Calls +fetch_members+ if the members haven't been fetched already.
+  # Calls +fetch+ if the members haven't been fetched already.
   def members
-    fetch_members if @members.nil? or @members[0].nil?
+    fetch if @members.nil? || @members[0].nil?
     @members
   end
-  
-end
+
+end

data/lib/steam/community/steam_id.rb

@@ -94,6 +94,10 @@ class SteamId
       raise SteamCondenserException.new(profile.elements['error'].text)
     end
 
+    @nickname         = profile.elements['steamID'].text
+    @steam_id64       = profile.elements['steamID64'].text.to_i
+    @vac_banned       = (profile.elements['vacBanned'].text == 1)
+
     unless REXML::XPath.first(profile, 'privacyMessage').nil?
       raise SteamCondenserException.new(profile.elements['privacyMessage'].text)
     end
@@ -102,9 +106,6 @@ class SteamId
     @online_state     = profile.elements['onlineState'].text
     @privacy_state    = profile.elements['privacyState'].text
     @state_message    = profile.elements['stateMessage'].text
-    @nickname         = profile.elements['steamID'].text
-    @steam_id64       = profile.elements['steamID64'].text.to_i
-    @vac_banned       = (profile.elements['vacBanned'].text == 1)
     @visibility_state = profile.elements['visibilityState'].text.to_i
 
     # Only public profiles can be scanned for further information

data/lib/steam/packets/s2a_info2_packet.rb

@@ -28,17 +28,21 @@ class S2A_INFO2_Packet < S2A_INFO_BasePacket
     @secure = @content_data.get_byte == 1
     @game_version = @content_data.get_string
     extra_data_flag = @content_data.get_byte
-    
-    if extra_data_flag & 0x80
+
+    unless extra_data_flag & 0x80 == 0
       @server_port = @content_data.get_short
     end
-    
-    if extra_data_flag & 0x40
+
+    unless extra_data_flag & 0x10 == 0
+      @server_id =  @content_data.get_long | (@content_data.get_long << 32)
+    end
+
+    unless extra_data_flag & 0x40 == 0
       @tv_port = @content_data.get_short
       @tv_name = @content_data.get_string
-    end   
-    
-    if extra_data_flag & 0x20
+    end
+
+    unless extra_data_flag & 0x20 == 0
       @server_tags = @content_data.get_string
     end
   end

data/lib/steam/packets/s2a_rules_packet.rb

@@ -29,7 +29,6 @@ class S2A_RULES_Packet < SteamPacket
       break if rule.empty? or value.empty?
 
       @rules_hash[rule] = value
-      puts "#{rule} = #{value}"
     end
   end
 

data/lib/steam/packets/steam_packet.rb

@@ -31,16 +31,8 @@ class SteamPacket
   end
 
   # Returns a packed string representing the packet's data
-  #
-  # TODO Has to automatically split packets greater than 1400 bytes
   def to_s
-    packet_data = [0xFF, 0xFF, 0xFF].pack("ccc")
-
-    unless @split_packet
-      packet_data << [0xFF].pack("c")
-    else
-      packet_data << [0xFE].pack("c")
-    end
+    packet_data = [0xFF, 0xFF, 0xFF, 0xFF].pack("cccc")
 
     return packet_data << [@header_data, @content_data.array].pack("ca*")
   end

data/lib/steam/servers/game_server.rb

@@ -122,11 +122,11 @@ class GameServer
       end
       
       unless response_packet.kind_of? expected_response
-        warn "Expected #{expected_response}, got #{response_packet.class}."
+        puts "Expected #{expected_response}, got #{response_packet.class}." if $DEBUG
         self.handle_response_for_request(request_type, false) if repeat_on_failure
       end
     rescue TimeoutException
-      warn "Expected #{expected_response}, but timed out."
+      puts "Expected #{expected_response}, but timed out." if $DEBUG
     end
   end
   
@@ -193,7 +193,7 @@ class GameServer
     
     if @player_hash != nil
       return_string << "Players:\n"
-      @player_hash.each do |player|
+      @player_hash.each_value do |player|
         return_string << "  #{player}\n"
       end
     end

data/lib/steam/sockets/goldsrc_socket.rb

@@ -35,9 +35,9 @@ class GoldSrcSocket < SteamSocket
         
         # Caching of split packet data
         split_packets[packet_number - 1] = @buffer.get
-        
-        warn "Received packet #{packet_number} of #{packet_count} for request ##{request_id}"
-        
+
+        puts "Received packet #{packet_number} of #{packet_count} for request ##{request_id}" if $DEBUG
+
         # Receiving the next packet
         if split_packets.size < packet_count
           begin
@@ -55,9 +55,9 @@ class GoldSrcSocket < SteamSocket
     else
       packet = SteamPacketFactory.get_packet_from_data(@buffer.get)
     end
-    
-    warn "Got reply of type \"#{packet.class.to_s}\"."
-    
+
+    puts "Got reply of type \"#{packet.class.to_s}\"." if $DEBUG
+
     return packet
   end
   

data/lib/steam/sockets/source_socket.rb

@@ -36,8 +36,8 @@ class SourceSocket < SteamSocket
 
         # Caching of split packet data
         split_packets[packet_number - 1] = @buffer.get
-        
-        warn "Received packet #{packet_number} of #{packet_count} for request ##{request_id}"
+
+        puts "Received packet #{packet_number} of #{packet_count} for request ##{request_id}" if $DEBUG
 
         # Receiving the next packet
         if split_packets.size < packet_count
@@ -61,9 +61,9 @@ class SourceSocket < SteamSocket
     end
 
     if is_compressed
-      warn "Got compressed reply of type \"#{packet.class.to_s}\"."
+      puts "Got compressed reply of type \"#{packet.class.to_s}\"." if $DEBUG
     else
-      warn "Got reply of type \"#{packet.class.to_s}\"."
+      puts "Got reply of type \"#{packet.class.to_s}\"." if $DEBUG
     end
     
     return packet

data/lib/steam/sockets/steam_socket.rb

@@ -47,8 +47,8 @@ class SteamSocket
   end
   
   def send(data_packet)
-    warn "Sending data packet of type \"#{data_packet.class.to_s}\"."
-    
+    puts "Sending data packet of type \"#{data_packet.class.to_s}\"." if $DEBUG
+
     @buffer = ByteBuffer.wrap(data_packet.to_s)
     @channel.write(@buffer)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Sebastian Staudt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +01:00
+date: 2010-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: []