gamespy_query 0.2.0pre3 → 0.2.0pre4

data/lib/gamespy_query/base.rb

@@ -106,12 +106,19 @@ STR
     def encode_string(str)
       #Tools.debug {"Getting string #{str}"}
       #System::Text::Encoding.UTF8.GetString(System::Array.of(System::Byte).new(str.bytes.to_a)).to_s # #  begin; System::Text::Encoding.USASCII.GetString(reply[0]).to_s; rescue nil, Exception => e; Tools.log_exception(e); reply[0].map {|e| e.chr}.join; end
+      # TODO: Temporary disabled due to issues with the encoded strings
+=begin
       begin
-        str.bytes.to_a.pack('C*').force_encoding(STR_UTF8)
+        # str.force_encoding(STR_UTF8)
+        (str + '  ').encode(STR_UTF8, STR_UTF8, invalid: :replace, undef: :replace)[0..-3]
       rescue nil, Exception => e
+        # Fallback - convert to UTF and replace any invalid or undefined
         Tools.log_exception e
-        str.encode("UTF-8", invalid: :replace, undef: :replace)
+        str.encode(STR_UTF8, invalid: :replace, undef: :replace)
       end
+=end
+      # Fallback - convert to UTF and replace any invalid or undefined
+      str.encode(STR_UTF8, invalid: :replace, undef: :replace)
     end
   end
 

data/lib/gamespy_query/parser.rb

@@ -75,7 +75,7 @@ module GamespyQuery
       end
 
       # Parse player_data
-      data[:players] = parse_player_data(encode_string player_data)
+      data[:players] = parse_player_data(player_data)
 
       data
     end
@@ -165,7 +165,7 @@ module GamespyQuery
           # Parse the data - \x00 is printed after a non-nil entry, otherwise \x00 means nil (e.g empty team)
           until str.empty?
             entry = str[RX_X0_SPEC]
-            player_data[player_data.keys[i]] << encode_string(entry.sub(STR_X0, STR_EMPTY))
+            player_data[player_data.keys[i]] << entry.sub(STR_X0, STR_EMPTY)
             str.sub!(entry, STR_EMPTY)
           end
 
@@ -178,11 +178,11 @@ module GamespyQuery
               next # ignore
             else
               if overwrite
-                new_player_data[-1] = info # Overwrite latest entry
+                new_player_data[-1] = encode_string(info) # Overwrite latest entry
                 overwrite = false # done the overwrite
               else
                 #break if new_player_data.size == num_players
-                new_player_data << info # insert entry
+                new_player_data << encode_string(info) # insert entry
               end
             end
           end

data/lib/gamespy_query/socket.rb

@@ -247,7 +247,6 @@ module GamespyQuery
 
     # Fetch all packets from socket
     def fetch
-      Tools.debug {"FUCK ME"}
       pings = []
       r = self.data
       begin

data/lib/gamespy_query/version.rb

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

data/test/units/parser_test.rb

@@ -1,13 +1,13 @@
 require 'teststrap'
 
 context "Parser" do
