msgpack-rpc 0.1.1 → 0.1.2

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

data/lib/msgpack/rpc.rb

@@ -1,5 +1,5 @@
 #
-# MessagePack RPC for Ruby
+# MessagePack-RPC for Ruby
 #
 # Copyright (C) 2009 FURUHASHI Sadayuki
 #
@@ -74,11 +74,12 @@ module RPCSocket
 	end
 
 	def on_message(msg)
-		if msg[0] == REQUEST
+		case msg[0]
+		when REQUEST
 			on_request(msg[1], msg[2], msg[3])
-		elsif msg[0] == RESPONSE
-			on_response(msg[1], msg[3], msg[2])
-		elsif msg[0] == REQUEST
+		when RESPONSE
+			on_response(msg[1], msg[2], msg[3])
+		when NOTIFY
 			on_notify(msg[1], msg[2])
 		else
 			raise RPCError.new("unknown message type #{msg[0]}")
@@ -103,17 +104,17 @@ module RPCSocket
 		@session.on_notify(method, param)
 	end
 
-	def on_response(msgid, res, err)
+	def on_response(msgid, error, result)
 		return unless @session
-		@session.on_response(msgid, res, err)
+		@session.on_response(msgid, error, result)
 	end
 
 	def send_request(msgid, method, param)
 		send_message [REQUEST, msgid, method, param]
 	end
 
-	def send_response(msgid, retval, err)
-		send_message [RESPONSE, msgid, err, retval]
+	def send_response(msgid, result, error)
+		send_message [RESPONSE, msgid, error, result]
 	end
 
 	def send_notify(method, param)
@@ -233,7 +234,7 @@ class ClientSession
 	end
 
 
-	def on_response(msgid, result, error)
+	def on_response(msgid, error, result)
 		if req = @reqtable.delete(msgid)
 			req.call error, result
 		end
@@ -278,6 +279,7 @@ class ClientSession
 	def notify_real(method, param)
 		method = method.to_s unless method.is_a?(Integer)
 		@sock.send_notify method, param
+		nil
 	end
 end
 
@@ -327,24 +329,21 @@ class ServerSession
 
 	def on_request(method, param, res)
 		begin
-			unless @accept.include?(method)
-				raise NoMethodError, "method `#{method}' is not accepted"
-			end
-			ret = @obj.send(method, *param)
+			result = forward_method(method, param)
 		rescue
 			res.error($!.to_s)
 			return
 		end
-		if ret.is_a?(AsyncResult)
-			ret.responder = res
+		if result.is_a?(AsyncResult)
+			result.responder = res
 		else
-			res.result(ret)
+			res.result(result)
 		end
 	end
 
 	def on_notify(method, param)
-		# FIXME notify support
-		raise RPCError.new("unexpected notify message")
+		forward_method(method, param)
+	rescue
 	end
 
 	def on_response(msgid, error, result)
@@ -355,6 +354,14 @@ class ServerSession
 		# do nothing
 		@sock = nil
 	end
+
+	private
+	def forward_method(method, param)
+		unless @accept.include?(method)
+			raise NoMethodError, "method `#{method}' is not accepted"
+		end
+		@obj.send(method, *param)
+	end
 end
 
 Loop = ::Rev::Loop
@@ -382,8 +389,9 @@ module LoopUtil
 
 	def stop
 		@loop.stop
-		# attach dummy timer
-		@loop.attach Rev::TimerWatcher.new(0, false)
+		# attach/detach dummy timer
+		@loop.attach(Rev::TimerWatcher.new(0, false)).detach
+		nil
 	end
 end
 
@@ -406,6 +414,7 @@ class Client
 		@timer.detach
 		@rsock.detach
 		@s.close
+		nil
 	end
 
 	def send(method, *args)
@@ -463,6 +472,7 @@ class Server
 			lsock.close
 			true
 		}
+		nil
 	end
 
 	include LoopUtil

data/test/msgpack_rpc_test.rb

@@ -45,8 +45,13 @@ class MessagePackRPCTest < Test::Unit::TestCase
 	end
 
 
-	def test_listen
+	def next_port
 		port = $port += 1
+	end
+
+
+	def test_listen
+		port = next_port
 
 		svr = MessagePack::RPC::Server.new
 		svr.listen("0.0.0.0", port, MyServer.new(svr))
@@ -54,10 +59,6 @@ class MessagePackRPCTest < Test::Unit::TestCase
 	end
 
 
-	def next_port
-		port = $port += 1
-	end
-
 	def start_server
 		port = next_port
 
@@ -65,6 +66,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		svr.listen("0.0.0.0", port, MyServer.new(svr))
 		Thread.start do
 			svr.run
+			svr.close
 		end
 
 		cli = MessagePack::RPC::Client.new("127.0.0.1", port)
@@ -84,20 +86,12 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_equal(result, 3)
 
 		cli.close
+		svr.stop
 	end
 
 
 	def test_send
-		port = $port += 1
-
-		svr = MessagePack::RPC::Server.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
+		svr, cli = start_server
 
 		req1 = cli.send(:hello)
 		req2 = cli.send(:sum, 1, 2)
@@ -111,6 +105,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_nil(req2.error)
 
 		cli.close
+		svr.stop
 	end
 
 
@@ -135,6 +130,17 @@ class MessagePackRPCTest < Test::Unit::TestCase
 			cli.loop.run_once
 		end
 
+		cli.close
+		svr.stop
+	end
+
+
+	def test_notify
+		svr, cli = start_server
+
+		cli.notify(:hello)
+		cli.notify(:sum, 1, 2)
+
 		cli.close
 	end
 
@@ -154,6 +160,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_equal(rejected, true)
 
 		cli.close
+		svr.stop
 	end
 
 
@@ -171,6 +178,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_equal(raised, true)
 
 		cli.close
+		svr.stop
 	end
 
 
@@ -181,6 +189,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_equal(result, "async")
 
 		cli.close
+		svr.stop
 	end
 
 
@@ -198,6 +207,7 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		assert_equal(raised, true)
 
 		cli.close
+		svr.stop
 	end
 
 
@@ -255,6 +265,5 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		cli.close
 		lsock.close
 	end
-
 end
 

metadata

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