jsonrpc2.0 0.1.7 → 0.1.8

data/jsonrpc2.0.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'jsonrpc2.0'
-	s.version = '0.1.7'
+	s.version = '0.1.8'
 	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/Errors.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 module JsonRpcErrors
-	ERRORS = {'ParseError' => -32700, 'InvalidRequest' => -32600, 'MethodNotFound' => -32601, 'InvalidParams' => -32602, 'InternalError' => -32603, 'MethodNotAllowed' => -32099}
+	ERRORS = {'ParseError' => -32700, 'InvalidRequest' => -32600, 'MethodNotFound' => -32601, 'InvalidParams' => -32602, 'InternalError' => -32603}
 
 	class Error < StandardError
 		CODE = nil
@@ -31,10 +31,14 @@ module JsonRpcErrors
 		c.new(inHash['message'], inHash['data'])
 	end
 
-	ERRORS.each do |className, errorCode|
-		c = Class::new(Error) do
-			const_set('CODE', errorCode)
+	def self.addErrors(errors)
+		errors.each do |className, errorCode|
+			c = Class::new(Error) do
+				const_set('CODE', errorCode)
+			end
+			const_set(className, c)
 		end
-		const_set(className, c)
 	end
+
+	addErrors(ERRORS)
 end

data/lib/jsonrpc2.0/Server.rb

@@ -6,7 +6,7 @@ class JsonRpcServer
 	include JsonRpcConstants
 	include JsonRpcErrors
 
-	def handle_message(inMessage, restrictMethod = nil)
+	def handle_message(inMessage)
 		begin
 			begin
 				message = JSON.parse inMessage
@@ -14,7 +14,7 @@ class JsonRpcServer
 				raise(ParseError, e.message)
 			end
 
-			response = handle_request(message, restrictMethod).to_json
+			response = handle_request(message).to_json
 		rescue Error => e
 			id = nil
 			id = message['id'] if (message.class == Hash)
@@ -29,17 +29,13 @@ class JsonRpcServer
 
 	private
 
-	def handle_request(inRequest, restrictMethod = nil)
+	def handle_request(inRequest)
 		raise InvalidRequest if (inRequest.class != Hash)
 		raise InvalidRequest if (inRequest['jsonrpc'] != VERSION)
 		raise InvalidRequest if (!inRequest.key?('method'))
 		
 		begin
-		  methodName = 'r_' + inRequest['method']
-		  
-		  unless restrictMethod == nil or restrictMethod == methodName
-				raise(MethodNotAllowed, "Method not allowed!")
-			end
+			methodName = 'r_' + inRequest['method']
 		  
 			method = method(methodName)
 

metadata

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