Conjunto de mudanças 6508 no repositório publico

Timestamp:

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

Autor:

mazza

Mensagem:

boxes: refatoracao para isolar classe base (abstrata) para as caixas

Localização:

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

Arquivos:

• browser/boxes/manager.py (modificado) (5 diffs)
• browser/boxes/templates/editablebox.html (adicionado)
• static/js/editable-box.js (modificado) (1 diff)
• tests/testunitboxes.py (modificado) (2 diffs)

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

@@ -1 @@
-from exceptions import ValueError
-
 import martian
 from AccessControl import getSecurityManager
@@ -19 +17 @@
 from interfaces import box_schemas
 
-
 class PersistentDictionaryField(datamanager.DictionaryField):
     adapts(PersistentDict, IField)
@@ -27 +24 @@
 template_factory = Environment(loader=PackageLoader(__name__))
 
-class Box(object):
+class EditableBox(object):
+
+    TEMPLATE_NAME = 'editablebox.html'
+
+    def __init__(self, permission=ModifyPortalContent):
+        self.permission = permission
+
+    def __call__(self, context):
+        editablebox_template = template_factory.get_template(self.TEMPLATE_NAME)
+        return editablebox_template.render(
+            box = self,
+            is_editable = self.is_editable(context),
+            inner = self.inner_render(context))
+
+    def is_editable(self, context):
+        return getSecurityManager().checkPermission(self.permission, context)
+
+    @property
+    def id(self):
+        raise NotImplementedError
+
+    @property
+    def edit_href(self):
+        raise NotImplementedError
+
+    def inner_render(self, context):
+        raise NotImplementedError
+
+
+class Box(EditableBox):
 
     ALL_BOXES_KEY = 'il.portalinterlegis.boxes'
 
-    BOX_TEMPLATE = '''
-      <div id="%s"%s>
-%s
-      </div>'''
-
     def __init__(self, schema, number, permission=ModifyPortalContent, form_label=None):
+        super(Box, self).__init__(permission)
         self.schema = schema
         self.number = number
-        self.permission = permission
-        #TODO: improve this text
-        self.form_label = form_label or u'Edite os valore desta caixa'
+        self.form_label = form_label or u'Edite os valore desta caixa' #TODO: improve this text
 
-    def __call__(self, context):
-        is_editable = getSecurityManager().checkPermission(self.permission, context)
-        return self.BOX_TEMPLATE % (self.key,
-                                    ' class ="editable-box"' if is_editable else '',
-                                    self.template.render(self.content(context)))
+    @property
+    def id(self):
+        return '%s_%s' % (self.schema.__name__, self.number)
+
+    def inner_render(self, context):
+        template = template_factory.get_template(self.schema.__name__.lower() + '.html')
+        return template.render(self.content(context))
 
     def content(self, context):
         annotations = IAnnotations(context)
         boxes = get_or_create_persistent_dict(annotations, self.ALL_BOXES_KEY)
-        return get_or_create_persistent_dict(boxes, self.key)
-
-    @property
-    def template(self):
-        return template_factory.get_template(
-            self.schema.__name__.lower() + '.html')
-
-    @property
-    def key(self):
-        return '%s_%s' % (self.schema.__name__, self.number)
+        return get_or_create_persistent_dict(boxes, self.id)
 
     @property
@@ -67 +80 @@
         """Last part of form urls.
         """
-        return 'box_%s' % self.key
+        return 'box_%s' % self.id
+
+    edit_href = form_name # To be overridden independently
+
 
 def build_box_form(box):
@@ -99 +115 @@
             return template.render(self)
 
-    globals()['BoxEditForm_%s' % box.key] = BoxEditForm
+    globals()['BoxEditForm_%s' % box.id] = BoxEditForm
     return BoxEditForm
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/static/js/editable-box.js

@@ -15 +15 @@
 /*global common_content_filter:false */
 jQuery(function($) {
-  $('.editable-box').each(function() {
-      var id = $(this).attr('id');
-      var current = removeSuffix(String(window.location), '/carrossel');
-      var edithref = current + '/box_' + id;
-      $('<a class="editable-box-link" href="' + edithref + '"><img src="pencil_icon.png" width="16" height="16" alt="Edite esta caixa"/></a>')
-        .appendTo($(this))
-        .prepOverlay({
-            subtype: 'iframe',
-            filter: '#content',
-            formselector: 'form',
-            config: {
+  $('.editable-box-link').each(function() {
+      $(this).prepOverlay({
+          subtype: 'iframe',
+          filter: '#content',
+          formselector: 'form',
+          config: {
               closeOnClick: true,
               mask: {
-                color: '#000000',
-                opacity: 0.8
+                  color: '#000000',
+                  opacity: 0.8
               },
               onClose: function() {
-                location.reload();
-            }
-            },
-        });
+                  location.reload();
+              }
+          },
+      });
   });
 

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

@@ -34 +34 @@
     def test_box_render_basic(self):
 
-        with patch('il.portalinterlegis.browser.boxes.manager.template_factory',
-                   template_factory_stub('        XXXX')):
+        with patch('il.portalinterlegis.browser.boxes.manager.template_factory', TemplateFactoryStub()):
 
             box = Box(IStubBox, 1)
-            box.content = Mock(
-                return_value = {'var': 'XXXX'})
+            box.content = Mock(return_value = {'var': 'XXXX'})
             context = object()
             self.assertMultiLineEqual('''
-      <div id="IStubBox_1">
-        XXXX
-      </div>''', box(context))
+<div id="IStubBox_1">
+  XXXX
+</div>''', box(context))
             box.content.assert_called_with(context)
 
     def test_box_render_editable(self):
-        with patch('il.portalinterlegis.browser.boxes.manager.template_factory',
-                   template_factory_stub('        XXXX')):
+        with patch('il.portalinterlegis.browser.boxes.manager.template_factory', TemplateFactoryStub()):
             with patch('il.portalinterlegis.browser.boxes.manager.getSecurityManager') as security_mock:
                 security_mock.checkPermission.return_value = True
 
                 box = Box(IStubBox, 1)
-                box.content = Mock(
-                    return_value = {'var': 'XXXX'})
+                box.content = Mock(return_value = {'var': 'XXXX'})
                 context = object()
                 self.assertMultiLineEqual('''
-      <div id="IStubBox_1" class ="editable-box">
-        XXXX
-      </div>''', box(context))
+<div id="IStubBox_1" class ="editable-box" >
+  XXXX
+  <a class="editable-box-link" href="box_IStubBox_1">
+    <img src="pencil_icon.png" width="16" height="16" alt="Edite esta caixa"/>
+  </a>
+</div>''', box(context))
                 box.content.assert_called_with(context)
 
@@ -90 +89 @@
     pass
 
-class TemplateStub(object):
-    def render(self, context):
-        return "        %(var)s" % context
+from il.portalinterlegis.browser.boxes.manager import template_factory, EditableBox
+from jinja2 import Template
 
-def template_factory_stub(value):
-    template_factory_stub = Mock()
-    template_factory_stub.get_template.return_value = TemplateStub()
-    return template_factory_stub
+class TemplateFactoryStub(object):
 
+    def get_template(self, name):
+        if name == "istubbox.html":
+            return Template("{{var}}")
+        elif name == EditableBox.TEMPLATE_NAME:
+            return template_factory.get_template(EditableBox.TEMPLATE_NAME)
+        else:
+            raise AssertionError
+