Changeset 14083

Timestamp:

06/15/08 23:02:27 (5 years ago)

Author:

tomyhero

Message:

lang/perl/FormValidator::LazyWay? : add Message::JA|EN

Location:

lang/perl/FormValidator-LazyWay/branches/rebuild

Files:

• lib/FormValidator/LazyWay.pm (modified) (9 diffs)
• lib/FormValidator/LazyWay/Message (added)
• lib/FormValidator/LazyWay/Message.pm (modified) (2 diffs)
• lib/FormValidator/LazyWay/Message/EN.pm (added)
• lib/FormValidator/LazyWay/Message/JA.pm (added)
• t/message-base-message.t (added)
• t/message.t (modified) (1 diff)

lang/perl/FormValidator-LazyWay/branches/rebuild/lib/FormValidator/LazyWay.pm

@@ -61 +61 @@
         sub { $self->_validation_block(@_) },
 
-        # エラーメッセージセット
-        sub { $self->_set_error_message(@_) },
     );
 
@@ -72 +70 @@
 }
 
-sub _set_error_message {
+sub _set_error_message_for_display {
+    my $self           = shift;
+    my $storage        = shift;
+    my $error_messages = shift;
+    my $lang           = shift || 'ja';    #TODO
+
+    foreach my $field ( keys %{$error_messages} ) {
+
+        local $" = ',';
+        my $tmp = "@{$error_messages->{$field}}";
+
+        # TODO
+        my $mes = '__field__は__rule__だよ';
+        $mes =~ s/__rule__/$tmp/g;
+
+        # TODO
+        my $label = $field;
+        $mes =~ s/__field__/$label/g;
+        $error_messages->{$field} = $mes;
+    }
+
+    # setting missing error message
+    if ( scalar @{ $storage->{missings} } ) {
+        for my $missing ( @{ $storage->{missings} } ) {
+            # missing.
+            $error_messages->{$missing} = $missing . ' is missing.';
+        }
+    }
+
+    $storage->{error_message} = $error_messages;
 
 }
 
 sub _append_error_message {
-    my $self          = shift;
-    my $lang          = shift;
-    my $level         = shift;
-    my $field         = shift;
-    my $storage       = shift;
-    my $label         = shift;
+    my $self           = shift;
+    my $lang           = shift;
+    my $level          = shift;
+    my $field          = shift;
+    my $storage        = shift;
+    my $label          = shift;
     my $error_messages = shift;
 
-    $storage->{invalid}{$field}{ $label } = 1;
-
-    unless(  exists $error_messages->{$field} ) {
+    $storage->{invalid}{$field}{$label} = 1;
+
+    unless ( exists $error_messages->{$field} ) {
         $error_messages->{$field} = [];
-    } 
-    push @{ $error_messages->{$field} }, $self->message->get( { lang => $lang , field => $field, label => $label , level => $level } );
+    }
+    push @{ $error_messages->{$field} },
+        $self->message->get(
+        { lang => $lang, field => $field, label => $label, level => $level }
+        );
 
 }
@@ -109 +139 @@
         next unless exists $storage->{valid}{$field};
 
-        # TODO : level
         my $validators = $self->_get_validator_methods( $field, $level );
 
@@ -118 +147 @@
             CHECK_ARRAYS:
                 for my $v ( @{ $storage->{valid}{$field} } ) {
-                    if ( $validators->{$field}{method}->( $storage->{valid}{$field} ) ) {
+                    if ( $validators->{$field}{method}
+                        ->( $storage->{valid}{$field} ) )
+                    {
+
                         # OK
                         next CHECK_ARRAYS;
                     }
                     else {
-                        $self->_append_error_message( $profile->{lang} , $level , $field , $storage , $validators->{$field}{label} , $error_messages);
+                        $self->_append_error_message( $profile->{lang},
+                            $level, $field, $storage,
+                            $validators->{$field}{label},
+                            $error_messages );
                         $is_invalid++;
                         last CHECK_ARRAYS;
@@ -129 +164 @@
                 }
 
-                # 配列にする。
-                # TODO : ループの中でやったほうがいいんじゃね？
+            # 配列にする。
+            # TODO : ループの中でやったほうがいいんじゃね？
                 if ( none( @{ $profile->{want_array} } ) eq $field ) {
                     $storage->{valid}{$field} = $storage->{valid}{$field}[0];
@@ -138 +173 @@
             }
             else {
-                if ( $validators->{$field}{method}->( $storage->{valid}{$field} ) ) {
+                if ( $validators->{$field}{method}
+                    ->( $storage->{valid}{$field} ) )
+                {
+
                     # return alwasy array ref when want_array is seted.
                     if ( any( @{ $profile->{want_array} } ) eq $field ) {
                         my $value = $storage->{valid}{$field};
                         $storage->{valid}{$field} = [];
-                        push @{ $storage->{valid}{$field} } , $value ;
+                        push @{ $storage->{valid}{$field} }, $value;
 
                     }
                     else {
-                        $self->_append_error_message( $profile->{lang} , $level , $field , $storage , $validators->{$field}{label} , $error_messages);
+                        $self->_append_error_message( $profile->{lang},
+                            $level, $field, $storage,
+                            $validators->{$field}{label},
+                            $error_messages );
                         $is_invalid++;
                     }
@@ -157 +198 @@
     }
 
+    $self->_set_error_message_for_display( $storage, $error_messages );
 }
 
@@ -202 +244 @@
 
 sub _set_lang {
-    my $self        = shift;
-    my $storage     = shift;
-    my $profile     = shift;
+    my $self    = shift;
+    my $storage = shift;
+    my $profile = shift;
 
     $profile->{lang} = $profile->{lang} || $self->message->lang;
@@ -283 +325 @@
 =cut
 
-

lang/perl/FormValidator-LazyWay/branches/rebuild/lib/FormValidator/LazyWay/Message.pm

@@ -12 +12 @@
 has langs        => ( is => 'ro', isa => 'ArrayRef' );
 has rule_message => ( is => 'ro', isa => 'HashRef' );
+has base_message => ( is => 'ro', isa => 'HashRef' );
 
 sub BUILD {
@@ -52 +53 @@
     $self->{lang}  = $self->config->{lang}  || 'en';
     $self->{langs} = $self->config->{langs} || [ $self->lang ];
+
+    for my $lang ( @{$self->{langs}} ) {
+        my $pkg = __PACKAGE__ . '::' . uc $lang ;
+        $pkg->require;
+        $self->{base_message}{ $lang } = {
+            invalid => $self->config->{messages}{$lang}{invalid} || $pkg->invalid(),
+            missing  => $self->config->{messages}{$lang}{missing} || $pkg->missing(),
+        };
+    }
 }
 

lang/perl/FormValidator-LazyWay/branches/rebuild/t/message.t

@@ -90 +90 @@
         custom_invalid  : 
             foo_error : フーエラー
-        rule_message : __field__には__rule__が使用できます。
+        invalid : __field__には__rule__が使用できます。
+        missing : 値が入力されていません。
         rule :
             email::email : メールアドレス
             oppai::name : ぼいん
 # この配下は考え中段階
-        missing :
-            default : 値が入力されていません。
 --- rule_message eval
 {