-  DEFAULT_DATA = [
+  default_data = [
     "\x00\x04\x05\x06\asplitnum\x00\x00\x00gamever\x001.59.79548\x00hostname\x00-=WASP=- Warfare CO (Prime)\x00mapname\x00takistan\x00gametype\x00CTI\x00numplayers\x0046\x00numteams\x000\x00maxplayers\x0054\x00gamemode\x00openplaying\x00timelimit\x0015\x00password\x000\x00param1\x000\x00param2\x000\x00currentVersion\x00159\x00requiredVersion\x00159\x00mod\x00Arma 2;Arma 2: Operation Arrowhead;Arma 2: British Armed Forces (Lite);Arma 2: Private Military Company (Lite)\x00equalModRequired\x000\x00gameState\x007\x00dedicated\x001\x00platform\x00linux\x00language\x0065545\x00difficulty\x002\x00mission\x00[54] Warfare BE V2.069 - Takistan\x00gamename\x00arma2oapc\x00sv_battleye\x001\x00verifySignatures\x001\x00signatures\x00bi;WarFXPE;GLT_ADDONS;warFXsunlight;TGW_Zeroing;trsm_oa;soa110;SMK;jsrsfa;v2ECL;CBA_v0-7-3;ZEU_test;TRSM;TracersWAR;bi2;VopSound;cba_b158;acex_sm;WarFXLighting;gdtmod_plants2;TGW_Thermal;cba_b151;ASR;...\x00modhash\x00PMC v. 1.01;BAF v. 1.02;da39a3ee5e6b4b0d3255bfef95601890afd80709;\x00hash\x00f8c806b971abb935747da3900cab55599c0bc60c\x00\x00\x01player_\x00\x00Skilllos\x00Cool Hand\x00Viktor Reznov\x00Alchemist(HUN)\x00General Heinkel [GER]\x00Max\x00\xD0\x94\xD1\x80\xD0\xBE\xD0\xBD\xD0\xB3\xD0\xBE\x00letchik\x00Angerbode\x00TiDus\x00DrHat\x00Kermit\x00[UaS] snicka\x00Wedel\x00Dnalir [NOR]\x00Davor\x00Cateye(GER)\x00Bamse\x00Jorj\x00POMbI4\x00Daredevil\x00DrSMOKE\x00Vollpfosten\x00Maddin\x00-=[LRRP]=-Sentinel(NL)\x00Husky\x00Scumhawk\x00Bone-CH\x00Jarzah\x00I./KG40_Razor\x00Cpl.Bouiss\x00nAh\x00Tremor\x00Diamm\x00TUROCK_(FR-VODKA)\x00j.moss\x00FOKS\x00Phoenix\x00AfterShave\x00Coupe\x00Mitradis\x00Daniel\x00Flanker\x00Sig\x00_DPVf_hinkel\x00Random Sequence\x00\x00team_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00Ru\x00SO\x00\x00\x00\x00\x00\x00\x00\x00TF\x00\x00\x00\x00UTGPrivates\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00score_\x00\x00",
     "\x00\x04\x05\x06\asplitnum\x00\x81\x01score_\x00\x00371\x00314\x00335\x0038\x00224\x0036\x0096\x0083\x0042\x00237\x0037\x00137\x00212\x0082\x0041\x0042\x0035\x0073\x0094\x0028\x00127\x0045\x00107\x0030\x00-2\x0083\x002\x0026\x0023\x0034\x0010\x0056\x0016\x006\x0036\x001\x000\x001\x000\x003\x000\x002\x001\x000\x0020\x000\x00\x00deaths_\x00\x0024\x0017\x0018\x0015\x0028\x0025\x0027\x0029\x007\x0010\x008\x0011\x008\x0011\x0016\x0015\x0016\x006\x0010\x0023\x0038\x003\x0017\x003\x002\x007\x002\x001\x004\x0014\x002\x004\x002\x000\x0019\x005\x001\x004\x004\x000\x003\x002\x000\x000\x008\x000\x00\x00\x00\x02\x00"
   ]
-  setup { GamespyQuery::Parser.new(DEFAULT_DATA) }
+  setup { GamespyQuery::Parser.new(default_data) }
 
-  asserts("Packets assigned") { topic.packets }.same_elements DEFAULT_DATA
+  asserts("Packets assigned") { topic.packets }.same_elements default_data
 
   context "Parsed Output" do
     setup { topic.parse }

data/test/units/socket_test.rb

@@ -1,7 +1,7 @@
 require 'teststrap'
 
 context "Socket" do
-  DEFAULT_DATA = [
+  default_data = [
       "\x00\x04\x05\x06\asplitnum\x00\x00\x00gamever\x001.59.79548\x00hostname\x00-=WASP=- Warfare CO (Prime)\x00mapname\x00takistan\x00gametype\x00CTI\x00numplayers\x0046\x00numteams\x000\x00maxplayers\x0054\x00gamemode\x00openplaying\x00timelimit\x0015\x00password\x000\x00param1\x000\x00param2\x000\x00currentVersion\x00159\x00requiredVersion\x00159\x00mod\x00Arma 2;Arma 2: Operation Arrowhead;Arma 2: British Armed Forces (Lite);Arma 2: Private Military Company (Lite)\x00equalModRequired\x000\x00gameState\x007\x00dedicated\x001\x00platform\x00linux\x00language\x0065545\x00difficulty\x002\x00mission\x00[54] Warfare BE V2.069 - Takistan\x00gamename\x00arma2oapc\x00sv_battleye\x001\x00verifySignatures\x001\x00signatures\x00bi;WarFXPE;GLT_ADDONS;warFXsunlight;TGW_Zeroing;trsm_oa;soa110;SMK;jsrsfa;v2ECL;CBA_v0-7-3;ZEU_test;TRSM;TracersWAR;bi2;VopSound;cba_b158;acex_sm;WarFXLighting;gdtmod_plants2;TGW_Thermal;cba_b151;ASR;...\x00modhash\x00PMC v. 1.01;BAF v. 1.02;da39a3ee5e6b4b0d3255bfef95601890afd80709;\x00hash\x00f8c806b971abb935747da3900cab55599c0bc60c\x00\x00\x01player_\x00\x00Skilllos\x00Cool Hand\x00Viktor Reznov\x00Alchemist(HUN)\x00General Heinkel [GER]\x00Max\x00\xD0\x94\xD1\x80\xD0\xBE\xD0\xBD\xD0\xB3\xD0\xBE\x00letchik\x00Angerbode\x00TiDus\x00DrHat\x00Kermit\x00[UaS] snicka\x00Wedel\x00Dnalir [NOR]\x00Davor\x00Cateye(GER)\x00Bamse\x00Jorj\x00POMbI4\x00Daredevil\x00DrSMOKE\x00Vollpfosten\x00Maddin\x00-=[LRRP]=-Sentinel(NL)\x00Husky\x00Scumhawk\x00Bone-CH\x00Jarzah\x00I./KG40_Razor\x00Cpl.Bouiss\x00nAh\x00Tremor\x00Diamm\x00TUROCK_(FR-VODKA)\x00j.moss\x00FOKS\x00Phoenix\x00AfterShave\x00Coupe\x00Mitradis\x00Daniel\x00Flanker\x00Sig\x00_DPVf_hinkel\x00Random Sequence\x00\x00team_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00Ru\x00SO\x00\x00\x00\x00\x00\x00\x00\x00TF\x00\x00\x00\x00UTGPrivates\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00score_\x00\x00",
       "\x00\x04\x05\x06\asplitnum\x00\x81\x01score_\x00\x00371\x00314\x00335\x0038\x00224\x0036\x0096\x0083\x0042\x00237\x0037\x00137\x00212\x0082\x0041\x0042\x0035\x0073\x0094\x0028\x00127\x0045\x00107\x0030\x00-2\x0083\x002\x0026\x0023\x0034\x0010\x0056\x0016\x006\x0036\x001\x000\x001\x000\x003\x000\x002\x001\x000\x0020\x000\x00\x00deaths_\x00\x0024\x0017\x0018\x0015\x0028\x0025\x0027\x0029\x007\x0010\x008\x0011\x008\x0011\x0016\x0015\x0016\x006\x0010\x0023\x0038\x003\x0017\x003\x002\x007\x002\x001\x004\x0014\x002\x004\x002\x000\x0019\x005\x001\x004\x004\x000\x003\x002\x000\x000\x008\x000\x00\x00\x00\x02\x00"
   ]
@@ -10,15 +10,15 @@ context "Socket" do
 
   denies("Confirm valid") { topic.valid? }
 
-  asserts("handle_write") { topic.state = 0; topic.handle_write }.nil
-  asserts("handle_read") { topic.state = 1; topic.handle_read }.nil
-  asserts("handle_write") { topic.state = 2; topic.handle_write }.nil
-  asserts("handle_read") { topic.state = 3; topic.handle_read }.nil
-  asserts("handle_read") { topic.state = 4; topic.handle_read }.nil
+  #asserts("handle_write") { topic.state = 0; topic.handle_write }.nil
+  #asserts("handle_read") { topic.state = 1; topic.handle_read }.nil
+  #asserts("handle_write") { topic.state = 2; topic.handle_write }.nil
+  #asserts("handle_read") { topic.state = 3; topic.handle_read }.nil
+  #asserts("handle_read") { topic.state = 4; topic.handle_read }.nil
   asserts("Set state 5, confirm valid") { topic.state = 5; topic.valid? }
 
-  denies("handle_write") { topic.state = 1; topic.handle_write }
-  denies("handle_read") { topic.state = 0; topic.handle_read }
+  #denies("handle_write") { topic.state = 1; topic.handle_write }
+  #denies("handle_read") { topic.state = 0; topic.handle_read }
 
 
   # TODO
@@ -34,7 +34,7 @@ context "Socket" do
   asserts("sync") { topic.sync }
 
   context "Sync custom" do
-    setup { topic.sync(DEFAULT_DATA) }
+    setup { topic.sync(default_data) }
     asserts("Is a hash") { topic }.is_a?(Hash)
 
     context "Players" do
@@ -46,8 +46,8 @@ context "Socket" do
 
         asserts("name") { topic[:name] }.equals "-=[LRRP]=-Sentinel(NL)"
         asserts("team") { topic[:team] }.equals ""
-        asserts("score") { topic[:score] }.equals -2
-        asserts("deaths") { topic[:deaths] }.equals 2
+        asserts("score") { topic[:score] }.equals "-2"
+        asserts("deaths") { topic[:deaths] }.equals "2"
       end
 
       context "Player 10" do
@@ -55,8 +55,8 @@ context "Socket" do
 
         asserts("name") { topic[:name] }.equals "Coupe"
         asserts("team") { topic[:team] }.equals ""
-        asserts("score") { topic[:score] }.equals 3
-        asserts("deaths") { topic[:deaths] }.equals 0
+        asserts("score") { topic[:score] }.equals "3"
+        asserts("deaths") { topic[:deaths] }.equals "0"
       end
 
     end
@@ -66,8 +66,10 @@ context "Socket" do
   end
 
   # TODO
+=begin
   context "MultiSocket" do
     setup { GamespyQuery::MultiSocket }
 
   end
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre3
+  version: 0.2.0pre4
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &10524320 !ruby/object:Gem::Requirement
+  requirement: &19620600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10524320
+  version_requirements: *19620600
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &10523880 !ruby/object:Gem::Requirement
+  requirement: &19619540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10523880
+  version_requirements: *19619540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &10523420 !ruby/object:Gem::Requirement
+  requirement: &19618960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10523420
+  version_requirements: *19618960
 description: ''
 email:
 - sb@dev-heaven.net