gamespy_query 0.1.1 → 0.1.2

data/lib/gamespy_query/parser.rb

@@ -69,9 +69,7 @@ module GamespyQuery
       end
 
       # Parse player_data
-      unless player_data.empty?
-        data[:players] = parse_player_data(player_data)
-      end
+      data[:players] = parse_player_data(player_data)
 
       data
     end
@@ -137,7 +135,7 @@ module GamespyQuery
             # This will add the broken info header to the previous info list (name for team, team for score, score for deaths)
             # However the resulting arrays are limited to num_players, so the info is discared anyway.
             # TODO: Cleaner implementation!
-            data =~ /(^|[^\x01])#{str}_\x00\x00/ ? STR_X0 : :"#{str}_\x00\x00"
+            data =~ /(^|[^\x01])#{Regexp.escape(str)}_\x00\x00/ ? STR_X0 : :"#{str}_\x00\x00"
           else
             STR_SIX_X0
           end

data/lib/gamespy_query/socket.rb

@@ -26,7 +26,7 @@ module GamespyQuery
 
     def socket_close(*params)
       Tools.debug {"Closing socket #{params}"}
-      _socket_close(*params)
+      @s.close
     end
 
     if RUBY_PLATFORM =~ /mswin32/
@@ -48,10 +48,8 @@ module GamespyQuery
         @s.Receive(@ip_end_point)
       end
 
-      def _socket_close
-        @s.close
-      end
     else
+
       def _create_socket(host, port)
         @s = UDPSocket.new
         @s.connect(host, port)
@@ -67,22 +65,21 @@ module GamespyQuery
             @s.recvfrom(RECEIVE_SIZE)
           end
         rescue Timeout::Error
-          #socket_close
           raise TimeoutError
+        ensure
+          @s.close
         end
       end
-
-      def _socket_close
-        @s.close
-      end
     end
   end
 
   class Socket < UDPSocket
+    include Funcs
+
     DEFAULT_TIMEOUT = 3
     MAX_PACKETS = 7
 
-    ID_PACKET = [0x04, 0x05, 0x06, 0x07].pack("c*") # TODO: Randomize
+    ID_PACKET = [0x04, 0x05, 0x06, 0x07].pack("c*") # TODO: Randomize?
     BASE_PACKET = [0xFE, 0xFD, 0x00].pack("c*")
     CHALLENGE_PACKET = [0xFE, 0xFD, 0x09].pack("c*")
 
@@ -116,7 +113,6 @@ module GamespyQuery
 
     # TODO: Support pings
     # TODO: Handle .NET native sockets
-    include Funcs
     STATE_INIT, STATE_SENT_CHALLENGE, STATE_RECEIVED_CHALLENGE, STATE_SENT_CHALLENGE_RESPONSE, STATE_RECEIVE_DATA, STATE_READY = 0, 1, 2, 3, 4, 5
 
     attr_accessor :addr, :data, :state, :stamp, :needs_challenge, :max_packets, :failed
@@ -142,7 +138,7 @@ module GamespyQuery
         case self.state
           when STATE_INIT
             Tools.debug {"Write (0): #{self.inspect}"}
-            # Send Challenge
+            # Send Challenge request
             self.puts @packet
             self.state = STATE_SENT_CHALLENGE
           when STATE_RECEIVED_CHALLENGE
@@ -257,7 +253,7 @@ module GamespyQuery
     # Supports challenge/response and multi-packet
     def sync reply = self.fetch
       game_data, key = {}, nil
-      return game_data if reply.nil?
+      return game_data if reply.nil? || reply.empty?
 
       parser = Parser.new(reply)
       data = parser.parse

data/lib/gamespy_query/version.rb

@@ -1,3 +1,3 @@
 module GamespyQuery
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: