msgpack-rpc 0.4.0 → 0.4.1

data/lib/msgpack/rpc/server.rb

@@ -30,8 +30,16 @@ class Server < SessionPool
 		@listeners = []
 	end
 
+	# 1. serve(dispatcher)
+	# 2. serve(obj, accept = obj.public_methods)
 	def serve(obj, accept = obj.public_methods)
-		@dispatcher = ObjectDispatcher.new(obj, accept)
+		if obj.is_a?(Dispatcher)
+			# 2.
+			@dispatcher = obj
+		else
+			# 1.
+			@dispatcher = ObjectDispatcher.new(obj, accept)
+		end
 		self
 	end
 
@@ -70,12 +78,81 @@ class Server < SessionPool
 	# from ServerTransport
 	def on_request(sendable, msgid, method, param)  #:nodoc:
 		responder = Responder.new(sendable, msgid)
-		@dispatcher.dispatch_request(self, method, param, responder)
+		dispatch_method(method, param, responder)
 	end
 
 	# from ServerTransport
 	def on_notify(method, param)  #:nodoc:
-		@dispatcher.dispatch_notify(self, method, param)
+		responder = NullResponder.new
+		dispatch_method(method, param, responder)
+	end
+
+	private
+	def dispatch_method(method, param, responder)  #:nodoc:
+		begin
+			sent = false
+			early_result = nil
+			result = @dispatcher.dispatch(method, param) do |result_|
+				unless result_.is_a?(AsyncResult)
+					responder.result(result_)
+					sent = true
+				end
+				early_result = result_
+			end
+
+		#FIXME on NoMethodError
+		# res.error(NO_METHOD_ERROR); return
+
+		#FIXME on ArgumentError
+		# res.error(ArgumentError); return
+
+		rescue
+			responder.error($!.to_s)
+			return
+		end
+
+		if early_result.is_a?(AsyncResult)
+			early_result.set_responder(responder)
+		elsif sent
+			return
+		elsif result.is_a?(AsyncResult)
+			result.set_responder(responder)
+		else
+			responder.result(result)
+		end
+	end
+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 set_responder(res)  #:nodoc:
+		@responder = res
+		if @sent && @result
+			@responder.result(*@result)
+			@result = nil
+		end
 	end
 end
 
@@ -84,11 +161,20 @@ class Responder
 	def initialize(sendable, msgid)
 		@sendable = sendable  # send_message method is required
 		@msgid = msgid
+		@sent = false
+	end
+
+	def sent?
+		@sent
 	end
 
 	def result(retval, err = nil)
-		data = [RESPONSE, @msgid, err, retval].to_msgpack
-		@sendable.send_data(data)
+		unless @sent
+			data = [RESPONSE, @msgid, err, retval].to_msgpack
+			@sendable.send_data(data)
+			@sent = true
+		end
+		nil
 	end
 
 	def error(err, retval = nil)
@@ -97,6 +183,21 @@ class Responder
 end
 
 
+class NullResponder
+	def sent?
+		true
+	end
+
+	def result(retval, err = nil)
+		nil
+	end
+
+	def error(err, retval = nil)
+		nil
+	end
+end
+
+
 #:nodoc:
 class Server::Base
 	def initialize(*args)

data/lib/msgpack/rpc/session.rb

@@ -37,12 +37,12 @@ class Session
 
 	# backward compatibility
 	def port  #:nodoc:
-		@address.port;
+		@address.port
 	end
 
 	# backward compatibility
 	def host  #:nodoc:
-		@address.host;
+		@address.host
 	end
 
 	# call-seq:
@@ -51,7 +51,17 @@ class Session
 	# Calls remote method.
 	# This method is same as call_async(method, *args).get
 	def call(method, *args)
-		call_async(method, *args).get
+		send_request(method, args).get
+	end
+
+	# call-seq:
+	#   call_apply(symbol, params) -> result of remote method
+	#
+	# Calls remote method.
+	# This method is same as call(method, *args) excepting that
+	# the arugment is a array.
+	def call_apply(method, params)
+		send_request(method, params).get
 	end
 
 	# call-seq:
