Validators done

ngforms.py

@@ -1,5 +1,6 @@
 import re
 
+
 class Form(object) 
 
   def build(self):
@@ -12,52 +13,75 @@ def fields(self):
   def validations(self):
     raise NotImplemented()
 
+  def field(self, name):
+    return ""
+
 
-# ----------------------------------------
+class Validation(object):
+  """The name of the field containing the value"""
+  input = ""
 
-class Validation(object)
   def __init__(self, name, message, attr):
     self.name = name
     self.message = message
     self.attr = attr
 
-  def validate(self):
+  def validate(self, form):
     raise NotImplemented()
 
+
 class MinLength(Validation)
   def __init__(self, min, message):
-    self.min = min
-    super(MinLength, self).__init__("MinLength", message, 
+    super(MinLength, self).__init__("minlength", message, 
         {"ng-minlength" : min})
+    self.min = min
+
+  def validate(self, form):
+    return len(form.field(self.input)) >= min
 
-  def validate(self, value):
-    return len(value) >= min
 
 class MaxLength(Validation)
   def __init__(self, max, message):
-    self.max = max
-    super(MaxLength, self).__init__("MaxLength", message,
+    super(MaxLength, self).__init__("maxLength", message,
         {"ng-maxlength" : max})
+    self.max = max
+
+  def validate(self, form):
+    return len(form.field(self.input)) =< max
 
-  def validate(self, value):
-    return len(value) =< max
 
 class Required(Validation)
-  def __init__(self, field, message):
-    self.field = field
-    super(Required, self).__init__("Required", message, {"required"})
+  def __init__(self, message):
+    super(Required, self).__init__("required", message, {"required"})
+
+  def validate(self, form):
+    return len(form.field(self.input)) > 0
 
-  def validate(self, field):
-    return len(field)>0
 
 class Email(Validation)
-  def __init__(self, email, message):
-    self.email = email
-    super(Email, self).__init__("Email", message, {})
-
-  def validate(self, email):
-    if not re.match("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$", email):
-      return False
-    else:
-      return True
-
+  def __init__(self, message):
+    super(Email, self).__init__("email", message, {})
+
+  def validate(self, form):
+    return re.match("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$", 
+        form.field(self.input)) 
+        is not None
+
+
+class Match(Validation)
+  def __init__(self, value, message):
+    super(Match, self).__init__("match", message, {})
+    self.value = value
+
+    def validate(self, form):
+      return value == form.field(self.input)
+
+
+class Pattern(Validation)
+  def __init__(self, pattern, message):
+    super(Pattern, self).__init__("pattern", message, 
+        {"pattern" : pattern})
+    self.pattern = pattern
+
+    def validate(self, form):
+      return re.match(pattern,form.field(self.input)) is not None