Changeset 147 for trunk/ticketvalidation

Timestamp:

27/01/10 11:41:03 (7 months ago)

Author:

mbooth

Message:

Implement boolean and/or operators for rule condition expressions.

Location:

trunk/ticketvalidation/ticketvalidation

Files:

• admin.py (modified) (1 diff)
• main.py (modified) (5 diffs)

trunk/ticketvalidation/ticketvalidation/admin.py

@@ -10 +10 @@
 from trac.web.chrome import add_script
 
+__all__ = ['TicketValidationAdminPanel']
+
 
 class TicketValidationAdminPanel(Component):
-    """Provides an admin panel for ticket validation config."""
+    """Provides an admin panel for configuring ticket validation rules."""
 
     implements(IAdminPanelProvider)

trunk/ticketvalidation/ticketvalidation/main.py

@@ -17 +17 @@
 from trac.web.chrome import ITemplateProvider
 
-__all__ = ['TicketValidationPlugin']
+__all__ = ['TicketValidationRules']
 
 
 class BoolOperand(object):
+    ticket = None
     def __init__(self, t):
         self.args = t[0]
@@ -26 +27 @@
         return "(" + " ".join(map(str,self.args)) + ")"
 
-
 class BoolEquality(BoolOperand):
     def __nonzero__(self):
         # TODO - implement this
-        return True
-
+        return False
 
 class BoolAnd(BoolOperand):
     def __nonzero__(self):
-        # TODO - implement this
+        for a in self.args[0::2]:
+            v = bool(a)
+            if not v:
+                return False
         return True
-
 
 class BoolOr(BoolOperand):
     def __nonzero__(self):
-        # TODO - implement this
-        return True
+        for a in self.args[0::2]:
+            v = bool(a)
+            if v:
+                return True
+        return False
 
 
-class TicketValidationPlugin(Component):
+class TicketValidationRules(Component):
     """Main component of the ticket validation plug-in. Fetches the validation
-    rules from the config and applies them when the user submits the ticket. If
-    any fields are found to violate the rules, the submission is disallowed and
-    the user is chastised."""
+    rules from the config, parses them and applies them appropriately."""
 
     implements(ITemplateProvider, ITicketManipulator)
@@ -59 +61 @@
         
         # grammar definition for parsing rule conditions
-        self._grammar = operatorPrecedence(Word(alphanums + '_') | quotedString,
+        self._grammar = operatorPrecedence(Word(alphanums + '_') | quotedString.setParseAction(removeQuotes),
                                            [(oneOf('== !='), 2, opAssoc.LEFT, BoolEquality),
                                             (oneOf('and &&'), 2, opAssoc.LEFT, BoolAnd),
@@ -73 +75 @@
                     'condition': config.get(name),
                     'required': config.get('%s.required' % name).split(),
+                    'hidden': config.get('%s.hidden' % name).split(),
                     }
             rules.append(rule)
@@ -113 +116 @@
         """This API is called by Trac when the user tries to submit a ticket.
         This is where the magic happens for required fields."""
-        rules = self.get_rules()
         problems = []
-        for r in rules:
+        BoolOperand.ticket = ticket
+        for r in self.get_rules():
             result = self._grammar.parseString(r['condition'])[0]
             self.log.debug('required field rule "%s": %s is %s' % (r['name'], str(result), bool(result)))