msgpack-rpc 0.1.2 → 0.1.4

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "RPC library using MessagePack, a ainary-based efficient dat
 RUBYFORGE_PROJECT = "msgpack"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.1.2"
+VERS              = "0.1.4"
 
 #REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 REV = nil

data/lib/msgpack/rpc.rb

@@ -165,18 +165,13 @@ class ClientSession
 
 	class BasicRequest
 		def initialize(session, loop)
-			@error  = nil
-			@result = nil
 			@session = session
 			@timeout = session.timeout
 			@loop = loop
 		end
 		attr_reader :loop
-		attr_accessor :result, :error
 
 		def call(err, res)
-			@error  = err
-			@result = res
 			@session = nil
 		end
 
@@ -197,6 +192,32 @@ class ClientSession
 		end
 	end
 
+	class AsyncRequest < BasicRequest
+		def initialize(session, loop)
+			super(session, loop)
+			@error  = nil
+			@result = nil
+		end
+		attr_accessor :result, :error
+
+		def call(err, res)
+			@error  = err
+			@result = res
+			@session = nil
+		end
+	end
+
+	class CallbackRequest < BasicRequest
+		def initialize(session, loop, block)
+			super(session, loop)
+			@block = block
+		end
+
+		def call(err, res)
+			@block.call(err, res)
+		end
+	end
+
 
 	def initialize(loop)
 		@sock = nil
@@ -212,11 +233,11 @@ class ClientSession
 	end
 
 	def send(method, *args)
-		send_real(method, args, BasicRequest.new(self,@loop))
+		send_real(method, args, AsyncRequest.new(self,@loop))
 	end
 
 	def callback(method, *args, &block)
-		send_real(method, args, block)
+		send_real(method, args, CallbackRequest.new(self,@loop,block))
 	end
 
 	def call(method, *args)
@@ -320,7 +341,7 @@ end
 class ServerSession
 	def initialize(obj, accept = obj.public_methods)
 		@obj = obj
-		@accept = accept.map {|m| m.to_s }
+		@accept = accept.map {|m| m.is_a?(Integer) ? m : m.to_s}
 	end
 
 	def add_socket(sock)
@@ -389,8 +410,8 @@ module LoopUtil
 
 	def stop
 		@loop.stop
-		# attach/detach dummy timer
-		@loop.attach(Rev::TimerWatcher.new(0, false)).detach
+		# attach dummy timer
+		@loop.attach Rev::TimerWatcher.new(0, false)
 		nil
 	end
 end
@@ -411,8 +432,8 @@ class Client
 	attr_reader :host, :port
 
 	def close
-		@timer.detach
-		@rsock.detach
+		@timer.detach if @timer.attached?
+		@rsock.detach if @rsock.attached?
 		@s.close
 		nil
 	end
@@ -468,7 +489,7 @@ class Server
 
 	def close
 		@socks.reject! {|lsock|
-			lsock.detach
+			lsock.detach if lsock.attached?
 			lsock.close
 			true
 		}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +09:00
+date: 2009-11-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency