Fixed expression to support get_value and children methods (like attr…

…ibute_name)
marinho · Apr 19, 2010 · df7bced · df7bced
1 parent ff2f391
commit df7bced
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2010-04-18: Version 0.4-alpha-30
+--------------------------------
+* Fixed expression to support get_value and children methods (like attribute_name)
+
 2010-04-16: Version 0.4-alpha-29
 --------------------------------
 * Fixed on_new_page to support real current page number, instead of internal number (thanks to Ari Caldeira)

diff --git a/geraldo/__init__.py b/geraldo/__init__.py
@@ -31,7 +31,7 @@
 - tests - a package with automated doc tests.
 """
 
-VERSION = (0, 4, 'alpha-29')
+VERSION = (0, 4, 'alpha-30')
 
 def get_version():
     return '%d.%d-%s'%VERSION

diff --git a/geraldo/tests/28-expressions.txt b/geraldo/tests/28-expressions.txt
@@ -66,13 +66,14 @@ Report class
     ...         height = 0.7*cm
     ...         elements = [
     ...             ObjectValue(attribute_name='name'),
-    ...             ObjectValue(expression='age,', left=2*cm),
+    ...             ObjectValue(expression='age', left=2*cm),
     ...             ObjectValue(expression='weight', left=3.5*cm),
     ...             ObjectValue(expression='age * weight', left=5*cm),
     ...             ObjectValue(expression='age**2', left=6.5*cm),
-    ...             ObjectValue(attribute_name='name.upper', left=8*cm),
+    ...             ObjectValue(expression='name.upper', left=8*cm),
     ...             #ObjectValue(expression='name.upper[:3]', left=8*cm), TODO
     ...             ObjectValue(expression='age * weight ** 2', left=10.5*cm),
+    ...             ObjectValue(expression='name', left=12*cm, get_value=lambda self, inst: 'X'),
     ...         ]
     ... 
     ...     class band_summary(DetailBand):

diff --git a/geraldo/widgets.py b/geraldo/widgets.py
@@ -123,7 +123,11 @@ def prepare_expression(self):
 
         while True:
             f = EXP_QUOTED.findall(self.expression)
-            if not f: break
+            if not f:
+                # Replace simple attribute name or method to value("")
+                if '(' not in self.expression:
+                    self.expression = 'value("%s")' % self.expression
+                break
 
             self.expression = EXP_QUOTED.sub('("%s")'%(f[0]), self.expression, 1)
 
@@ -258,6 +262,7 @@ def get_value_by_expression(self, expression=None):
             global_vars = self.instance.__dict__
 
         global_vars.update({
+            'value': self.action_value,
             'count': self.action_count,
             'avg': self.action_avg,
             'min': self.action_min,