Skip to content

Commit

Permalink
add JSONP support
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jun 27, 2011
1 parent f99a741 commit 11209f2
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 0 deletions.
31 changes: 31 additions & 0 deletions papyrus/renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import geojson
from geojson.codec import PyGFPEncoder as GeoJSONEncoder
import simplejson as json

class Encoder(GeoJSONEncoder):
# SQLAlchemy's Reflecting Tables mechanism uses decimal.Decimal
Expand All @@ -23,3 +24,33 @@ def _render(value, system):
request.response_content_type = 'application/json'
return geojson.dumps(value, cls=Encoder, use_decimal=True)
return _render

def _render_jsonp(value, renderer, request):
callback = None
if request is not None:
if 'callback' in request.params:
callback = request.params['callback']
if not hasattr(request, 'response_content_type'):
if callback is None:
request.response_content_type = 'application/json'
else:
request.response_content_type = 'text/javascript'
if callback is not None:
return "%(callback)s(%(json)s);"%{'callback': callback, 'json': renderer(value)}
else:
return renderer(value)

def jsonp_renderer_factory(info):
def _render(value, system):

request=system.get("request")
return _render_jsonp(value, lambda value: json.dumps(value), request)

return _render

def geojsonp_renderer_factory(info):
def _render(value, system):
request = system.get('request')
return _render_jsonp(value, lambda value: geojson.dumps(value, cls=Encoder, use_decimal=True), request)

return _render
60 changes: 60 additions & 0 deletions papyrus/tests/test_renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,63 @@ def test_datetime(self):
result = renderer(f, {'request': request})
self.assertEqual(result, '{"geometry": {"type": "Point", "coordinates": [53, -4]}, "type": "Feature", "properties": {"datetime": "2011-05-21T20:55:12"}, "id": 1}')
self.assertEqual(request.response_content_type, 'application/json')


def _callFUTGEOJSONP(self, name):
from papyrus.renderers import geojsonp_renderer_factory
return geojsonp_renderer_factory(name)

def test_geojsonp_nocallback(self):
renderer = self._callGEOFUTJSONP(None)
f = {
'type': 'Feature',
'id': 1,
'geometry': {'type': 'Point', 'coordinates': [53, -4]},
'properties': {'title': 'Dict 1'},
}
request = testing.DummyRequest()
result = renderer(f, {'request': request})
self.assertEqual(result, '{"geometry": {"type": "Point", "coordinates": [53, -4]}, "type": "Feature", "properties": {"title": "Dict 1"}, "id": 1}')
self.assertEqual(request.response_content_type, 'application/json')

def test_geojsonp(self):
renderer = self._callGEOFUTJSONP(None)
f = {
'type': 'Feature',
'id': 1,
'geometry': {'type': 'Point', 'coordinates': [53, -4]},
'properties': {'title': 'Dict 1'},
}
request = testing.DummyRequest()
request.params['callback'] = 'jsonp_cb'
result = renderer(f, {'request': request})
self.assertEqual(result, 'jsonp_cb({"geometry": {"type": "Point", "coordinates": [53, -4]}, "type": "Feature", "properties": {"title": "Dict 1"}, "id": 1});')
self.assertEqual(request.response_content_type, 'text/javascript')

def _callFUTJSONP(self, name):
from papyrus.renderers import jsonp_renderer_factory
return jsonp_renderer_factory(name)

def test_geojsonp_nocallback(self):
renderer = self._callFUTJSONP(None)
f = {
'name': 'Test',
'id': 1
}
request = testing.DummyRequest()
result = renderer(f, {'request': request})
self.assertEqual(result, '{"name": "Test", "id": 1}')
self.assertEqual(request.response_content_type, 'application/json')

def test_geojsonp(self):
renderer = self._callFUTJSONP(None)
f = {
'name': 'Test',
'id': 1
}
request = testing.DummyRequest()
request.params['callback'] = 'jsonp_cb'
result = renderer(f, {'request': request})
self.assertEqual(result, 'jsonp_cb({"name": "Test", "id": 1});')
self.assertEqual(request.response_content_type, 'text/javascript')

0 comments on commit 11209f2

Please sign in to comment.