gamespy_query 0.2.0pre12 → 0.2.0pre13

data/lib/gamespy_query/base.rb

@@ -105,13 +105,13 @@ STR
 
     # Convert string to UTF-8, stripping out all invalid/undefined characters
     # @param [String] str String to convert
-    def encode_string(str)
+    def encode_string(str, alt = false)
       #if RUBY_PLATFORM =~ PLATFORM_IR
       #  System::Text::Encoding.UTF8.GetString(System::Array.of(System::Byte).new(str.bytes.to_a)).to_s
       #else
       #  str.encode(STR_UTF8, STR_UTF8, invalid: :replace, undef: :replace)
       #end
-      str.encode(STR_UTF8, STR_UTF8, invalid: :replace, undef: :replace)
+      alt ? str.encode(STR_UTF8, invalid: :replace, undef: :replace) : str.encode(STR_UTF8, STR_UTF8, invalid: :replace, undef: :replace)
     rescue nil, Exception => e
       # Fallback - convert to UTF and replace any invalid or undefined
       Tools.log_exception e

data/lib/gamespy_query/master.rb

@@ -106,7 +106,7 @@ module GamespyQuery
           if i % 2 == 0
             key = data.to_sym
           else
-            game_data[key] = data.is_a?(String) ? encode_string(data) : data
+            game_data[key] = data
           end
         end
         addr = "#{ip}:#{port}"

data/lib/gamespy_query/parser.rb

@@ -69,13 +69,13 @@ module GamespyQuery
             player_data += packets[1]
           else
             # GameData-only
-            data[:game].merge!(parse_game_data(packet))
+            data[:game].merge! parse_game_data( encode_string(packet, true) )
           end
         end
       end
 
       # Parse player_data
-      data[:players] = parse_player_data(player_data)
+      data[:players] = parse_player_data( encode_string(player_data, true) )
 
       data
     end
@@ -105,7 +105,7 @@ module GamespyQuery
         if (index % 2) == 0
           key = data.to_sym
         else
-          game_data[key] = data.is_a?(String) ? encode_string(data) : data
+          game_data[key] = data
         end
       end
 
@@ -178,11 +178,11 @@ module GamespyQuery
               next # ignore
             else
               if overwrite
-                new_player_data[-1] = encode_string(info) # Overwrite latest entry
+                new_player_data[-1] = info # Overwrite latest entry
                 overwrite = false # done the overwrite
               else
                 #break if new_player_data.size == num_players
-                new_player_data << encode_string(info) # insert entry
+                new_player_data << info # insert entry
               end
             end
           end

data/lib/gamespy_query/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre12
+  version: 0.2.0pre13
   prerelease: 5
 platform: ruby
 authors: