Changeset 199

Timestamp:

09/05/08 09:18:54 (3 months ago)

Author:

rgrp

Message:

[factlet/edit][l]: add support for factlet editing, adding in template action support to factlet.

• factlet.py:
  
  • new update method providing factlet editing, previewing and saving
    
  • new template method to provide json based templating
    
• lib/json.py: add flush option to converter to ensure don't have to flush to db. Need because new templating work requires the ability to use converter (and create python Domain Objects) without modifying domain model (i.e. saving to db).
  
• layout.html: remove any default jspagecontroller.
  

Files:

• trunk/microfacts/controllers/factlet.py (modified) (4 diffs)
• trunk/microfacts/lib/json.py (modified) (3 diffs)
• trunk/microfacts/public/behaviour/app/views/factletdetailsview.js (modified) (1 diff)
• trunk/microfacts/templates/factlet/edit.html (copied) (copied from trunk/microfacts/templates/factlet/read.html) (1 diff)
• trunk/microfacts/templates/factlet/edit_core.html (copied) (copied from trunk/microfacts/templates/factlet/read_core.html) (2 diffs)
• trunk/microfacts/templates/factlet/read.html (modified) (1 diff)
• trunk/microfacts/templates/layout.html (modified) (1 diff)
• trunk/microfacts/tests/functional/test_factlet.py (modified) (5 diffs)

trunk/microfacts/controllers/factlet.py

@@ +1 @@
+import simplejson as sj
+import genshi
+
-from microfacts.lib.base import *
-import genshi
-from microfacts.modes import *
+import microfacts.lib.json
-
-class FactletController(BaseController):
@@ -54 +57 @@
-            id = int(id)
-        except:
-id = 0
+abort(404)
-        mode = EntityGet('/factlet/%s' % id).execute()
-        if mode.response_code == 200:
-            c.factlet = mode.entity
-            # NB: fragment does not seem to have any effect
-            # see this thread:
-            # http://groups.google.com/group/genshi/browse_thread/thread/a587cc282403aace
-            html = render('factlet/read_core', format='xml')
-            return html
@@ -67 +67 @@
-
-    def read(self, id):
-        c.has_inline_edit = True
-        html = self.read_core(id)
-        c.factlet_html = genshi.XML(html)
@@ -73 +72 @@
-
-    def update(self, id):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+    def _preview(self, entity_data):
+        # to be compatible needs to dump it back to json (even though below we
+        # will immediatley loads!)
+        entity_data = sj.dumps(entity_data)
+        # 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 = genshi.XML(render('factlet/read_core', format='xml'))
+        c.factlet = self._parse_json_data(json_data)
+        c.edit_form = genshi.XML(render('factlet/edit_core', format='xml'))
+        return render('factlet/edit')
+
+    def unflatten_form_data(self, formdict):
+        # convert back to json string format (not actual domain object)
+        # name convention follows formencode
+        x = formdict.get('location__x', None)
+        y = formdict.get('location__y', None)
+        try: x = float(x)
+        except: x = None
+        try: y = float(y)
+        except: y = None
+        if x or y:
+            formdict['location'] = {'type': 'Point', 'coordinates': [x, y] }
+
+    def template(self, id):
+        template_kind = id
+        # like formencode htmlfill: might want to see what we can do
+        try:
+            request_data = request.params.keys()[0]
+        except Exception, inst:
+            msg = "Can't find entity data in request params %s: %s" % (
+                request.params.items(), str(inst)
+            )
+            raise Exception, msg
+        if template_kind == 'read':
+            c.factlet = self._parse_json_data(request_data)
+            html = render('factlet/read_core', format='xml')
+            return html
+        elif template_kind == 'edit':
+            c.factlet = self._parse_json_data(request_data)
+            html = render('factlet/edit_core', format='xml')
+            return html
+        else:
+            abort(404)
+
+    # TODO: remove_id argument to make this optional
+    # this means that e.g. for read can just send id and will work
+    def _parse_json_data(self, json_data):
+        json_data = sj.loads(json_data)
+        # do not want to flush as may be just a preview
+        converter = microfacts.lib.json.FactletConverter(flush=False)
+        # also remove id just to be safe
+        # with id in even with no flush we may modify the domain object with
+        # this id in the current session
+        fctid = None
+        if 'id' in json_data:
+            fctid = json_data['id']
+            del json_data['id']
+        factlet  = converter.to_domain_object(json_data)
+        # add it back in for use in the template
+        if fctid:
+            factlet.id = fctid
+        return factlet 

trunk/microfacts/lib/json.py

@@ -45 +45 @@
-class Converter(object):
-    domain_object = None
+
+    def __init__(self, flush=True):
+        '''
+        @param flush: if True automatically add domain objects to DB session
+        and flush. If False ensure domain objects are not in DB session.
+        '''
+        self.flush = flush
-
-    def _get_domain_object(self, data):
@@ -135 +142 @@
-                    val = shapely.geometry.asShape(geojson.loads(simplejson.dumps(v)))
-            setattr(entity, k, val)
-
+
+
-        return entity
-
@@ -156 +164 @@
-                val = v
-            setattr(entity, k, val)
-
+
+
-        return entity
-
-
-

