added support for validating dir attribute

Mark Pilgrim · Mark Pilgrim · commit 10f627a5c9bd · 2007-08-30T17:21:54.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40979
diff --git a/src/html5lib/filters/validator.py b/src/html5lib/filters/validator.py
@@ -49,6 +49,8 @@
         _(u"This value can not be blank: '%(attributeName)s' attribute on <%(tagName)s>."),
     "id-does-not-exist":
         _(u"This value refers to a non-existent ID: '%(attributeName)s' attribute on <%(tagName)s>."),
+    "invalid-enumerated-value":
+        _(u"Value must be one of %(enumeratedValues)s: '%(attributeName)s' attribute on <%tagName)s>."),
     "contextmenu-must-point-to-menu":
         _(u"The contextmenu attribute must point to an ID defined on a <menu> element."),
 })
@@ -358,8 +360,25 @@ def validateAttributeValueClass(self, token, tagName, attrName, attrValue):
                                 "attributeName": attrName}}
 
     def validateAttributeValueContenteditable(self, token, tagName, attrName, attrValue):
+        for t in self.checkEnumeratedValue(token, tagName, attrName, attrValue, frozenset(('true', 'false', ''))) or []: yield t
+
+    def validateAttributeValueDir(self, token, tagName, attrName, attrValue):
+        for t in self.checkEnumeratedValue(token, tagName, attrName, attrValue, frozenset(('ltr', 'rtl'))) or []: yield t
+
+    def checkEnumeratedValue(self, token, tagName, attrName, attrValue, enumeratedValues):
+        if not attrValue and ('' not in enumeratedValues):
+            yield {"type": "ParseError",
+                   "data": "attribute-value-can-not-be-blank",
+                   "datavars": {"tagName": tagName,
+                                "attributeName": attrName}}
+            return
         attrValue = attrValue.lower()
-        if attrValue not in frozenset(('true', 'false', '')):
+        if attrValue not in enumeratedValues:
+            yield {"type": "ParseError",
+                   "data": "invalid-enumerated-value",
+                   "datavars": {"tagName": tagName,
+                                "attributeName": attrName,
+                                "enumeratedValues": tuple(enumeratedValues)}}
             yield {"type": "ParseError",
                    "data": "invalid-attribute-value",
                    "datavars": {"tagName": tagName,
