Implemented RodelbahnboxValidator.

git-svn-id: http://www.winterrodeln.org/svn/wrpylib/trunk@1920 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/tests/test_wrmwmarkup.py b/tests/test_wrmwmarkup.py
index 5129704d2190cea1465522d82441db3b07132ca5..aa0fd1bb0be741992c5b56822d889e1404695534 100644 (file)
--- a/tests/test_wrmwmarkup.py
+++ b/tests/test_wrmwmarkup.py
@@ -70,6 +70,66 @@ def test_RodelbahnboxDictConverter():
     assert other == other2
 
 
+def test_RodelbahnboxValidator():
+    v = wrpylib.wrmwmarkup.RodelbahnboxValidator()
+    wikitext = u'''{{Rodelbahnbox
+    | Position             = 47.309820 N 9.986508 E
+    | Position oben        =
+    | Höhe oben            = 1244
+    | Position unten       =
+    | Höhe unten           = 806
+    | Länge                = 5045
+    | Schwierigkeit        =
+    | Lawinen              = gelegentlich
+    | Betreiber            =
+    | Öffentliche Anreise  = Ja
+    | Aufstieg möglich     = Nein
+    | Aufstieg getrennt    = Nein
+    | Gehzeit              = 105
+    | Aufstiegshilfe       = Nein
+    | Beleuchtungsanlage   = Nein
+    | Beleuchtungstage     =
+    | Rodelverleih         = Ja
+    | Gütesiegel           =
+    | Webauskunft          =
+    | Telefonauskunft      = +43-664-1808482 (Bergkristallhütte)
+    | Bild                 = Rodelbahn Bergkristallhütte 2009-03-03.jpg
+    | In Übersichtskarte   = Ja
+    | Forumid              = 72
+    }}'''
+    sledrun = v.to_python(wikitext)
+    wikitext2 = v.from_python(sledrun)
+    assert wikitext == wikitext2
+    wikitext = u'''{{Rodelbahnbox
+    | Position             =
+    | Position oben        =
+    | Höhe oben            =
+    | Position unten       =
+    | Höhe unten           =
+    | Länge                =
+    | Schwierigkeit        =
+    | Lawinen              =
+    | Betreiber            =
+    | Öffentliche Anreise  =
+    | Aufstieg möglich     =
+    | Aufstieg getrennt    =
+    | Gehzeit              =
+    | Aufstiegshilfe       =
+    | Beleuchtungsanlage   =
+    | Beleuchtungstage     =
+    | Rodelverleih         =
+    | Gütesiegel           =
+    | Webauskunft          =
+    | Telefonauskunft      =
+    | Bild                 =
+    | In Übersichtskarte   =
+    | Forumid              =
+    }}'''
+    sledrun = v.to_python(wikitext)
+    wikitext2 = v.from_python(sledrun)
+    assert wikitext == wikitext2
+
+
 def test_gasthausbox_to_inn():
     wikitext = u'''{{Gasthausbox
     | Position          = 47.295549 N 9.986970 E

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 4b4682a6f9578da57778e2bfd35b01542f4f2027..8d5d9c3ce59a6ae7c70cbfb2adea4d3de2f23903 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -138,6 +138,27 @@ class RodelbahnboxDictConverter(formencode.Validator):
         return r
 
 
+class RodelbahnboxTemplateDict(formencode.Validator):
+    """Private helper class for RodelbahnboxValidator"""
+    def to_python(self, value, state):
+        title, anonym_params, named_params = value
+        if title != u'Rodelbahnbox':
+            raise Invalud('Template title has to be "Rodelbahnbox".', value, state)
+        if len(anonym_params) > 0:
+            raise Invalid('No anonymous parameters are allowed in "Rodelbahnbox".', value, state)
+        return named_params
+
+    def from_python(self, value, state):
+        return u'Rodelbahnbox', [], value
+
+
+class RodelbahnboxValidator(wrpylib.wrvalidators.RodelbahnboxDictValidator):
+    def __init__(self):
+        wrpylib.wrvalidators.RodelbahnboxDictValidator.__init__(self)
+        self.pre_validators=[wrpylib.mwmarkup.TemplateValidator(), RodelbahnboxTemplateDict()]
+        self.chained_validators = [RodelbahnboxDictConverter()]
+
+
 def sledrun_to_rodelbahnbox(sledrun, version):
     """Converts a sledrun class to the {{Rodelbahnbox}} representation.
     The sledrun class has to have properties like position_latitude, ...

diff --git a/wrpylib/wrvalidators.py b/wrpylib/wrvalidators.py
index d1f2038e9bea4b766f0a6a2f297479d814a17d82..820c0f2f96d28909c187bc5c9a132b385e4a46df 100644 (file)
--- a/wrpylib/wrvalidators.py
+++ b/wrpylib/wrvalidators.py
@@ -17,10 +17,22 @@ import formencode.national
 
 class OrderedSchema(formencode.Schema):
     def _convert_to_python(self, value, state):
-        result = formencode.Schema._convert_to_python(self, value, state)
-        ordered_result = collections.OrderedDict()
-        for key in value.iterkeys():
-            ordered_result[key] = result[key]
+        pre_validators = self.pre_validators
+        chained_validators = self.chained_validators
+        for validator in pre_validators:
+            value = validator.to_python(value, state)
+        self.pre_validators = []
+        self.chained_validators = []
+        try:
+            result = formencode.Schema._convert_to_python(self, value, state)
+            ordered_result = collections.OrderedDict()
+            for key in value.iterkeys():
+                ordered_result[key] = result[key]
+            for validator in chained_validators:
+                ordered_result = validator.to_python(ordered_result, state)
+        finally:
+            self.pre_validators = pre_validators
+            self.chained_validators = chained_validators
         return ordered_result