gamespy_query 0.2.0pre10 → 0.2.0pre11

data/lib/gamespy_query/base.rb

@@ -106,20 +106,15 @@ STR
     # Convert string to UTF-8, stripping out all invalid/undefined characters
     # @param [String] str String to convert
     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.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(STR_UTF8, invalid: :replace, undef: :replace)
-      end
-=end
+      #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)
+    rescue nil, Exception => e
       # Fallback - convert to UTF and replace any invalid or undefined
+      Tools.log_exception e
       str.encode(STR_UTF8, invalid: :replace, undef: :replace)
     end
   end

data/lib/gamespy_query/master.rb

@@ -54,7 +54,7 @@ module GamespyQuery
     # @param [String] geo Geo String
     def get_server_list list = nil, include_data = false, geo = nil
       addrs = []
-      list = %x[gslist -p "#{geoip_path}"#{" #{geo}-X #{get_params}" if include_data} -n #{@game}] if list.nil?
+      list = %x[gslist -C -p "#{geoip_path}"#{" #{geo}-X #{get_params}" if include_data} -n #{@game}] if list.nil?
       if include_data
         addrs = handle_data(list, geo)
       else

data/lib/gamespy_query/socket_master.rb

@@ -29,7 +29,7 @@ module GamespyQuery
     def process! use_threads = DEFAULT_THREADS
       sockets = []
       if use_threads.to_i > 0
-        monitor = Monitor.new # TODO...
+        monitor = Monitor.new
         threads = []
         addrs_list = @addrs.each_slice(@addrs.size / use_threads).to_a
         use_threads.times.each do |i|
@@ -38,14 +38,18 @@ module GamespyQuery
           puts "Spawning thread #{i}" if @info
 
           threads << Thread.new(list, i) do |addrs, id|
-            puts "Thread: #{id} Start, #{addrs.size}" if @info
-            out = proc(addrs, monitor)
-
-            puts "Thread: #{id} Pushing output to list. #{out.size}" if @info
-            monitor.synchronize do
-              sockets += out
+            begin
+              puts "Thread: #{id} Start, #{addrs.size}" if @info
+              out = proc(addrs)
+
+              puts "Thread: #{id} Pushing output to list. #{out.size}" if @info
+              monitor.synchronize do
+                sockets += out
+              end
+              puts "Thread: #{id} End" if @info
+            ensure
+              ActiveRecord::Base.connection_pool.release_connection
             end
-            puts "Thread: #{id} End" if @info
           end
         end
         threads.each {|t| t.join}

data/lib/gamespy_query/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre10
+  version: 0.2.0pre11
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri