gamespy_query 0.2.0pre → 0.2.0pre2

data/lib/gamespy_query/base.rb

@@ -116,7 +116,8 @@ STR
       # Get UTF-8 string from string
       # @param [String] str
       def _encode_string(str)
-        (str + '  ').encode("UTF-8", invalid: :replace, undef: :replace)[0..-3]
+        #(str + '  ').encode("US-ASCII", invalid: :replace, undef: :replace)[0..-3]
+        str.bytes.to_a.pack("U*")
       end
     end
   end

data/lib/gamespy_query/master.rb

@@ -87,10 +87,14 @@ module GamespyQuery
         ip, port, content = $1, $2, $3
         content = content.split(STR_SPLIT)
         content << "" unless (content.size % 2 == 0)
-        i = 0
-        content.map! do |e|
-          i += 1
-          i % 2 == 0 ? e : encode_string(e)
+        game_data = {}
+        key = nil
+        content.each_with_index do |data, i|
+          if i % 2 == 0
+            key = data.to_sym
+          else
+            game_data[key] = data.is_a?(String) ? encode_string(data) : data
+          end
         end
         addr = "#{ip}:#{port}"
         if list.has_key?(addr)
@@ -103,9 +107,9 @@ module GamespyQuery
           list[addr] = e
         end
         if e[:gamedata]
-          e[:gamedata].merge!(Hash[*content])
+          e[:gamedata].merge!(game_data)
         else
-          e[:gamedata] = Hash[*content]
+          e[:gamedata] = game_data
         end
       end
       list

data/lib/gamespy_query/parser.rb

@@ -17,6 +17,9 @@ module GamespyQuery
     RX_PLAYER_HEADER = /\x01/
     RX_END = /\x00\x02$/
 
+    class UnsupportedFormat < StandardError
+    end
+
     # Packets to process
     attr_reader :packets
 
@@ -32,7 +35,7 @@ module GamespyQuery
       when Array
         packets
       else
-        raise "Unsupported format"
+        raise UnsupportedFormat, "Unsupported format: #{packets.class}"
       end
     end
 
@@ -100,7 +103,7 @@ module GamespyQuery
 
       packet.split(STR_SPLIT).each_with_index do |data, index|
         if (index % 2) == 0
-          key = encode_string data
+          key = data.to_sym
         else
           game_data[key] = data.is_a?(String) ? encode_string(data) : data
         end

data/lib/gamespy_query/socket.rb

@@ -74,7 +74,7 @@ module GamespyQuery
             @s.recvfrom(RECEIVE_SIZE)
           end
         rescue Timeout::Error
-          raise TimeoutError
+          raise TimeoutError, "TimeOut on #{self}"
         ensure
           @s.close
         end
@@ -108,22 +108,10 @@ module GamespyQuery
     # Maximum receive size
     RECEIVE_SIZE = 1500
 
-    STR_HOSTNAME = "hostname"
-    STR_PLAYERS = "players"
-    STR_DEATHS = "deaths_\x00\x00"
-    STR_PLAYER = "player_\x00\x00"
-    STR_TEAM = "team_\x00\x00"
-    STR_SCORE = "score_\x00\x00"
-
-    SPLIT = STR_X0
-    STR_END = "\x00\x02"
     STR_EMPTY = Tools::STR_EMPTY
     STR_BLA = "%c%c%c%c".encode("ASCII-8BIT")
     STR_GARBAGE = "\x00\x04\x05\x06\a"
 
-    RX_PLAYER_EMPTY = /^player_\x00\x00\x00/
-    RX_PLAYER_INFO = /\x01(team|player|score|deaths)_.(.)/ # \x00 from previous packet, \x01 from continueing player info, (.) - should it overwrite previous value?
-
     RX_NO_CHALLENGE = /0@0$/
     RX_CHALLENGE = /0@/
     RX_CHALLENGE2 = /[^0-9\-]/si
@@ -180,7 +168,7 @@ module GamespyQuery
             self.puts self.needs_challenge ? BASE_PACKET + @id_packet + self.needs_challenge + FULL_INFO_PACKET_MP : BASE_PACKET + @id_packet + FULL_INFO_PACKET_MP
             self.state = STATE_SENT_CHALLENGE_RESPONSE
           else
-            raise NotInWriteState, "NotInWriteState"
+            raise NotInWriteState, "NotInWriteState, #{self}"
         end
       rescue NotInWriteState => e
         r = false
@@ -237,7 +225,7 @@ module GamespyQuery
               close unless closed?
             end
           else
-            raise NotInReadState, "NotInReadState"
+            raise NotInReadState, "NotInReadState, #{self}"
         end
       rescue NotInReadState => e
         r = false
@@ -308,9 +296,9 @@ module GamespyQuery
       data = parser.parse
 
       game_data.merge!(data[:game])
-      game_data["players"] = Parser.pretty_player_data2(data[:players]).sort {|a, b| a[:name].downcase <=> b[:name].downcase }
+      game_data[:players] = Parser.pretty_player_data2(data[:players]).sort {|a, b| a[:name].downcase <=> b[:name].downcase }
 
-      game_data["ping"] = @ping unless @ping.nil?
+      game_data[:ping] = @ping unless @ping.nil?
 
       game_data
     end
@@ -325,13 +313,13 @@ module GamespyQuery
             if IO.select(nil, [self], nil, DEFAULT_TIMEOUT)
               handle_write
             else
-              raise TimeOutError, "TimeOut"
+              raise TimeOutError, "TimeOut during write, #{self}"
             end
           else
             if IO.select([self], nil, nil, DEFAULT_TIMEOUT)
               handle_read
             else
-              raise TimeOutError, "TimeOut"
+              raise TimeOutError, "TimeOut during read, #{self}"
             end
           end
         end

data/lib/gamespy_query/version.rb

@@ -1,4 +1,4 @@
 module GamespyQuery
   # Version of the library
-  VERSION = "0.2.0pre"
+  VERSION = "0.2.0pre2"
 end

data/test/units/socket_test.rb

@@ -38,7 +38,7 @@ context "Socket" do
     asserts("Is a hash") { topic }.is_a?(Hash)
 
     context "Players" do
-      setup { topic["players"] }
+      setup { topic[:players] }
       asserts("Players defined") { topic }.is_a?(Hash)
 
       context "Player 0" do
@@ -60,9 +60,9 @@ context "Socket" do
       end
 
     end
-    asserts("Hostname defined") { topic["hostname"] }.is_a?(String)
-    asserts("Hostname") { topic["hostname"] }.equals "-=WASP=- Warfare CO (Prime)"
-    asserts("Modhash") { topic["modhash"] }.equals "PMC v. 1.01;BAF v. 1.02;da39a3ee5e6b4b0d3255bfef95601890afd80709;"
+    asserts("Hostname defined") { topic[:hostname] }.is_a?(String)
+    asserts("Hostname") { topic[:hostname] }.equals "-=WASP=- Warfare CO (Prime)"
+    asserts("Modhash") { topic[:modhash] }.equals "PMC v. 1.01;BAF v. 1.02;da39a3ee5e6b4b0d3255bfef95601890afd80709;"
   end
 
   # TODO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre
+  version: 0.2.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &7261020 !ruby/object:Gem::Requirement
+  requirement: &15149120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7261020
+  version_requirements: *15149120
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &7260060 !ruby/object:Gem::Requirement
+  requirement: &15148220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7260060
+  version_requirements: *15148220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7259340 !ruby/object:Gem::Requirement
+  requirement: &15147420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7259340
+  version_requirements: *15147420
 description: ''
 email:
 - sb@dev-heaven.net