jsonrpc2.0 0.1.9 → 0.1.18

data/jsonrpc2.0.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'jsonrpc2.0'
-	s.version = '0.1.9'
+	s.version = '0.1.18'
 	s.summary = 'A server and client implementation of the JsonRpc 2.0 protocol.'
 	s.authors = ['Jannik Theiß']
 	s.email = 'dev@coldsun.org'

data/lib/jsonrpc2.0/Client.rb

@@ -21,10 +21,13 @@ class JsonRpcClient
 		response = send_request request.to_json
 		response = JSON.parse response
 		
-		raise error_from_hash(response['error']) if response.key?('error')
+		begin
+			raise JsonRpcErrors::error_from_hash(response['error'], true) if response.key?('error')
+		rescue ApplicationError => e
+			raise JsonRpcErrors::error_from_hash(e.data)
+		end
 
 		result = response['result']
-		result
 	end
 
 	def fire_notification(inMethod, *inParams)

data/lib/jsonrpc2.0/Errors.rb

@@ -1,9 +1,10 @@
 require 'json'
 
 module JsonRpcErrors
-	ERRORS = {'ParseError' => -32700, 'InvalidRequest' => -32600, 'MethodNotFound' => -32601, 'InvalidParams' => -32602, 'InternalError' => -32603}
+	ImplementationErrors = {'ParseError' => -32700, 'InvalidRequest' => -32600, 'MethodNotFound' => -32601, 'InvalidParams' => -32602, 'InternalError' => -32603, 'ApplicationError' => -32550}
+	ApplicationErrors = {}
 
-	class Error < StandardError
+	class BaseError < StandardError
 		CODE = nil
 
 		attr_reader :data
@@ -26,19 +27,37 @@ module JsonRpcErrors
 		end
 	end
 
-	def error_from_hash(inHash)
-		c = self.class.const_get ERRORS.key(inHash['code'])
-		c.new(inHash['message'], inHash['data'])
+	class BaseImplementationError < BaseError
 	end
 
-	def self.addErrors(errors)
-		errors.each do |className, errorCode|
-			c = Class::new(Error) do
+	class BaseApplicationError < BaseError
+	end
+
+	def self.error_from_hash(inHash, inIsImplementationError = false)
+		if inIsImplementationError
+			errorList = ImplementationErrors
+		else
+			errorList = ApplicationErrors
+		end
+
+		errorName = errorList.key(inHash['code'])
+		errorClass = const_get(errorName)
+		errorClass.new(inHash['message'], inHash['data'])
+	end
+
+	def self.add_application_errors(inErrors)
+		ApplicationErrors.merge!(inErrors)
+		create_error_classes(inErrors, BaseApplicationError)
+	end
+
+	def self.create_error_classes(inErrors, inBaseClass)
+		inErrors.each do |errorName, errorCode|
+			errorClass = Class::new(inBaseClass) do
 				const_set('CODE', errorCode)
 			end
-			const_set(className, c)
+			const_set(errorName, errorClass)
 		end
 	end
 
-	addErrors(ERRORS)
+	create_error_classes(ImplementationErrors, BaseImplementationError)
 end

data/lib/jsonrpc2.0/Server.rb

@@ -20,7 +20,7 @@ class JsonRpcServer
 			else
 				response = handle_request(message).to_json
 			end
-		rescue Error => e
+		rescue BaseImplementationError => e
 			id = nil
 			id = message['id'] if (message.class == Hash)
 			error = create_message(id)
@@ -39,19 +39,26 @@ class JsonRpcServer
 		raise InvalidRequest if (inRequest['jsonrpc'] != VERSION)
 		raise InvalidRequest if (!inRequest.key?('method'))
 		
-		begin
-			methodName = 'r_' + inRequest['method']
-		  
-			method = method(methodName)
+		methodName = 'r_' + inRequest['method']
+		
+		unless self.class.private_method_defined?(methodName)
+			raise MethodNotFound
+		end
+
+		method = method(methodName)
 
-			params = inRequest['params']
+		params = inRequest['params']
+		paramCount = 0
+		paramCount = params.count if params.respond_to?("count")
+
+		unless method.arity == paramCount
+			raise InvalidParams
+		end
+
+		begin
 			result = method.call(*params)
-		rescue NameError => e
-			raise(MethodNotFound, e.message)
-		rescue ArgumentError => e
-			raise(InvalidParams, e.message)
-		rescue StandardError => e
-		  raise(InternalError, e.message)
+		rescue BaseApplicationError => e
+			raise ApplicationError.new("", e)
 		end
 
 		if inRequest.key?('id')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc2.0
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-28 00:00:00.000000000Z
+date: 2011-07-07 00:00:00.000000000Z
 dependencies: []
 description: 
 email: dev@coldsun.org