pluf2 Commit Details

Date:

2011-05-29 19:49:30 (14 years 5 months ago)

Author:

Thomas Keller

Branch:

master

Commit:

324ae60b390d91e85b0123b34da7253a18119b6a

Parents:

3f985c690c87a9629940e7419f15491ae3a35f55

Message:

Add support for closures / lambdas as per-field validation methods

The syntax for closures is

$this->clean_foo = function($form) {
// process $form->cleaned_data['foo']
}

This eases the handling of dynamic form fields somewhat that all
share some basic validation code, but can occur multiple times.

Changes:

File differences

-105
106 106
107 107
108
108 109
109 110
110 111
111 112
112 113
113 114
114 
115 
116 
115
116
117
118
119
120
121
117 122
118 123
119 124
+        $this->cleaned_data = array();␊
        $this->errors = array();␊
        $form_methods = get_class_methods($this);␊
        $form_vars = get_object_vars($this);␊
        foreach ($this->fields as $name=>$field) {␊
            $value = $field->widget->valueFromFormData($this->addPrefix($name),␊
                                                       $this->data); ␊
            try {␊
                $value = $field->clean($value);␊
                $this->cleaned_data[$name] = $value;␊
                if (in_array('clean_'.$name, $form_methods)) {␊
                    $m = 'clean_'.$name;␊
                    $value = $this->$m();␊
                $method = 'clean_'.$name;␊
                if (in_array($method, $form_methods)) {␊
                    $value = $this->$method();␊
                    $this->cleaned_data[$name] = $value;␊
                } else if (array_key_exists($method, $form_vars) &&␊
                           is_callable($this->$method)) {␊
                    $value = call_user_func($this->$method, $this);␊
                    $this->cleaned_data[$name] = $value;␊
                }                        ␊
            } catch (Pluf_Form_Invalid $e) {␊
         $this->cleaned_data = array();␊
         $this->errors = array();␊
         $form_methods = get_class_methods($this);␊
+        $form_vars = get_object_vars($this);␊
         foreach ($this->fields as $name=>$field) {␊
             $value = $field->widget->valueFromFormData($this->addPrefix($name),␊
                                                        $this->data); ␊
             try {␊
                 $value = $field->clean($value);␊
                 $this->cleaned_data[$name] = $value;␊
-                if (in_array('clean_'.$name, $form_methods)) {␊
-                    $m = 'clean_'.$name;␊
-                    $value = $this->$m();␊
+                $method = 'clean_'.$name;␊
+                if (in_array($method, $form_methods)) {␊
+                    $value = $this->$method();␊
+                    $this->cleaned_data[$name] = $value;␊
+                } else if (array_key_exists($method, $form_vars) &&␊
+                           is_callable($this->$method)) {␊
+                    $value = call_user_func($this->$method, $this);␊
                     $this->cleaned_data[$name] = $value;␊
                 }                        ␊
             } catch (Pluf_Form_Invalid $e) {␊

Download the corresponding diff file

pluf2

File differences

Branches