arya-pandemic 0.3.2 → 0.3.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('pandemic', '0.3.2') do |p|
+Echoe.new('pandemic', '0.3.3') do |p|
   p.description    = "Distribute MapReduce to any of the workers and it will spread, like a pandemic."
   p.url            = "https://github.com/arya/pandemic/"
   p.author         = "Arya Asemanfar"

data/lib/pandemic/client_side/cluster_connection.rb

@@ -40,19 +40,28 @@ module Pandemic
         @connection_proxies[key]
       end
       
-      def request(body, key = nil)
+      def request(body, key = nil, options = {})
         with_connection(key) do |socket|
           begin
-            socket.write("#{body.size}\n#{body}")
+            flags = []
+            if options[:async]
+              flags << "a"
+            end
+            flags = flags.empty? ? "" : " #{flags.join("")}"
+            
+            socket.write("#{body.size}#{flags}\n#{body}")
             socket.flush
-            is_ready = IO.select([socket], nil, nil, @response_timeout)
-            raise NodeTimedOut if is_ready.nil?
-            response_size = socket.gets
-            if response_size
-              socket.read(response_size.strip.to_i)
-            else
-              # nil response size
-              raise LostConnectionToNode
+            
+            unless options[:async]
+              is_ready = IO.select([socket], nil, nil, @response_timeout)
+              raise NodeTimedOut if is_ready.nil?
+              response_size = socket.gets
+              if response_size
+                socket.read(response_size.strip.to_i)
+              else
+                # nil response size
+                raise LostConnectionToNode
+              end
             end
           rescue Errno::ECONNRESET
             raise LostConnectionToNode

data/lib/pandemic/client_side/connection_proxy.rb

@@ -7,9 +7,9 @@ module Pandemic
         @key, @cluster = key, cluster
       end
       
-      def request(body)
-        @cluster.request(body, @key)
-      end
+      def request(body, options = {})
+        @cluster.request(body, @key, options)
+      end      
     end
   end
 end

data/lib/pandemic/server_side/client.rb

@@ -1,6 +1,8 @@
 module Pandemic
   module ServerSide
     class Client
+      REQUEST_FLAGS = {:async => 'a'}
+      REQUEST_REGEXP = /^([0-9]+)(?: ([#{REQUEST_FLAGS.values.join('')}]*))?$/
       class DisconnectClient < Exception; end
       include Util
       
@@ -30,21 +32,24 @@ module Pandemic
                   @connection.close
                   @connection = nil
                   break
-                elsif request.strip! =~ /^([0-9]+)$/ # currently only asking for request size
-                  size = $1.to_i
+                elsif request.strip! =~ REQUEST_REGEXP
+                  size, flags = $1.to_i, $2.to_s.split("")
                   debug("Reading request body (size #{size})")
                   body = @connection.read(size)
                   debug("Finished reading request body")
+                  if flags.include?(REQUEST_FLAGS[:async])
+                    Thread.new { handle_request(body) }
+                  else
+                    response = handle_request(body)
                   
-                  response = handle_request(body)
+                    debug("Writing response to client")
                   
-                  debug("Writing response to client")
-                  
-                  # the connection could be closed, we'll let it be rescued if it is.
-                  @connection.write("#{response.size}\n#{response}")
-                  @connection.flush
+                    # the connection could be closed, we'll let it be rescued if it is.
+                    @connection.write("#{response.size}\n#{response}")
+                    @connection.flush
+                    debug("Finished writing response to client")
+                  end
                   @responded_requests += 1
-                  debug("Finished writing response to client")
                 end
               end
             rescue DisconnectClient

data/pandemic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pandemic}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arya-pandemic
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Arya Asemanfar