msgpack-rpc 0.1.0 → 0.1.1

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.0"
+VERS              = "0.1.1"
 
 #REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 REV = nil

data/lib/msgpack/rpc.rb

@@ -282,6 +282,39 @@ class ClientSession
 end
 
 
+class AsyncResult
+	def initialize
+		@responder = nil
+		@sent = false
+	end
+
+	def result(retval, err = nil)
+		unless @sent
+			if @responder
+				@responder.result(retval, err)
+			else
+				@result = [retval, err]
+			end
+			@sent = true
+		end
+		nil
+	end
+
+	def error(err)
+		result(nil, err)
+		nil
+	end
+
+	def responder=(res)
+		@responder = res
+		if @sent && @result
+			@responder.result(*@result)
+			@result = nil
+		end
+	end
+end
+
+
 class ServerSession
 	def initialize(obj, accept = obj.public_methods)
 		@obj = obj
@@ -302,7 +335,11 @@ class ServerSession
 			res.error($!.to_s)
 			return
 		end
-		res.result(ret)
+		if ret.is_a?(AsyncResult)
+			ret.responder = res
+		else
+			res.result(ret)
+		end
 	end
 
 	def on_notify(method, param)
@@ -323,6 +360,8 @@ end
 Loop = ::Rev::Loop
 
 module LoopUtil
+	attr_reader :loop
+
 	class Timer < Rev::TimerWatcher
 		def initialize(interval, repeating, &block)
 			@block = block
@@ -361,7 +400,7 @@ class Client
 		@timer = Timer.new(1, true) { @s.step_timeout }
 		loop.attach(@timer)
 	end
-	attr_reader :loop, :host, :port
+	attr_reader :host, :port
 
 	def close
 		@timer.detach
@@ -411,7 +450,6 @@ class Server
 		@loop = loop
 		@socks = []
 	end
-	attr_reader :loop
 
 	def listen(host, port, obj, accept = obj.public_methods)
 		lsock = ::Rev::TCPServer.new(host, port, Server::Socket, obj, accept)

data/test/msgpack_rpc_test.rb

@@ -7,6 +7,10 @@ $port = 65500
 class MessagePackRPCTest < Test::Unit::TestCase
 
 	class MyServer
+		def initialize(svr)
+			@svr = svr
+		end
+
 		def hello
 			"ok"
 		end
@@ -19,6 +23,22 @@ class MessagePackRPCTest < Test::Unit::TestCase
 			raise "raised"
 		end
 
+		def async
+			as = MessagePack::RPC::AsyncResult.new
+			@svr.start_timer(1, false) do
+				as.result "async"
+			end
+			as
+		end
+
+		def async_exception
+			as = MessagePack::RPC::AsyncResult.new
+			@svr.start_timer(1, false) do
+				as.error "async"
+			end
+			as
+		end
+
 		private
 		def hidden
 		end
@@ -29,21 +49,33 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		port = $port += 1
 
 		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
+		svr.listen("0.0.0.0", port, MyServer.new(svr))
 		svr.close
 	end
 
 
-	def test_call
+	def next_port
 		port = $port += 1
+	end
+
+	def start_server
+		port = next_port
 
 		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
+		svr.listen("0.0.0.0", port, MyServer.new(svr))
 		Thread.start do
 			svr.run
 		end
 
 		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
+		cli.timeout = 10
+
+		return svr, cli
+	end
+
+
+	def test_call
+		svr, cli = start_server
 
 		result = cli.call(:hello)
 		assert_equal(result, "ok")
@@ -59,12 +91,13 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		port = $port += 1
 
 		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
+		svr.listen("0.0.0.0", port, MyServer.new(svr))
 		Thread.start do
 			svr.run
 		end
 
 		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
+		cli.timeout = 10
 
 		req1 = cli.send(:hello)
 		req2 = cli.send(:sum, 1, 2)
@@ -82,18 +115,10 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 
 	def test_callback
-		port = $port += 1
-
-		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
-		Thread.start do
-			svr.run
-		end
+		svr, cli = start_server
 
 		count = 0
 
-		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
-
 		cli.callback(:hello) do |error, result|
 			assert_equal(result, "ok")
 			assert_nil(error)
@@ -115,18 +140,10 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 
 	def test_hidden
-		port = $port += 1
-
-		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
-		Thread.start do
-			svr.run
-		end
+		svr, cli = start_server
 
 		count = 0
 
-		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
-
 		rejected = false
 		begin
 			cli.call(:hidden)
@@ -141,21 +158,40 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 
 	def test_exception
-		port = $port += 1
+		svr, cli = start_server
 
-		svr = MessagePack::RPC::Server.new
-		svr.listen("0.0.0.0", port, MyServer.new)
-		Thread.start do
-			svr.run
+		raised = false
+		begin
+			cli.call(:exception)
+		rescue MessagePack::RPC::RemoteError
+			assert_equal($!.message, "raised")
+			raised = true
 		end
 
-		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
+		assert_equal(raised, true)
+
+		cli.close
+	end
+
+
+	def test_async
+		svr, cli = start_server
+
+		result = cli.call(:async)
+		assert_equal(result, "async")
+
+		cli.close
+	end
+
+
+	def test_async_exception
+		svr, cli = start_server
 
 		raised = false
 		begin
-			cli.call(:exception)
+			cli.call(:async_exception)
 		rescue MessagePack::RPC::RemoteError
-			assert_equal($!.message, "raised")
+			assert_equal($!.message, "async")
 			raised = true
 		end
 
@@ -166,15 +202,15 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 
 	def test_loop
-		port = $port += 1
+		port = next_port
 
 		loop = MessagePack::RPC::Loop.new
 
 		svr = MessagePack::RPC::Server.new(loop)
-		svr.listen("0.0.0.0", port, MyServer.new)
+		svr.listen("0.0.0.0", port, MyServer.new(svr))
 
 		cli = MessagePack::RPC::Client.new("127.0.0.1", port, loop)
-		cli.timeout = 1
+		cli.timeout = 10
 
 		count = 0
 
@@ -200,7 +236,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 
 
 	def test_timeout
-		port = $port += 1
+		port = next_port
 
 		lsock = TCPServer.new("0.0.0.0", port)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki