msgpack-rpc 0.4.1 → 0.4.2

data/ChangeLog

@@ -1,4 +1,8 @@
 
+2010-08-28 version 0.4.2
+
+  * Fixes exception.rb
+
 2010-08-27 version 0.4.1
 
   * Adds MultiFuture class

data/lib/msgpack/rpc/exception.rb

@@ -70,10 +70,12 @@ class RPCError < Error
 
 	def is?(code)
 		if code.is_a?(Class) && code < RPCError
+			if code == RemoteError
+				return @code[0] != ?.
+			end
 			code = code::CODE
 		end
-		@code == code || @code[0,code.length+1] == "#{code}." ||
-			(code == ".RemoteError" && @code[0] != ?.)
+		@code == code || @code[0,code.length+1] == "#{code}."
 	end
 end
 
@@ -194,7 +196,6 @@ class RPCError
 		TransportError::CODE          => TransportError,
 		CallError::CODE               => CallError,
 		ServerError::CODE             => ServerError,
-		RemoteError::CODE             => RemoteError,
 		NetworkUnreachableError::CODE => NetworkUnreachableError,
 		ConnectionRefusedError::CODE  => ConnectionRefusedError,
 		ConnectionTimeoutError::CODE  => ConnectionTimeoutError,

data/lib/msgpack/rpc/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +09:00
+date: 2010-08-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,6 @@ files:
 - 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

data/lib/msgpack/rpc/exception.rb.old

@@ -1,303 +0,0 @@
-#
-# MessagePack-RPC for Ruby
-#
-# Copyright (C) 2010 FURUHASHI Sadayuki
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-module MessagePack
-module RPC
-
-
-class Error < StandardError
-end
-
-class RPCError < Error
-	def initialize(msg)
-		super(msg)
-	end
-end
-
-class RemoteError < RPCError
-	def initialize(msg, result = nil)
-		super(msg)
-		@result = result
-	end
-	attr_reader :result
-end
-
-class TimeoutError < Error
-	def initialize(msg = "request timed out")
-		super
-	end
-end
-
-class ConnectError < TimeoutError
-	def initialize(msg = "connect failed")
-		super
-	end
-end
-
-
-
-##
-## MessagePack-RPC Exception
-##
-#
-#  MessagePack-RPC Transport Layer
-#  [int, msgid, object, object] を転送する
-#  これを転送できない場合はTransportError
-#
-#  メッセージ到達   1
-#  ハンドラ到達     2
-#  リトライ推奨     r
-#
-#  RPCError
-#  |
-#  +-- TimeoutError     : [?]
-#  |
-#  +-- TransportError   : []
-#  |   |
-#  |   +-- NetworkUnreachableError
-#  |   |
-#  |   +-- ConnectionRefusedError
-#  |   |
-#  |   +-- ConnectionTimeoutError
-#  |   |
-#  |   +-- MalformedMessageError
-#  |   |
-#  |   +-- ConnectionClosedError
-#  |
-#  +-- CallError        : [1]
-#  |   |
-#  |   +-- NoMethodError
-#  |   |
-#  |   +-- ArgumentError
-#  |
-#  +-- ServerError      : [1, 2?, r]
-#  |   |
-#  |   +-- ServerBusyError
-#  |   |
-#  |   +-- GatewayError
-#  |       |
-#  |       +-- GatewayTimeoutError
-#  |
-#  +-- RemoteError      : [1, 2]
-#      |
-#      +-- RemoteRuntimeError
-#      |
-#      +-- (user-defined errors)
-#
-##
-## MessagePack-RPC Exception
-##
-#
-#  RPCError
-#  |
-#  +-- TimeoutError     : 到達=不明 リトライ=アプリ判断
-#  |
-#  +-- TransportError   : 到達=していない リトライ=非推奨
-#  |   |
-#  |   +-- NetworkUnreachableError
-#  |   |
-#  |   +-- ConnectionRefusedError
-#  |   |
-#  |   +-- ConnectionTimeoutError
-#  |
-#  +-- SessionError     : 到達=した リトライ=非推奨
-#  |   |
-#  |   +-- MessageRefusedError
-#  |   |   |
-#  |   |   +-- MessageTooLargeError
-#  |   |
-#  |   +-- NoMethodError
-#  |   |
-#  |   +-- ArgumentError
-#  |
-#  +-- ServerError      : 到達=した リトライ=推奨
-#  |   |
-#  |   +-- ServerBusyError
-#  |
-#  +-- RemoteError
-#      |
-#      +-- RemoteRuntimeError
-#      |
-#      +-- (user-defined errors)
-#
-#
-##
-## MessagePack-RPC Exception
-##
-#
-#  RPCError
-#  |
-#  +-- TimeoutError
-#  |
-#  +-- ClientError
-#  |   |
-#  |   +-- TransportError
-#  |   |   |
-#  |   |   +-- NetworkUnreachableError
-#  |   |   |
-#  |   |   +-- ConnectionRefusedError
-#  |   |   |
-#  |   |   +-- ConnectionTimeoutError
-#  |   |   |
-#  |   |   +-- MessageTooLargeError
-#  |   |
-#  |   +-- SessionError
-#  |       |
-#  |       +-- NoMethodError
-#  |       |
-#  |       +-- ArgumentError
-#  |
-#  +-- ServerError
-#  |   |
-#  |   +-- ServerBusyError
-#  |
-#  +-- RemoteError
-#      |
-#      +-- (Remote)RuntimeError
-#      |
-#      +-- (user-defined errors)
-#
-
-=begin
-class Error < StandardError
-end
-
-class RPCError < Error
-	def initialize(msg, code)
-		super(msg)
-		@code = code
-	end
-	attr_reader :code
-end
-
-
-class TimeoutError < RPCError
-	CODE = ".TimeoutError"
-	def initialize(msg = "request timed out")
-		super(msg, CODE)
-	end
-end
-
-
-class ClientError < RPCError
-	CODE = ".ClientError"
-	def initialize(msg, code)
-		super(msg, code)
-	end
-end
-
-
-class TransportError < ClientError
-	CODE = ".TransportError"
-	def initialize(msg, code = CODE)
-		super(msg, CODE)
-	end
-end
-
-class NetworkUnreachableError < TransportError
-	CODE = ".NetworkUnreachableError"
-	def initialize(msg = "network unreachable")
-		super(msg, CODE)
-	end
-end
-
-class ConnectionRefusedError < TransportError
-	CODE = -52
-	def initialize(msg = "connection refused")
-		super(msg, CODE)
-	end
-end
-
-class ConnectionTimeoutError < TransportError
-	CODE = -53
-	def initialize(msg = "connection timed out")
-		super(msg, CODE)
-	end
-end
-
-
-class MessageRefusedError < ClientError
-	CODE = -40
-	def initialize(msg = "broken message", code = CODE)
-		super(msg, code)
-	end
-end
-
-class MessageTooLargeError < MessageRefusedError
-	CODE = -41
-	def initialize(msg = "messge too large")
-		super(msg, CODE)
-	end
-end
-
-
-class CallError < ClientError
-	CODE = -20
-	def initialize(msg, code = CODE)
-		super(msg, code)
-	end
-end
-
-class NoMethodError < CallError
-	CODE = -21
-	def initialize(msg = "method not found")
-		super(msg, CODE)
-	end
-end
-
-class ArgumentError < NoMethodError
-	CODE = -22
-	def initialize(msg = "invalid argument")
-		super(msg, CODE)
-	end
-end
-
-
-class ServerError < RPCError
-	CODE = -30
-	def initialize(msg, code = CODE)
-		super(msg, code)
-	end
-end
-
-class ServerBusyError < ServerError
-	CODE = -31
-	def initialize(msg = "server temporally busy")
-		super(msg, CODE)
-	end
-end
-
-
-class RemoteError < RPCError
-	def initialize(msg, code, result = nil)
-		super(msg, code)
-		@result = result
-	end
-	attr_reader :result
-end
-
-class RemoteRuntimeError < RemoteRuntimeError
-	CODE = -10
-	def initialize(msg, result = nil)
-		super(msg, CODE, result)
-	end
-end
-=end
-
-
-end
-end