trunk/microfacts/public/behaviour/app/views/factletdetailsview.js

@@ -31 +31 @@
-            console.log('Factlet Edit Link clicked.');
-            var evt = new Event(e);
-
+// 
-            // TODO: inline editing
-
+// 
-        }
-    }

trunk/microfacts/templates/factlet/edit.html

@@ -10 +10 @@
-
-  <head>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  </head>
-
-  <body class="importfactlet">
-
+
+
+
+
+
+
+
+
+
+
+
-  </body>
-</html>

trunk/microfacts/templates/factlet/edit_core.html

@@ -1 @@
-<!DOCTYPE html>
-<div
-  xmlns="http://www.w3.org/1999/xhtml"
@@ -6 +5 @@
-  py:strip="True"
-  >
+    <div id="factlet-${c.factlet.id}" class="factlet factlet-update-form">
+    <form class="factlet-update-form" method="post" action="" accept-charset="utf-8">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      <dl>
-        <dt>Date</dt>
-        <dd>
-Start: ${c.factlet.start
-End: ${c.factlet.end
+<label>Start:</label> ${h.text_field('start', value=c.factlet.start)
+<label>End:</label> ${h.text_field('end', value=c.factlet.end)
-        </dd>
-        <dt>Location</dt>
-        <dd>
-Long: ${c.factlet.location.x
-Lat: ${c.factlet.location.y
+<label>Long:</label> ${h.text_field('location__x', value=value_of(c.factlet.location.x, None))
+<label>Lat:</label> ${h.text_field('location__y', value=value_of(c.factlet.location.y, None))
-        </dd>
-
+ Url
-        <dd>
-
-
-
+
-        </dd>
-        <dt>License</dt>
-
+
+
+
-      </dl>
-
-      <p>
-
+
+
-      </p>
+    </form>
-    </div>
-</div>

trunk/microfacts/templates/factlet/read.html

@@ -10 +10 @@
-
-  <head>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  </head>
-

trunk/microfacts/templates/layout.html

@@ -7 +7 @@
-  >
-
-microfacts
+
-
-  <py:match path="head" once="true">

trunk/microfacts/tests/functional/test_factlet.py

@@ -2 +2 @@
-import microfacts.model as model
-from microfacts.modes import *
+
+from simplejson import dumps
-
-class TestFactletController(TestController):
@@ -7 +9 @@
-    def setUp(self):
-        model.Session.clear()
+        # cannot use this transaction+rollback approach to insulating fixtures
+        # as it causes problems for the update test (factlet is not retrieved
+        # after model.Session.clear -- perhaps because not 'properly' in db
+        # model.Session.begin()
-        import microfacts.lib.json
-        import pkg_resources
@@ -21 +27 @@
-
-    def tearDown(self):
-
-
-
+
+
+
+
+
-        model.Session.flush()
-        model.Session.remove()
@@ -70 +78 @@
-        assert 'Battle of Waterloo' in response
-
-
-
+
+
+
-        fct = self.factlets[0]
-
-
-
+
+
-        assert 'Battle of Austerlitz' in response
-        assert str(fct.license) in response
@@ -82 +90 @@
-        assert fct.location.x in response
-
+    def test_template_read_without_object(self):
+        path = url_for(controller='factlet', action='template', id='read')
+        title = 'Something Completely Random'
+        data = { 'title': title }
+        response = self.app.post(path, params=dumps(data))
+        assert title in response
+
+    def test_template_edit(self):
+        path = url_for(controller='factlet', action='template', id='edit')
+        ftconverter = microfacts.lib.json.FactletConverter()
+        fct = self.factlets[0]
+        data = ftconverter.from_domain_object(fct)
+        newtitle = 'Battle of Austerlitz Modified but Not Saved'
+        data['title'] = newtitle
+        response = self.app.post(path, params=dumps(data))
+        print response
+        assert newtitle in response
+        assert fct.description in response
+        assert str(fct.license) in response
+        assert fct.start in response
+        # *really* weird, value_of does not work in template now but plain
+        # ${c.factlet.location.x} does!
+        # assert fct.location.x in response
+        assert '<label>' in response
+        # check no change to domain model ...
+        assert fct.title != newtitle
+
-    def test_read(self):
-hould be in read_core
+imilar to template_read test
-        factletId = self.factlets[0].id
-assert factletId
+fct = self.factlets[0]
-        path = url_for(controller='factlet', action='read', id=factletId)
-        response = self.app.get(path)
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        try:
-            assert 'Battles in the Napoleonic Wars' in response
-        except:
-            print response
-            raise
-
-        response = response.click('Battles in the Napoleonic Wars')
-        try:
-            assert 'Battles in the Napoleonic Wars' in response
-            assert 'Battle of Austerlitz' in response
-            assert 'Battle of Borodino' in response
-            assert 'Battle of Waterloo' in response
-        except:
-            print response
-            raise
-
-class TestFactletNew(TestController):