@@ -63,6 +73,16 @@ class Session
 		future = send_request(method, args)
 	end
 
+	# call-seq:
+	#   call_async_apply(symbol, params) -> Future
+	#
+	# Calls remote method asynchronously.
+	# This method is same as call_async(method, *args) excepting that
+	# the arugment is a array.
+	def call_async_apply(method, params)
+		future = send_request(method, params)
+	end
+
 	# backward compatibility
 	alias send call_async  #:nodoc:
 
@@ -78,6 +98,19 @@ class Session
 		future
 	end
 
+	# call-seq:
+	#   callback_apply(symbol, params) {|future| }
+	#
+	# Calls remote method asynchronously.
+	# The callback method is called with Future when the result is reached.
+	# This method is same as callback(method, *args).attach_callback {|future|  }
+	# excepting that the argument is a array.
+	def callback_apply(method, params, &block)
+		future = send_request(method, params)
+		future.attach_callback(block)
+		future
+	end
+
 	# call-seq:
 	#   notify(symbol, *args) -> nil
 	#
@@ -89,6 +122,19 @@ class Session
 		nil
 	end
 
+	# call-seq:
+	#   notify_apply(symbol, params) -> nil
+	#
+	# Calls remote method with NOTIFY protocol.
+	# It doesn't require server to return results.
+	# This method is non-blocking and returns nil.
+	# This method is same as notify(method, *args) excepting that
+	# the argument is a array.
+	def notify_apply(method, params)
+		send_notify(method, params)
+		nil
+	end
+
 	# Closes underlaying Transport and destroy resources.
 	def close
 		@transport.close
@@ -107,10 +153,7 @@ class Session
 	# from ClientTransport
 	def on_connect_failed  #:nodoc:
 		@reqtable.reject! {|msgid, future|
-			begin
-				future.set_result ConnectError.new, nil
-			rescue
-			end
+			future.set_result ConnectionTimeoutError::CODE, ["connection timed out"]
 			true
 		}
 		nil
@@ -126,10 +169,7 @@ class Session
 			end
 		}
 		timedout.each {|future|
-			begin
-				future.set_result TimeoutError.new, nil
-			rescue
-			end
+			future.set_result TimeoutError::CODE, ["request timed out"]
 		}
 		!@reqtable.empty?
 	end

data/lib/msgpack/rpc/transport/tcp.rb

@@ -37,6 +37,15 @@ class TCPTransport
 			@pac = MessagePack::Unpacker.new
 		end
 
+		# from Rev::TCPSocket
+		def on_readable
+			super
+		rescue
+			# FIXME send Connection Close message
+			# FIXME log
+			close
+		end
+
 		# from Rev::TCPSocket
 		def on_read(data)
 			@pac.feed(data)
@@ -142,12 +151,12 @@ class TCPClientTransport
 
 		# MessageReceiver interface
 		def on_request(msgid, method, param)
-			raise RPCError.new("request message on client session")
+			raise Error.new("request message on client session")
 		end
 
 		# MessageReceiver interface
 		def on_notify(method, param)
-			raise RPCError.new("notify message on client session")
+			raise Error.new("notify message on client session")
 		end
 
 		# MessageReceiver interface
@@ -232,7 +241,7 @@ class TCPServerTransport
 
 		# MessageReceiver interface
 		def on_response(msgid, error, result)
-			raise RPCError.new("response message on server session")
+			raise Error.new("response message on server session")
 		end
 	end
 end

data/lib/msgpack/rpc/transport/udp.rb

@@ -29,7 +29,10 @@ class UDPTransport
 	end
 
 	class BasicSocket < Rev::IOWatcher
+		HAVE_DNRL = UDPSocket.public_instance_methods.include?(:do_not_reverse_lookup)
+
 		def initialize(io)
+			io.do_not_reverse_lookup = true if HAVE_DNRL
 			super(io)
 			@io = io
 		end
@@ -46,6 +49,9 @@ class UDPTransport
 			# FIXME multiple objects in one message
 			obj = MessagePack.unpack(data)
 			on_message(obj, addr)
+		rescue
+			# FIXME log
+			return
 		end
 
 		include MessageReceiver
@@ -98,12 +104,12 @@ class UDPClientTransport
 
 		# MessageReceiver interface
 		def on_request(msgid, method, param, addr)
-			raise RPCError.new("request message on client session")
+			raise Error.new("request message on client session")
 		end
 
 		# MessageReceiver interface
 		def on_notify(method, param, addr)
-			raise RPCError.new("notify message on client session")
+			raise Error.new("notify message on client session")
 		end
 
 		# MessageReceiver interface
@@ -169,7 +175,7 @@ class UDPServerTransport
 
 		# MessageReceiver interface
 		def on_response(msgid, error, result, addr)
-			raise RPCError.new("response message on server session")
+			raise Error.new("response message on server session")
 		end
 	end
 

data/lib/msgpack/rpc/transport/unix.rb

@@ -34,6 +34,15 @@ class UNIXTransport
 			@pac = MessagePack::Unpacker.new
 		end
 
+		# from Rev::TCPSocket
+		def on_readable
+			super
+		rescue
+			# FIXME send Connection Close message
+			# FIXME log
+			close
+		end
+
 		# from Rev::UNIXSocket
 		def on_read(data)
 			@pac.feed(data)
@@ -90,12 +99,12 @@ class UNIXClientTransport
 
 		# MessageReceiver interface
 		def on_request(msgid, method, param)
-			raise RPCError.new("request message on client session")
+			raise Error.new("request message on client session")
 		end
 
 		# MessageReceiver interface
 		def on_notify(method, param)
-			raise RPCError.new("notify message on client session")
+			raise Error.new("notify message on client session")
 		end
 
 		# MessageReceiver interface
@@ -155,7 +164,7 @@ class UNIXServerTransport
 
 		# MessageReceiver interface
 		def on_response(msgid, error, result)
-			raise RPCError.new("response message on server session")
+			raise Error.new("response message on server session")
 		end
 	end
 end

data/lib/msgpack/rpc/version.rb

@@ -0,0 +1,7 @@
+module MessagePack
+module RPC
+
+VERSION = '0.4.1'
+
+end
+end

data/test/msgpack_rpc_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'test/unit'
 
 $port = 65500
 

data/test/test_helper.rb

@@ -1,3 +1,7 @@
+begin
+require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 $LOAD_PATH.unshift File.dirname(__FILE__)+'/../lib'
 require 'msgpack/rpc'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +09:00
+date: 2010-08-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: msgpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
         version: 0.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rev
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: frsyuki@users.sourceforge.jp
 executables: []
@@ -41,13 +59,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- AUTHORS
+- ChangeLog
+- NOTICE
+- README
+- lib/msgpack/rpc.rb
 - lib/msgpack/rpc/address.rb
 - lib/msgpack/rpc/client.rb
 - lib/msgpack/rpc/dispatcher.rb
 - lib/msgpack/rpc/exception.rb
+- lib/msgpack/rpc/exception.rb.old
 - lib/msgpack/rpc/future.rb
 - lib/msgpack/rpc/loop.rb
 - lib/msgpack/rpc/message.rb
+- lib/msgpack/rpc/multi_future.rb
 - lib/msgpack/rpc/server.rb
 - lib/msgpack/rpc/session.rb
 - lib/msgpack/rpc/session_pool.rb
@@ -55,38 +80,40 @@ files:
 - lib/msgpack/rpc/transport/tcp.rb
 - lib/msgpack/rpc/transport/udp.rb
 - lib/msgpack/rpc/transport/unix.rb
-- lib/msgpack/rpc.rb
+- lib/msgpack/rpc/version.rb
 - test/msgpack_rpc_test.rb
 - test/test_helper.rb
-- AUTHORS
-- ChangeLog
-- NOTICE
-- README
 has_rdoc: true
-homepage: http://msgpack.sourceforge.jp/
+homepage: http://msgpack.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: msgpack
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MessagePack-RPC, asynchronous RPC library using MessagePack