Changeset 7713

Timestamp:

03/09/08 19:57:50 (5 years ago)

Author:

tomyhero

Message:

lang/perl/Data::FormValidate? : Bug fix. multiple error was not worked well.

Location:

lang/perl/Data-FormValidateEm/trunk

Files:

• conf/sample.conf (modified) (1 diff)
• lib/Data/FormValidateEm.pm (modified) (1 diff)
• lib/Data/FormValidateEm/Plugin/String.pm (modified) (1 diff)
• lib/Data/FormValidateEm/Results.pm (modified) (9 diffs)
• t/error-messages.t (modified) (3 diffs)
• t/lib/OreOrePlugin/OreOre.pm (modified) (1 diff)
• t/profile-defaults.t (modified) (2 diffs)

lang/perl/Data-FormValidateEm/trunk/conf/sample.conf

@@ -14 +14 @@
                 args :
                     max : 50
-                    min : 2
+                    min : 10
             - String::string 
             - +OreOrePlugin::OreOre::foo

lang/perl/Data-FormValidateEm/trunk/lib/Data/FormValidateEm.pm

@@ -26 +26 @@
     $self->{constraints}{regex_map} = $self->_make_constraints('regex_map');
 
-    #warn $self->get_message( 'title', 'String::length' );
     return $self;
 }

lang/perl/Data-FormValidateEm/trunk/lib/Data/FormValidateEm/Plugin/String.pm

@@ -7 +7 @@
     my $text = shift;
     my $args = shift;
+
     die 'you must set max argument' unless exists $args->{max};
     die 'you must set min argument' unless exists $args->{min};

lang/perl/Data-FormValidateEm/trunk/lib/Data/FormValidateEm/Results.pm

@@ -7 +7 @@
 use Carp;
 use Data::Dumper;
-__PACKAGE__->mk_accessors(qw/valid invalid unknown missing has_error has_invalid has_missing error_messages/);
+__PACKAGE__->mk_accessors(
+    qw/valid invalid unknown missing has_error has_invalid has_missing error_messages/
+);
 
 sub new {
@@ -18 +20 @@
     my $args        = shift;
 
-    my $self        = bless {}, $class;
-    $self->_process( $constraints, $profile, $data , $messages , $labels, $args );
+    my $self = bless {}, $class;
+    $self->_process( $constraints, $profile, $data, $messages, $labels,
+        $args );
     return $self;
 }
@@ -30 +33 @@
     my $field    = shift;
     my $label    = shift;
-    my $type     = shift ;
+    my $type     = shift;
+
     #FIXME
-    my $lang  = 'ja' ;
-
-    my $message = $messages->{ $label }{ $lang } ;
-    my $args = $arg->{$type}{$field}{$label} || {};
+    my $lang = 'ja';
+
+    my $message   = $messages->{$label}{$lang};
+    my $args      = $arg->{$type}{$field}{$label} || {};
     my $__field__ = $labels->{$lang}{$field} || $field;
-    $message =~ s/__field__/$__field__/g;
-
-    foreach my $key ( keys %{ $args } ) {
-        my $regexp = '\$_\[' . $key . '\]' ;
-        my $value = $args->{$key};
+    $message =~ s/__field__/<span class="label">$__field__<\/span>/g;
+
+    foreach my $key ( keys %{$args} ) {
+        my $regexp = '\$_\[' . $key . '\]';
+        my $value  = $args->{$key};
         $message =~ s/$regexp/$value/g;
     }
@@ -57 +61 @@
     my $args        = shift;
 
-
-    my %data     = $self->_get_input_as_hash($data);
-    my %valid    = %data;
+    my %data           = $self->_get_input_as_hash($data);
+    my %valid          = %data;
     my $error_messages = {};
-    my @missings = ();
-    my @unknown  = ();
-    my %invalid  = ();
-
-
-    if( defined $profile->{defaults} ) {
-        foreach my $field (keys %{ $profile->{defaults} } ) {
-            $valid{$field} ||= $profile->{defaults}{ $field } ;
-        }
-    }
+    my @missings       = ();
+    my @unknown        = ();
+    my %invalid        = ();
+
+    if ( defined $profile->{defaults} ) {
+        foreach my $field ( keys %{ $profile->{defaults} } ) {
+            $valid{$field} ||= $profile->{defaults}{$field};
+        }
+    }
+
     # Remove all empty fields
     for my $field ( keys %valid ) {
@@ -116 +119 @@
     for my $field ( keys %required ) {
         push @missings, $field unless exists $valid{$field};
-        delete $valid{$field} unless exists $valid{$field};
-    }
-
-    # Check must_be_plural
-    # TODO : even user set too much prameters which generate missing error which look strange....
-    foreach my $field ( keys %{$profile->{must_be_plural}} ) {
-        if( ref $valid{$field} eq 'ARRAY' ) {
-            unless( scalar @{$valid{$field}} == $profile->{must_be_plural}{$field} ) {
-                push @missings, $field ;
+        delete $valid{$field}  unless exists $valid{$field};
+    }
+
+# Check must_be_plural
+# TODO : even user set too much prameters which generate missing error which look strange....
+    foreach my $field ( keys %{ $profile->{must_be_plural} } ) {
+        if ( ref $valid{$field} eq 'ARRAY' ) {
+            unless (
+                scalar @{ $valid{$field} }
+                == $profile->{must_be_plural}{$field} )
+            {
+                push @missings, $field;
                 delete $valid{$field};
             }
         }
         else {
-            push @missings, $field ;
+            push @missings, $field;
             delete $valid{$field};
-            
+
         }
     }
 
     for my $field ( keys %required ) {
-
+        my $is_invalid = 0;
         # if no valud do not need to check it
         next if any(@missings) eq $field;
 
-        my $validators = any( @{ $profile->{use_loose} } ) eq $field ? $constraints->{loose}{$field} : $constraints->{strict}{$field};
+        my $validators
+            = any( @{ $profile->{use_loose} } ) eq $field
+            ? $constraints->{loose}{$field}
+            : $constraints->{strict}{$field};
 
         my $type = {};
-        if(  any( @{ $profile->{use_loose} } ) eq $field  ) {
-            $validators = $constraints->{loose}{$field} ;
+        if ( any( @{ $profile->{use_loose} } ) eq $field ) {
+            $validators = $constraints->{loose}{$field};
             $type->{$field} = 'loose';
         }
         else {
-            $validators = $constraints->{strict}{$field} ;
+            $validators = $constraints->{strict}{$field};
             $type->{$field} = 'strict';
         }
 
         # regexp_map try~
-        if( !defined $validators ) {
+        if ( !defined $validators ) {
             foreach my $regexp ( keys %{ $constraints->{regex_map} } ) {
-                if( $field =~ qr/$regexp/ ) {
-                    $validators = $constraints->{regex_map}{ $regexp } ;
+                if ( $field =~ qr/$regexp/ ) {
+                    $validators = $constraints->{regex_map}{$regexp};
                     $type->{$field} = 'regex_map';
                 }
@@ -166 +175 @@
                 if ( ref $valid{$field} eq 'ARRAY' ) {
                     for my $v ( @{ $valid{$field} } ) {
-                        if ( $validators->{$name}{method}->( $valid{$field} ) ) {
-                        # ok!
+                        if ($validators->{$name}{method}->( $valid{$field} ) )
+                        {
+
+                            # ok!
                         }
                         else {
-                            $invalid{$field}{ $validators->{$name}{label} } = 1;
-                            $error_messages->{$field} = [] unless exists $error_messages->{$field};
-                            push @{ $error_messages->{$field} }  ,$self->_get_message( $args , $labels ,$messages, $field , $validators->{$name}{label} , $type->{ $field } );
-                            delete $valid{$field};
+                            $invalid{$field}{ $validators->{$name}{label} }
+                                = 1;
+                            $error_messages->{$field} = []
+                                unless exists $error_messages->{$field};
+                            push @{ $error_messages->{$field} },
+                                $self->_get_message( $args, $labels,
+                                $messages, $field,
+                                $validators->{$name}{label},
+                                $type->{$field} );
+                                $is_invalid++;
                             last;
                         }
                     }
 
-                    if( ! defined $profile->{must_be_plural}{$field} && none( @{ $profile->{may_be_plural} } ) eq $field ) { 
+                    if ( !defined $profile->{must_be_plural}{$field}
+                        && none( @{ $profile->{may_be_plural} } ) eq $field )
+                    {
                         $valid{$field} = $valid{$field}[0];
                         last;
@@ -186 +205 @@
                 else {
                     if ( $validators->{$name}{method}->( $valid{$field} ) ) {
+
                         # return alwasy array ref when may_be_plural is seted.
-                        if(  any( @{ $profile->{may_be_plural} } ) eq $field ) {
+                        if ( any( @{ $profile->{may_be_plural} } ) eq $field )
+                        {
                             my $value = $valid{$field};
                             $valid{$field} = [];
-                            push @{ $valid{$field} } , $value;
+                            push @{ $valid{$field} }, $value;
                         }
 
@@ -196 +217 @@
                     else {
                         $invalid{$field}{ $validators->{$name}{label} } = 1;
-                        $error_messages->{$field} = [] unless exists $error_messages->{$field};
-                        push @{ $error_messages->{$field} }  ,$self->_get_message( $args , $labels, $messages, $field , $validators->{$name}{label} , $type->{ $field } );
-                        delete $valid{$field};
+                        $error_messages->{$field} = []
+                            unless exists $error_messages->{$field};
+                        push @{ $error_messages->{$field} },
+                            $self->_get_message( $args, $labels, $messages,
+                            $field, $validators->{$name}{label},
+                            $type->{$field} );
+                            $is_invalid++;
                     }
                 }
@@ -207 +232 @@
         }
 
-    }
-
-    # FIXME : Just for now. 
-    # invalid , missing もそうだけど、 __field__ とかの置き換えするとかで、フィールド名も表示できたほがいいよな。
-    if( scalar @missings ) {
-        for my $missing ( @missings ) {
-            $error_messages->{$missing} = [] unless exists $error_messages->{$missing};
-            push @{ $error_messages->{ $missing } } , 'missing.';
-        }
-    }
-
-    $self->{valid}   = \%valid;
-    $self->{invalid} = \%invalid;
-    $self->{missing} = \@missings;
-    $self->{unknown} = \@unknown;
+        delete $valid{$field} if $is_invalid;
+    }
+
+# FIXME : Just for now.
+# invalid , missing もそうだけど、 __field__ とかの置き換えするとかで、フィールド名も表示できたほがいいよな。
+    if ( scalar @missings ) {
+        for my $missing (@missings) {
+            $error_messages->{$missing} = []
+                unless exists $error_messages->{$missing};
+            push @{ $error_messages->{$missing} }, 'missing.';
+        }
+    }
+
+    $self->{valid}          = \%valid;
+    $self->{invalid}        = \%invalid;
+    $self->{missing}        = \@missings;
+    $self->{unknown}        = \@unknown;
     $self->{error_messages} = $error_messages;
 
     $self->{has_missing} = scalar @missings ? 1 : 0;
-    $self->{has_invalid} = keys %invalid ? 1 : 0;
-    $self->{has_error}   = $self->{has_missing} || $self->{has_invalid} ? 1 : 0;
-
-
-}
-
-
+    $self->{has_invalid} = keys %invalid    ? 1 : 0;
+    $self->{has_error} = $self->{has_missing} || $self->{has_invalid} ? 1 : 0;
+
+}
 
 # takes string or array ref as input

lang/perl/Data-FormValidateEm/trunk/t/error-messages.t

@@ -31 +31 @@
 === normal ok test
 --- input yaml
-title   : a 
+title   : foo
 subject : a
 --- profile yaml
@@ -44 +44 @@
 {
 subject => { 'String::length' => 1 },
-title   => { 'String::length' => 1 }
+title   => { 'String::length' => 1 , '+OreOrePlugin::OreOre::foo' => 1 }
 }
 --- unknown eval
@@ -50 +50 @@
 --- error_messages yaml
 subject : 
-    - 2文字以上100文字以下で題名をご記入ください。
+    - 2文字以上100文字以下で<span class="label">題名</span>をご記入ください。
 title :
-    - 2文字以上50文字以下でtitleをご記入ください。
+    - ore ore
+    - 10文字以上50文字以下で<span class="label">title</span>をご記入ください。

lang/perl/Data-FormValidateEm/trunk/t/lib/OreOrePlugin/OreOre.pm

@@ -4 +4 @@
 
 sub dfv_foo {
-    1;
+    return shift eq 'foo' ? 0 : 1 ;
 }
 

lang/perl/Data-FormValidateEm/trunk/t/profile-defaults.t

@@ -35 +35 @@
     - title
 defaults :
-    title : aaaa
+    title : aaaaaaaaaaa
 --- valid yaml
-title :  aaaa
+title :  aaaaaaaaaaa
 --- missing eval
 []
@@ -46 +46 @@
 === not overwrite
 --- input yaml
-title: bbb
+title: bbbbbbbbbbbbb
 --- profile yaml
 required :
     - title
 defaults :
-    title : aaaa
+    title : bbbbbb
 --- valid yaml
-title :  bbb
+title :  bbbbbbbbbbbbb
 --- missing eval
 []