Conjunto de mudanças 6510 no repositório publico

Timestamp:

16/06/2012 19:39:47 (9 anos atrás)

Autor:

mazza

Mensagem:

boxes: DtRow? refatorada p usar um template

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis

Arquivos:

• browser/boxes/manager.py (modificado) (5 diffs)
• browser/boxes/templates/dtrow.html (adicionado)
• tests/testunitboxes.py (modificado) (2 diffs)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/boxes/manager.py

@@ -24 +24 @@
 template_factory = Environment(loader=PackageLoader(__name__))
 
-class BaseBox(object):
+class TemplateAware(object):
+
+    @property
+    def template(self):
+        return template_factory.get_template(self.template_name)
+
+
+class BaseBox(TemplateAware):
     """Base abstract class for editable boxes.
     """
 
-    TEMPLATE_NAME = 'basebox.html'
+    template_name = 'basebox.html'
 
     def __init__(self, permission=ModifyPortalContent):
@@ -34 +41 @@
 
     def __call__(self, context):
-        basebox_template = template_factory.get_template(self.TEMPLATE_NAME)
-        return basebox_template.render(
+        return self.template.render(
             box = self,
             has_permission = self.has_permission(context),
@@ -131 +137 @@
 
 # ROWS
-class DtRow(object):
+class DtRow(TemplateAware):
 
-    ROW_TEMPLATE = '''
-  <div class="dt-row">%s
-  </div>'''
-
-    CELL_TEMPLATE = '''
-    <div class="dt-cell dt-position-%s dt-width-%s">%s
-    </div>'''
+    template_name = 'dtrow.html'
 
     def __init__(self, *row_spec):
         try:
-            for (width, template) in row_spec: pass
+            for (width, renderable) in row_spec: pass
         except ValueError, e:
             e.args += row_spec
@@ -149 +149 @@
         self.row_spec = row_spec
 
-    def _cells(self, context):
-        """Iterates transforming each cell spec from (width, template) to
-           (position, width, rendered_html)
+    def cells(self, context):
+        """Iterates transforming each cell spec from (width, renderable) to
+           a dict of {position, width, rendered_html}
         """
         position = 0
-        for (width, template) in self.row_spec:
-            yield (position, width, template(context))
+        for (width, renderable) in self.row_spec:
+            yield dict(position=position, width=width, html=renderable(context))
             position += width
 
@@ -162 +162 @@
         `row_spec` is a sequence of cell specs: [(width, schema, number), ...]
         """
-        return self.ROW_TEMPLATE % ''.join(
-            [self.CELL_TEMPLATE % cell for cell in self._cells(context)])
+        return self.template.render(cells = self.cells(context))
 
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testunitboxes.py

@@ -80 +80 @@
     </div>
   </div>
-''', DtRow((1, Mock(return_value="\n      AAA")),
-           (2, Mock(return_value="\n      BBB")),
-           (3, Mock(return_value="\n      CCC")),
-           (1, Mock(return_value="\n      DDD"))).render(context))
+''', DtRow((1, Mock(return_value="AAA")),
+           (2, Mock(return_value="BBB")),
+           (3, Mock(return_value="CCC")),
+           (1, Mock(return_value="DDD"))).render(context))
 
 
@@ -97 +97 @@
         if name == "istubbox.html":
             return Template("{{var}}")
-        elif name == BaseBox.TEMPLATE_NAME:
-            return template_factory.get_template(BaseBox.TEMPLATE_NAME)
+        elif name == "basebox.html":
+            return template_factory.get_template(name)
         else:
-            raise AssertionError
-
+            raise AssertionError("Unexpected name: [%s]" % name)