Changeset 3601 for framework

Timestamp:

08/23/10 14:20:47 (21 months ago)

Author:

elemoine

Message:

add a geojsonify decorator, r=bbinet (closes #587)

Location:

framework/server/trunk

Files:

• docs/framework/upgrading.txt (modified) (3 diffs)
• mapfish/decorators (added)
• mapfish/decorators/__init__.py (added)
• mapfish/lib/protocol.py (modified) (8 diffs)
• mapfish/templates/controller.py_tmpl (modified) (3 diffs)
• mapfish/tests/__init__.py (added)
• mapfish/tests/test_decorators.py (added)
• mapfish/tests/test_mysql.py (modified) (5 diffs)
• mapfish/tests/test_oracle.py (modified) (6 diffs)
• mapfish/tests/test_postgis.py (modified) (6 diffs)
• mapfish/tests/test_spatialite.py (modified) (6 diffs)

framework/server/trunk/docs/framework/upgrading.txt

@@ -10 +10 @@
 MapFish 1.2 is based on Pylons 0.9.7, and MapFish 2.0 is based on Pylons 1.0.
 So to upgrade an application from MapFish 1.2 to MapFish 2.0 it is first needed
-to upgrade from Pylons 0.9.7 to Pylons 1.0. For this refer to the `Pylons 1.0
-Upgrading page <http://pylonshq.com/docs/en/1.0/upgrading/>`_, and follow the
-provided indications.
+to upgrade that application from Pylons 0.9.7 to Pylons 1.0. For this refer to
+the `Pylons 1.0 Upgrading page <http://pylonshq.com/docs/en/1.0/upgrading/>`_,
+and follow the provided indications.
 
 .. note:
@@ -57 +57 @@
 MapFish 2.0
 ~~~~~~~~~~~
+
+GeoAlchemy
+^^^^^^^^^^
 
 MapFish 2.0 is based on `GeoAlchemy <http://geoalchemy.org>`_. GeoAlchemy
@@ -104 +107 @@
         }
         the_geom = GeometryColumn(Point(srid=4326))
+
+geojsonify
+^^^^^^^^^^
+
+MapFish 2.0 introduces the ``geojsonify`` decorator for generating GeoJSON.
+
+With MapFish 1.2 the ``paster mf-layer`` command generated controller files
+that looked like this::
+
+    from pylons import request, response, session, tmpl_context as c
+    from pylons.controllers.util import abort, redirect_to
+
+    from myproject.lib.base import BaseController
+    from myproject.model.users import User
+    from myproject.model.meta import Session
+    from myproject.lib.decorators import geojsonify
+
+    from mapfish.lib.filters import *
+    from mapfish.lib.protocol import Protocol, create_default_filter
+
+    class UsersController(BaseController):
+        readonly = False # if set to True, only GET is supported
+
+        def __init__(self):
+            self.protocol = Protocol(Session, User, self.readonly)
+
+        def index(self, format='json'):
+            """GET /: return all features."""
+            return self.protocol.index(request, response, format=format)
+
+        def show(self, id, format='json'):
+            """GET /id: Show a specific feature."""
+            return self.protocol.show(request, response, id)
+
+        def create(self):
+            """POST /: Create a new feature."""
+            return self.protocol.create(request, response)
+
+        def update(self, id):
+            """PUT /id: Update an existing feature."""
+            return self.protocol.update(request, response, id)
+
+        def delete(self, id):
+            """DELETE /id: Delete an existing feature."""
+            return self.protocol.delete(request, response, id)
+
+With MapFish 2.0 the same ``user`` controller looks like this::
+
+    from pylons import request, response, session, tmpl_context as c
+    from pylons.controllers.util import abort, redirect
+
+    from test.lib.base import BaseController
+    from test.model.users import User
+    from test.model.meta import Session
+
+    from mapfish.lib.filters import *
+    from mapfish.lib.protocol import Protocol, create_default_filter
+    from mapfish.decorators import geojsonify
+
+    class UsersController(BaseController):
+        readonly = False # if set to True, only GET is supported
+
+        def __init__(self):
+            self.protocol = Protocol(Session, User, self.readonly)
+
+        @geojsonify
+        def index(self, format='json'):
+            """GET /: return all features."""
+            if format != 'json':
+                abort(404)
+            return self.protocol.read(request)
+
+        @geojsonify
+        def show(self, id, format='json'):
+            """GET /id: Show a specific feature."""
+            if format != 'json':
+                abort(404)
+            return self.protocol.read(request, response, id=id)
+
+        @geojsonify
+        def create(self):
+            """POST /: Create a new feature."""
+            return self.protocol.create(request, response)
+
+        @geojsonify
+        def update(self, id):
+            """PUT /id: Update an existing feature."""
+            return self.protocol.update(request, response, id)
+
+        def delete(self, id):
+            """DELETE /id: Delete an existing feature."""
+            return self.protocol.delete(request, response, id)
+
+Several things to note here:
+
+* Protocols no longer expose ``index`` and ``show`` methods. They expose a
+  single method for reading features: ``read``. So ``read`` is to be used
+  from both the ``index`` and ``show`` actions.
+* The ``index``, ``show``, ``create``, and ``update`` methods no longer
+  return GeoJSON strings. Instead they return objects that can be
+  serialized into GeoJSON strings. This serialization is taken
+  care of by the ``geojsonify`` decorator.

framework/server/trunk/mapfish/lib/protocol.py

@@ -21 +21 @@
 log = logging.getLogger(__name__)
 
-import decimal, datetime
-
 from pylons.controllers.util import abort
 
@@ -31 +29 @@
 from geoalchemy import WKBSpatialElement
 
-from geojson import dumps as _dumps, loads, Feature, FeatureCollection, GeoJSON
-from geojson.codec import PyGFPEncoder
+from geojson import Feature, FeatureCollection, loads, GeoJSON
 
 from mapfish.lib.filters import Filter
@@ -50 +47 @@
     "ilike": Comparison.ILIKE
 }
-
-class MapFishJSONEncoder(PyGFPEncoder):
-    # SQLAlchemy's Reflecting Tables mechanism uses decimal.Decimal
-    # for numeric columns and datetime.date for dates. simplejson does
-    # not know how to deal with objects of those types. This class provides
-    # a simple encoder that can deal with these kinds of objects.
-
-    def default(self, obj):
-        if isinstance(obj, (decimal.Decimal, datetime.date, datetime.datetime)):
-            return str(obj)
-        return PyGFPEncoder.default(self, obj)
-
-def dumps(obj, cls=MapFishJSONEncoder, **kwargs):
-    # Wrapper for geojson's dumps function.
-    return _dumps(obj, cls=cls, **kwargs)
 
 def create_geom_filter(request, mapped_class, **kwargs):
@@ -227 +209 @@
             self.before_delete = kwargs['before_delete']
 
-    def _encode(self, objects, request, response):
-        """ Return a GeoJSON representation of the passed objects. """
-        if objects is not None:
-            response.content_type = "application/json"
-            if isinstance(objects, list):
-                return dumps(
-                    FeatureCollection(
-                        [self._filter_attrs(o.toFeature(), request) for o in objects if o.geometry is not None]
-                    )
-                )
-            else:
-                return dumps(self._filter_attrs(objects.toFeature(), request))
-
     def _filter_attrs(self, feature, request):
         """ Remove some attributes from the feature and set the geometry to None
@@ -313 +282 @@
             return query
 
-    def index(self, request, response, format='json', filter=None):
-        """ Build a query based on the filter and the request
-        params, send the query to the database, and return a
-        GeoJSON representation of the query results. """
-
-        # only json is supported
-        if format != 'json':
-            abort(404)
-
-        return self._encode(self._query(request, filter), request, response)
-
     def count(self, request, filter=None):
         """ Return the number of records matching the given filter. """
@@ -332 +290 @@
         return str(self.Session.query(self.mapped_class).filter(filter).count())
 
-    def show(self, request, response, id, format='json'):
-        """ Build a query based on the id argument, send the query
-        to the database, and return a GeoJSON representation of the
-        result. """
-
-        # only json is supported
-        if format != 'json':
-            abort(404)
-
-        obj = self.Session.query(self.mapped_class).get(id)
-        if obj is None:
-            abort(404)
-
-        return self._encode(obj, request, response)
+    def read(self, request, filter=None, id=None):
+        """ Build a query based on the filter or the idenfier, send the query
+        to the database, and return a Feature or a FeatureCollection. """
+        ret = None
+        if id is not None:
+            o = self.Session.query(self.mapped_class).get(id)
+            if o is None:
+                abort(404)
+            ret = self._filter_attrs(o.toFeature(), request)
+        else:
+            objs = self._query(request, filter)
+            ret = FeatureCollection(
+                    [self._filter_attrs(o.toFeature(), request) \
+                        for o in objs if o.geometry is not None])
+        return ret
 
     def create(self, request, response, execute=True):
@@ -376 +335 @@
         response.status = 201
         if len(objects) > 0:
-            return self._encode(objects, request, response)
+            features = [o.toFeature() for o in objects \
+                            if o.geometry is not None]
+            return FeatureCollection(features)
         return
 
@@ -397 +358 @@
         self.Session.commit()
         response.status = 201
-        return self._encode(obj, request, response)
+        return obj.toFeature()
 
     def delete(self, request, response, id):

framework/server/trunk/mapfish/templates/controller.py_tmpl

@@ -8 +8 @@
 from mapfish.lib.filters import *
 from mapfish.lib.protocol import Protocol, create_default_filter
+from mapfish.decorators import geojsonify
 
 class {{contrClass}}Controller(BaseController):
@@ -15 +16 @@
         self.protocol = Protocol(Session, {{modelClass}}, self.readonly)
 
+    @geojsonify
     def index(self, format='json'):
         """GET /: return all features."""
@@ -56 +58 @@
         # else:
         #     filter = compare_filter
-        # return self.protocol.index(request, response, format=format, filter=filter)
+        # return self.protocol.read(request, filter=filter)
+        if format != 'json':
+            abort(404)
+        return self.protocol.read(request)
 
-        return self.protocol.index(request, response, format=format)
-
+    @geojsonify
     def show(self, id, format='json'):
         """GET /id: Show a specific feature."""
-        return self.protocol.show(request, response, id, format=format)
+        if format != 'json':
+            abort(404)
+        return self.protocol.read(request, response, id=id)
 
+    @geojsonify
     def create(self):
         """POST /: Create a new feature."""
         return self.protocol.create(request, response)
 
+    @geojsonify
     def update(self, id):
         """PUT /id: Update an existing feature."""

framework/server/trunk/mapfish/tests/test_mysql.py

@@ -16 +16 @@
 from webob.exc import HTTPNotFound
 from exceptions import Exception
-from geojson import loads, FeatureCollection, GeoJSON
+from geojson import Feature, FeatureCollection, GeoJSON
 
 
@@ -82 +82 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-        
+        eq_(len(collection.features), 1)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -105 +108 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}, {"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 2, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 102.34}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
+        eq_(len(collection.features), 2)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+        feature1 = collection.features[1]
+        eq_(feature1.id, old_spot.spot_id)
+        eq_(feature1.geometry.coordinates, (1, 1))
         
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
@@ -141 +150 @@
         
         response = FakeResponse()
-        returned_geojson = proto.update(request, response, id)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 1, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 420.39999999999998}}')
+        feature = proto.update(request, response, id)
         eq_(response.status, 201)
-        
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (1.0, 1.0))
+
         spot = session.query(Spot).get(id)
         ok_(spot is not None)
@@ -290 +299 @@
             
         eq_(proto.count(request, filter=filter), '1')
-        
-        
-    def test_protocol_show(self):
-        """Get a single point by its primary key"""
-        proto = Protocol(session, Spot)
-        
-        request = FakeRequest({})
-        response = FakeResponse()
-        
-        returned_geojson = proto.show(request, response, 1)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [0.0, 0.0]}, "id": 1, "type": "Feature", "bbox": [0.0, 0.0, 0.0, 0.0], "properties": {"spot_height": 420.39999999999998}}')     
-        eq_(response.status, 0) # note that the return code is set later by Pylons
-        
-    
+
+
+    def test_protocol_read_all(self):
+        """Return all features"""
+        proto = Protocol(session, Spot)
+
+        collection = proto.read(FakeRequest({}))
+        ok_(collection is not None)
+        ok_(isinstance(collection, FeatureCollection))
+        eq_(len(collection.features), 9)
+
+
+    def test_protocol_read_one(self):
+        """Return one feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=1)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (0.0, 0.0))
+        eq_(feature.properties["spot_height"], 420.39999999999998)
+
+
     @raises(HTTPNotFound)
-    def test_protocol_show_fails(self):
+    def test_protocol_read_one_fails(self):
         """Try to get a single point with a wrong primary key"""
         proto = Protocol(session, Spot)
-        
-        proto.show(FakeRequest({}), FakeResponse(), -1)
-        
-        
-    def test_protocol_index(self):
-        """Return all features"""
-        proto = Protocol(session, Spot)
-        returned_geojson = proto.index(FakeRequest({}), FakeResponse())
-        
-        ok_(returned_geojson is not None)
-        
-        factory = lambda ob: GeoJSON.to_instance(ob)
-        features = loads(returned_geojson, object_hook=factory)
-
-        ok_(isinstance(features, FeatureCollection))
-        eq_(len(features.features), 9)
-        
+
+        proto.read(FakeRequest({}), id=-1)
+
 
     def test_within_distance(self):

framework/server/trunk/mapfish/tests/test_oracle.py

@@ -17 +17 @@
 from webob.exc import HTTPNotFound
 from exceptions import Exception
-from geojson import loads, FeatureCollection, GeoJSON
+from geojson import Feature, FeatureCollection, GeoJSON
 import os
 from sqlalchemy.schema import Sequence
@@ -29 +29 @@
 
 #engine = create_engine('oracle://gis:gis@localhost:1521/gis', echo=True)
-engine = create_engine('oracle://system:system@172.16.101.131:1521/gis', echo=True)
+engine = create_engine('oracle://system:system@172.16.103.134:1521/gis', echo=True)
 
 metadata = MetaData(engine)
@@ -98 +98 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-        
+        eq_(len(collection.features), 1)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -121 +124 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}, {"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 2, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 102.34}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-             
+        eq_(len(collection.features), 2)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+        feature1 = collection.features[1]
+        eq_(feature1.id, old_spot.spot_id)
+        eq_(feature1.geometry.coordinates, (1, 1))
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -157 +166 @@
         
         response = FakeResponse()
-        returned_geojson = proto.update(request, response, id)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 1, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 420.39999999999998}}')
+        feature = proto.update(request, response, id)
         eq_(response.status, 201)
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (1.0, 1.0))
         
         spot = session.query(Spot).get(id)
@@ -318 +327 @@
             
         eq_(proto.count(request, filter=filter), '3')
-           
-           
-    def test_protocol_show(self):
-        """Get a single point by its primary key"""
-        proto = Protocol(session, Spot)
-        
-        request = FakeRequest({})
-        response = FakeResponse()
-        
-        returned_geojson = proto.show(request, response, 1)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [0.0, 0.0]}, "id": 1, "type": "Feature", "bbox": [0.0, 0.0, 0.0, 0.0], "properties": {"spot_height": 420.39999999999998}}')     
-        eq_(response.status, 0) # note that the return code is set later by Pylons
-        
-    
+
+
+    def test_protocol_read_all(self):
+        """Return all features"""
+        proto = Protocol(session, Spot)
+
+        collection = proto.read(FakeRequest({}))
+        ok_(collection is not None)
+        ok_(isinstance(collection, FeatureCollection))
+        eq_(len(collection.features), 9)
+
+
+    def test_protocol_read_one(self):
+        """Return one feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=1)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (0.0, 0.0))
+        eq_(feature.properties["spot_height"], 420.39999999999998)
+
+
     @raises(HTTPNotFound)
-    def test_protocol_show_fails(self):
+    def test_protocol_read_one_fails(self):
         """Try to get a single point with a wrong primary key"""
         proto = Protocol(session, Spot)
         
-        proto.show(FakeRequest({}), FakeResponse(), -1)
-        
-        
-    def test_protocol_index(self):
-        """Return all features"""
-        proto = Protocol(session, Spot)
-        returned_geojson = proto.index(FakeRequest({}), FakeResponse())
-        
-        ok_(returned_geojson is not None)
-        
-        factory = lambda ob: GeoJSON.to_instance(ob)
-        features = loads(returned_geojson, object_hook=factory)
-
-        ok_(isinstance(features, FeatureCollection))
-        eq_(len(features.features), 9)
-        
+        proto.read(FakeRequest({}), id=-1)
+
 
     def test_within_distance(self):

framework/server/trunk/mapfish/tests/test_postgis.py

@@ -16 +16 @@
 from webob.exc import HTTPNotFound
 from exceptions import Exception
-from geojson import loads, FeatureCollection, GeoJSON
+from geojson import Feature, FeatureCollection, GeoJSON
 
 
@@ -82 +82 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-        
+        eq_(len(collection.features), 1)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -105 +108 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12.0}}, {"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 2, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 102.34}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-        
+        eq_(len(collection.features), 2)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+        feature1 = collection.features[1]
+        eq_(feature1.id, old_spot.spot_id)
+        eq_(feature1.geometry.coordinates, (1, 1))
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -141 +150 @@
         
         response = FakeResponse()
-        returned_geojson = proto.update(request, response, id)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 1, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 420.39999999999998}}')
+        feature = proto.update(request, response, id)
         eq_(response.status, 201)
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (1.0, 1.0))
         
         spot = session.query(Spot).get(id)
@@ -177 +186 @@
         spot = session.query(Spot).get(id)
         ok_(spot is None)
-        
+
 
     @raises(HTTPNotFound)
@@ -282 +291 @@
             
         eq_(proto.count(request, filter=filter), '1')
-           
-           
-    def test_protocol_show(self):
-        """Get a single point by its primary key"""
-        proto = Protocol(session, Spot)
-        
-        request = FakeRequest({})
-        response = FakeResponse()
-        
-        returned_geojson = proto.show(request, response, 1)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [0.0, 0.0]}, "id": 1, "type": "Feature", "bbox": [0.0, 0.0, 0.0, 0.0], "properties": {"spot_height": 420.39999999999998}}')     
-        eq_(response.status, 0) # note that the return code is set later by Pylons
-        
-    
+
+
+    def test_protocol_read_all(self):
+        """Return all features"""
+        proto = Protocol(session, Spot)
+
+        collection = proto.read(FakeRequest({}))
+        ok_(collection is not None)
+        ok_(isinstance(collection, FeatureCollection))
+        eq_(len(collection.features), 9)
+
+
+    def test_protocol_read_one(self):
+        """Return one feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=1)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (0.0, 0.0))
+        eq_(feature.properties["spot_height"], 420.39999999999998)
+
+
     @raises(HTTPNotFound)
-    def test_protocol_show_fails(self):
+    def test_protocol_read_one_fails(self):
         """Try to get a single point with a wrong primary key"""
         proto = Protocol(session, Spot)
         
-        proto.show(FakeRequest({}), FakeResponse(), -1)
-        
-        
-    def test_protocol_index(self):
-        """Return all features"""
-        proto = Protocol(session, Spot)
-        returned_geojson = proto.index(FakeRequest({}), FakeResponse())
-        
-        ok_(returned_geojson is not None)
-        
-        factory = lambda ob: GeoJSON.to_instance(ob)
-        features = loads(returned_geojson, object_hook=factory)
-
-        ok_(isinstance(features, FeatureCollection))
-        eq_(len(features.features), 9)
-        
+        proto.read(FakeRequest({}), id=-1)
+
 
     def test_within_distance(self):

framework/server/trunk/mapfish/tests/test_spatialite.py

@@ -17 +17 @@
 from webob.exc import HTTPNotFound
 from exceptions import Exception
-from geojson import loads, FeatureCollection, GeoJSON
+from geojson import Feature, FeatureCollection, GeoJSON
 
 
@@ -101 +101 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
+        eq_(len(collection.features), 1)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
         
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
@@ -124 +127 @@
         
         response = FakeResponse()
-        returned_geojson = proto.create(request, response)
-        eq_(returned_geojson,
-            '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Point", "coordinates": [45.0, 5.0]}, "id": 10, "type": "Feature", "bbox": [45.0, 5.0, 45.0, 5.0], "properties": {"spot_height": 12}}, {"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 2, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 102.34}}]}')
+        collection = proto.create(request, response)
         eq_(response.status, 201)
-        
+        eq_(len(collection.features), 2)
+        feature0 = collection.features[0]
+        eq_(feature0.id, 10)
+        eq_(feature0.geometry.coordinates, (45.0, 5.0))
+        eq_(feature0.properties["spot_height"], 12)
+        feature1 = collection.features[1]
+        eq_(feature1.id, old_spot.spot_id)
+        eq_(feature1.geometry.coordinates, (1, 1))
+
         new_spot = session.query(Spot).filter(Spot.spot_height==12.0).one()
         ok_(new_spot is not None)
@@ -160 +169 @@
         
         response = FakeResponse()
-        returned_geojson = proto.update(request, response, id)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [1.0, 1.0]}, "id": 1, "type": "Feature", "bbox": [1.0, 1.0, 1.0, 1.0], "properties": {"spot_height": 420.39999999999998}}')
+        feature = proto.update(request, response, id)
         eq_(response.status, 201)
-        
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (1.0, 1.0))
+
         spot = session.query(Spot).get(id)
         ok_(spot is not None)
@@ -265 +274 @@
         eq_(proto.count(request), '3')
         
-        
-    def test_protocol_show(self):
-        """Get a single point by its primary key"""
-        proto = Protocol(session, Spot)
-        
-        request = FakeRequest({})
-        response = FakeResponse()
-        
-        returned_geojson = proto.show(request, response, 1)
-        eq_(returned_geojson,
-            '{"geometry": {"type": "Point", "coordinates": [0.0, 0.0]}, "id": 1, "type": "Feature", "bbox": [0.0, 0.0, 0.0, 0.0], "properties": {"spot_height": 420.39999999999998}}')     
-        eq_(response.status, 0) # note that the return code is set later by Pylons
-        
-        
+
     def test_protocol_count_custom_filter(self):
         """Count all features that match a custom filter"""
@@ -314 +310 @@
             
         eq_(proto.count(request, filter=filter), '1')
-        
-    
+
+
+    def test_protocol_read_all(self):
+        """Return all features"""
+        proto = Protocol(session, Spot)
+
+        collection = proto.read(FakeRequest({}))
+        ok_(collection is not None)
+        ok_(isinstance(collection, FeatureCollection))
+        eq_(len(collection.features), 9)
+
+
+    def test_protocol_read_one(self):
+        """Return one feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=1)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 1)
+        eq_(feature.geometry.coordinates, (0.0, 0.0))
+        eq_(feature.properties["spot_height"], 420.39999999999998)
+        proto = Protocol(session, Spot)
+
+
     @raises(HTTPNotFound)
-    def test_protocol_show_fails(self):
+    def test_protocol_read_one_fails(self):
         """Try to get a single point with a wrong primary key"""
         proto = Protocol(session, Spot)
         
-        proto.show(FakeRequest({}), FakeResponse(), -1)
-        
-        
-    def test_protocol_index(self):
-        """Return all features"""
-        proto = Protocol(session, Spot)
-        returned_geojson = proto.index(FakeRequest({}), FakeResponse())
-        
-        ok_(returned_geojson is not None)
-        
-        factory = lambda ob: GeoJSON.to_instance(ob)
-        features = loads(returned_geojson, object_hook=factory)
-
-        ok_(isinstance(features, FeatureCollection))
-        eq_(len(features.features), 9)
-        
+        proto.read(FakeRequest({}), id=-1)
+
 
     def test_within_distance(self):