@@ -71,6 +71,7 @@ source_suffix = '.rst'

 # The encoding of source files.

 #source_encoding = 'utf-8-sig'

+highlight_language = 'python'

 # The master toctree document.

 master_doc = 'index'

new file mode 100644

@@ -0,0 +1,63 @@

+.. Copyright (c) 2011 Edward Langley

+   All rights reserved.

+   

+   Redistribution and use in source and binary forms, with or without

+   modification, are permitted provided that the following conditions

+   are met:

+   

+   Redistributions of source code must retain the above copyright notice,

+   this list of conditions and the following disclaimer.

+   

+   Redistributions in binary form must reproduce the above copyright

+   notice, this list of conditions and the following disclaimer in the

+   documentation and/or other materials provided with the distribution.

+   

+   Neither the name of the project's author nor the names of its

+   contributors may be used to endorse or promote products derived from

+   this software without specific prior written permission.

+   

+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+   HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

+   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ 

+

+Getting Started

+===============

+This code will create a server that logs all requests, and provides two methods to clients:

+add and subtract:

+

+.. literalinclude:: ../../jsonrpc/example_server.py

+   :language: python

+   :linenos:

+   :tab-width: 2

+   :lines: 2,3,34-

+

+To use the server, start the client this way:

+

+.. code-block:: bash

+

+   # Python 2.6

+   % python2.6 -i -m jsonrpc.__main__ http://localhost:8007

+

+   # Python 2.7

+   % python2.7 -i -m jsonrpc http://localhost:8007

+   

+.. code-block:: python

+

+   >>> server.add(1,2)

+   3

+   >>> server.subtract(3,2)

+   1

+   >>> server.batch_call(dict(

+   ...   add = ((3, 2), {} ),

+   ...   subtract = ((), {'a': 3, 'b': 2})

+   ... ))

+   [(5, None), (1, None)]

@@ -44,6 +44,7 @@ Contents:

 .. toctree::

    :maxdepth: 2

+   getting_started

    server

    proxy

    jsonutil

@@ -30,26 +30,35 @@

 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #

 #

+

 from twisted.internet import reactor, ssl

 from twisted.web import server

 import traceback

 from jsonrpc.server import ServerEvents, JSON_RPC

-class JSONRPCTest(ServerEvents):

+class ExampleServer(ServerEvents):

+	# inherited hooks

 	def log(self, responses, txrequest):

 		if isinstance(responses, list):

 			for response in responses:

-				print txrequest, response.id, response.result or response.error

+				msg = self.get_msg(response)

+				print txrequest, msg

 		else:

-			print txrequest, responses.id, responses.result or responses.error

+			msg = self.get_msg(response)

+			print txrequest, msg

 	def findmethod(self, method):

-		if method in set(['add', 'subtract']):

+		if method in self.methods:

 			return getattr(self, method)

 		else:

 			return None

+	# helper methods

+	methods = set(['add', 'subtract'])

+	def _get_msg(self, response):

+		return ' '.join([response.id, response.result or response.error])

+

 	def subtract(self, a, b):

 		return a-b

@@ -65,6 +74,3 @@ PORT = 8007

 print 'Listening on port %d...' % PORT

 reactor.listenTCP(PORT, site)

 reactor.run()

-

-

-__version__ = "$Revision: 1.8 $".split(":")[1][:-1].strip()

@@ -80,11 +80,12 @@ class ProxyEvents(object):

 	'''An event handler for JSONRPCProxy'''

 	#: an instance of a class which defines a __get__ method, used to generate a request id

-	IDGen = IDGen()

+	IDGen = IDGen

 	def __init__(self, proxy):

 		'''Allow a subclass to do its own initialization, gets any arguments leftover from __init__'''

+		self.IDGen = self.IDGen()

 		self.proxy = proxy

 	def get_postdata(self, args, kwargs):

@@ -98,9 +99,32 @@ class ProxyEvents(object):

 		return data

+class Request(object):

+

+	def __init__(self, id, method, args=None, kwargs=None):

+		self.version = '2.0'

+		self.id = id

+		self.method = method

+		self.args = args

+		self.kwargs = kwargs

+

+	def json_equivalent(self):

+		if kwargs.has_key('__args'):

+			raise ValueError, 'invalid argument name: __args'

+

+		result = dict(

+			jsonrpc = self.version,

+			id = self.id,

+			method = self.method

+		)

+

+		if self.args and self.kwargs:

+			self.kwargs['__args'] = self.args

+

+

+

-inst = lambda x:x()

 class JSONRPCProxy(object):

 	'''A class implementing a JSON-RPC Proxy.

@@ -128,20 +152,6 @@ class JSONRPCProxy(object):

 		return serviceURL, path

-	def _get_postdata(self, args, kwargs):

-		args,kwargs = self._eventhandler.get_postdata(args, kwargs)

-

-		if kwargs.has_key('__args'):

-			raise ValueError, 'invalid argument name: __args'

-		kwargs['__args'] = args or ()

-		postdata = jsonrpc.jsonutil.encode({

-			"method": self._serviceName,

-			'params': kwargs,

-			'id': self._eventhandler.IDGen,

-			'jsonrpc': '2.0'

-		})

-		return postdata

-

 	## Public interface

 	@classmethod

 	def from_url(cls, url, ctxid=None, serviceName=None):

@@ -169,6 +179,12 @@ class JSONRPCProxy(object):

 		return self.__class__(self.serviceURL, path=self._path, serviceName=name)

+	def _get_postdata(self, args=None, kwargs=None):

+		args,kwargs = self._eventhandler.get_postdata(args, kwargs)

+		id = self._eventhandler.IDGen

+		return Request(id, self._serviceNams, args, kwargs)

+		postdata = jsonrpc.jsonutil.encode({	})

+		return postdata

 	def __call__(self, *args, **kwargs):