Changeset 13586

Timestamp:

06/09/08 19:05:52 (5 years ago)

Author:

tomyhero

Message:

lang/perl/FormValidator::LazyWay? : more test and remove must_be_plural

Location:

lang/perl/FormValidator-LazyWay/branches/rebuild

Files:

• lib/FormValidator/LazyWay.pm (modified) (7 diffs)
• lib/FormValidator/LazyWay/Utils.pm (modified) (1 diff)
• t/lazyway-check-conv-profile.t (modified) (2 diffs)
• t/lazyway-check-must-b-plural.t (deleted)
• t/lazyway-check-remove-empty-fields.t (modified) (1 diff)
• t/lazyway-check-required-fields.t (copied) (copied from lang/perl/FormValidator-LazyWay/branches/rebuild/t/lazyway-check-erquired-fields.t) (2 diffs)
• t/utils-check-profile-syntax.t (modified) (1 diff)

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

@@ -30 +30 @@
     my $result  = {};
     my $storage = {
-        valid     => FormValidator::LazyWay::Utils::get_input_as_hash($input),
-        missings  => [],
-        overflows => [],
-        unknown   => [],
-        invalid   => {},
+        valid   => FormValidator::LazyWay::Utils::get_input_as_hash($input),
+        missing => [],
+        unknown => [],
+        invalid => {},
     };
 
@@ -40 +39 @@
 
     my @subs = (
+
         # profileを扱いやすい型にコンバート
-        sub { $self->_conv_profile(@_) } ,
+        sub { $self->_conv_profile(@_) },
+
         # デフォルトセット
         sub { $self->_set_default(@_) },
+
         # 空白のフィールドのキーを消去
         sub { $self->_remove_empty_fields(@_) },
+
         # 未定義のフィールドをセット、そしてvalidから消去
         sub { $self->_set_unknown(@_) },
+
         # missingのフィールドをセット、そしてvalidから消去
         sub { $self->_check_required_fields(@_) },
-        # 複数定義(missing,overfolows)のフィールドをセット、そしてvalidから消去
-        # TODO : エラーメッセージに、指定数が入るようにできた方がいいなぁ。
-        sub { $self->_check_must_be_plural(@_) },
+
         # invalidチェックループ
         sub { $self->_validation_block(@_) },
+
         # エラーメッセージセット
         sub { $self->_set_error_message(@_) },
@@ -77 +80 @@
     my @fields = keys %{ $storage->{valid} };
 
-    for my $field ( @fields ) {
+    for my $field (@fields) {
         my $is_invalid = 0;
-        # missing , overflows , empty optional
-        next unless exists $storage->{valid}{$field};    
 
-    }
+        # missing , empty optional
+        next unless exists $storage->{valid}{$field};
 
-}
-
-sub _check_must_be_plural {
-    my $self    = shift;
-    my $storage = shift;
-    my $profile = shift;
-
-    foreach my $field ( keys %{ $profile->{must_be_plural} } ) {
-        if ( ref $storage->{valid}{$field} eq 'ARRAY' ) {
-        # TODO: missing or overflows
-            unless (
-                scalar @{ $storage->{valid}{$field} }
-                == $profile->{must_be_plural}{$field} )
-            {
-                push @{ $storage->{overflows} }, $field;
-                delete $storage->{valid}{$field};
-            }
-        }
-        else {
-            push @{ $storage->{overflows} }, $field;
-            delete $storage->{valid}{$field};
-        }
     }
 
@@ -116 +96 @@
 
     for my $field ( keys %{ $profile->{required} } ) {
-        push @{ $storage->{missings} }, $field
+        push @{ $storage->{missing} }, $field
             unless exists $storage->{valid}{$field};
         delete $storage->{valid}{$field}
@@ -125 +105 @@
 
 sub _conv_profile {
-    my $self    = shift;
-    my $storage = shift;
-    my $profile = shift;
+    my $self        = shift;
+    my $storage     = shift;
+    my $profile     = shift;
     my %new_profile = ();
-    %{$new_profile{required}} = map { $_ => 1 }
+    %{ $new_profile{required} } = map { $_ => 1 }
         FormValidator::LazyWay::Utils::arrayify( $profile->{required} );
-    %{$new_profile{optional}} = map { $_ => 1 }
+    %{ $new_profile{optional} } = map { $_ => 1 }
         FormValidator::LazyWay::Utils::arrayify( $profile->{optional} );
-    %{$new_profile{may_be_plural}}
-        = map { $_ => 1 } 
-        FormValidator::LazyWay::Utils::arrayify( $profile->{may_be_plural} );
-    %{$new_profile{must_be_plural}}
-        = map { $_ => 1 } 
-        FormValidator::LazyWay::Utils::arrayify( $profile->{must_be_plural} );
-    %{$profile} = ( %{$profile}, %new_profile ) ;
+    %{ $new_profile{want_array} } = map { $_ => 1 }
+        FormValidator::LazyWay::Utils::arrayify( $profile->{want_array} );
+    %{$profile} = ( %{$profile}, %new_profile );
 }
 
@@ -147 +123 @@
     my $profile = shift;
 
-    @{ $storage->{unknown} } 
-        = grep {
-            not(   exists $profile->{optional}{$_} or exists $profile->{required}{$_} )
-          } keys %{ $storage->{valid} };
+    @{ $storage->{unknown} } = grep {
+        not(   exists $profile->{optional}{$_}
+            or exists $profile->{required}{$_} )
+    } keys %{ $storage->{valid} };
 
     # and remove them from the list
@@ -156 +132 @@
         delete $storage->{valid}{$field};
     }
-
 
 }

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

@@ -20 +20 @@
                 required
                 defaults
-                may_be_plural
-                must_be_plural
+                want_array
                 lang
                 /

lang/perl/FormValidator-LazyWay/branches/rebuild/t/lazyway-check-conv-profile.t

@@ -1 +1 @@
 use Test::Base;
+use FormValidator::LazyWay;
+use FindBin;
+use File::Spec;
+use lib File::Spec->catfile( $FindBin::Bin, 'lib' );
 
 plan tests => 1 * blocks;
@@ -5 +9 @@
 run {
     my $block = shift;
-    ok(0, 'please write test');
+    my $profile = $block->profile;
+    FormValidator::LazyWay->_conv_profile( undef , $profile );
+    is_deeply( $profile , $block->result );
 }
 
 __END__
 === normal
+--- profile eval
+{
+    required => [qw/foo bar/],
+    optional => [qw/foo bar hoge/],
+    want_array => [qw/oppai/],
+}
+--- result eval
+{
+    required => {
+        foo => 1,
+        bar => 1,
+    },
+    optional => {
+        foo => 1,
+        bar => 1,
+        hoge => 1,
+    },
+    want_array => {
+        oppai => 1,
+    },
+} 

lang/perl/FormValidator-LazyWay/branches/rebuild/t/lazyway-check-remove-empty-fields.t

@@ -14 +14 @@
     is_deeply( $storage , $block->result );
 }
-
 __END__
 === set default

lang/perl/FormValidator-LazyWay/branches/rebuild/t/lazyway-check-required-fields.t

@@ -1 +1 @@
 use Test::Base;
+use FormValidator::LazyWay;
+use FindBin;
+use File::Spec;
+use lib File::Spec->catfile( $FindBin::Bin, 'lib' );
 
 plan tests => 1 * blocks;
@@ -5 +9 @@
 run {
     my $block = shift;
-    ok(0, 'please write test');
+    my $storage = $block->storage;
+    my $profile = $block->profile;
+    FormValidator::LazyWay->_conv_profile( $storage , $profile );
+    FormValidator::LazyWay->_check_required_fields( $storage , $profile );
+    is_deeply( $storage , $block->result );
 }
 
 __END__
 === normal
+--- profile eval
+{
+    required => [qw/foo bar/],
+}
+--- storage eval
+{
+    valid    => {
+        foo =>'hoge',
+        moo =>'hoge',
+    },
+    missing => [],
+}
+--- result eval
+{
+    valid => { 
+        foo =>'hoge',
+        moo => 'hoge',
+    },
+    missing => [
+        'bar',
+    ],
+} 

lang/perl/FormValidator-LazyWay/branches/rebuild/t/utils-check-profile-syntax.t

@@ -6 +6 @@
 
 ok( FormValidator::LazyWay::Utils::check_profile_syntax(
-        {   constraints    => [],
-            optional       => [],
-            required       => [],
-            defaults       => [],
-            may_be_plural  => [],
-            must_be_plural => [],
-            lang           => [],
-            use_loose      => [],
-            use_foo        => [],
+        {   constraints => [],
+            optional    => [],
+            required    => [],
+            defaults    => [],
+            want_array  => [],
+            lang        => [],
+            use_loose   => [],
+            use_foo     => [],
         }
     )