Changeset 485:a4eac18cbd43

Timestamp:

01/14/10 22:38:16 (8 months ago)

Author:

rgrp <http://rufuspollock.org>

Branch:

default

Message:

[contrllers/factlet][s]: fix up factlet edit form to work with new coords (should have caught this before but inadequate tests -- 3h or work!).

Location:

microfacts

Files:

• controllers/factlet.py (modified) (4 diffs)
• tests/functional/test_factlet.py (modified) (2 diffs)

microfacts/controllers/factlet.py

@@ -1 +1 @@
 import logging
-import simplejson as sj
+
+try:
+    import json as sj
+except ImportError:
+    import simplejson as sj
 import genshi
+import geojson
 
 logger = logging.getLogger(__name__)
@@ -178 +183 @@
         iscommit = request.params.has_key('commit')
         
-        c.edit_core = self.edit_core(id)
-        
         if not (iscommit or ispreview):
+            c.edit_core = self.edit_core(id)
             return render('factlet/edit.html')
         
-        
-        # works in place
-        self.unflatten_form_data(request.params)
-        entity_data = dict(request.params)
-        
-        if ispreview:
-            self._preview(entity_data)
-            return render('factlet/edit.html')
-            
-        elif iscommit:
+        entity_data = self.unflatten_form_data(request.params)
+        # add id in (rgrp 2010-01-14: is no longer in form and hence
+        # request.params as of -- should it be?)
+        entity_data['id'] = id
+        if iscommit:
             mode = EntityPut('/factlet/%s' % id,
                 request_data=entity_data,
@@ -201 +200 @@
             else: # errors
                 c.error = '%s' % mode.response_code
-                return self._preview(entity_data)
-
-    def _preview(self, entity_data):
-        # to be compatible needs to dump it back to json (even though below we
-        # will immediately do simplejson.loads!)
-        entity_data = sj.dumps(entity_data)
+                return render('factlet/edit.html')
+
+        # must be either preview or commit error
+        
+        json_data = sj.dumps(entity_data)
+        c.factlet = self._parse_json_data(json_data)
+        assert c.factlet.location
+        c.factlet_html = render('factlet/read_core.html')
+        # TODO: this is not quite true ...
         # this works because data from the form is same as data from json load
-        json_data = entity_data
-        c.factlet = self._parse_json_data(json_data)
-        c.factlet_html = render('factlet/read_core.html')
+        c.edit_core = self.edit_core(id, factlet=c.factlet)
+        return render('factlet/edit.html')
 
     def unflatten_form_data(self, formdict):
+        # have multiple values in formdict - it's a multidict
+        out = dict(formdict)
         # convert back to json string format (not actual domain object)
         coords = formdict.getall('location[geometry][coordinates][]')
-        
-        try:
-            coords[0] = float(coords[0]) if coords[0] else None
-            coords[1] = float(coords[1]) if coords[1] else None
-            f = geojson.Feature()
-            f.geometry = geojson.Point(coordinates=coords)
-            print f
-            formdict['location'] = f
-        except:
-            pass
-        
+        for idx in [0,1]:
+            coords[idx] = None if coords[idx] in ['',None] else float(coords[idx])
+        f = geojson.Feature()
+        f.geometry = geojson.Point(coordinates=coords)
+        # need to be in simple dict format
+        out['location'] = dict(f)
+        return out
 
     def template(self, id):
@@ -266 +265 @@
             factlet.id = fctid
         return factlet 
+

microfacts/tests/functional/test_factlet.py

@@ -143 +143 @@
         newtitle = 'Battle of Austerlitz Modified but Not Saved'
         newstart = '2008-08-22'
+        newcoords = [0.0,1.0]
         form['title'] = newtitle
         form['start'] = newstart
+        form.set('location[geometry][coordinates][]', newcoords[0], index=0)
+        form.set('location[geometry][coordinates][]', newcoords[1], index=1)
         response = form.submit('preview')
         assert newtitle in response, response
-        assert newstart in response
+        assert newstart in response, response
+        assert newcoords[1] in response, response
         form = response.forms[0]
         response = form.submit('commit', status=[200,404,302])
@@ -154 +158 @@
         fct = model.Factlet.query.filter_by(id=factletId).first()
         assert fct.title == newtitle
+        assert fct.start == newstart
+        assert fct.location.geometry.coordinates == newcoords
 
     def test_edit_core(self):