revert 495fcbc, added test case for issue#7

Changelog

@@ -1,3 +1,7 @@
+0.12
+	o revert commit 495fcbc, see #7: breaks backwards
+	  compatibility.
+
 0.11
 	o typos
 

Struct.pm

@@ -21,7 +21,7 @@ use File::stat;
 use Data::Validate qw(:math is_printable);
 use Data::Validate::IP qw(is_ipv4 is_ipv6);
 
-our $VERSION = 0.11;
+our $VERSION = 0.12;
 
 use vars qw(@ISA);
 
@@ -195,14 +195,7 @@ sub _traverse {
   my ($self, $reference, $hash, @tree) = @_;
 
   foreach my $key (keys %{$reference}) {
-    my $reference_ref = ref $reference->{$key};
+    if (ref($reference->{$key}) eq 'ARRAY') {
-    my $hash_ref = ref $hash->{$key};
-    if ($reference_ref =~ /^ARRAY|HASH$/ && $reference_ref ne $hash_ref)
-    {
-      my $err = sprintf("Different structure types %s vs %s", $reference_ref, $hash_ref);
-      push @{$self->{errors}}, sprintf(q{%s at '%s'}, $err, join(' => ', @tree));
-    }
-    elsif ($reference_ref eq 'ARRAY') {
       # just use the 1st one, more elements in array are expected to be the same
       foreach my $item (@{$hash->{$key}}) {
         if (ref($item) eq q(HASH)) {
@@ -219,10 +212,10 @@ sub _traverse {
         }
       }
     }
-    elsif ($reference_ref eq 'HASH') {
+    elsif (ref($reference->{$key}) eq 'HASH') {
       $self->_traverse($reference->{$key}, $hash->{$key}, @tree, $key);
     }
-    elsif ($reference_ref eq '') {
+    elsif (ref($reference->{$key}) eq '') {
       $self->_debug("Checking $key at " . join(', ', @tree));
       if (my $err = $self->_check_type($key, $reference, $hash)) {
         push @{$self->{errors}}, sprintf(q{%s at '%s'}, $err, join(' => ', @tree));

t/run.t

@@ -48,7 +48,8 @@ my $ref = {
            'AoA' => [ [ 'int' ] ],
 
            'AoH' => [
-             { fullname => 'text', user => 'word', uid => 'int' }
+                     {
+                      fullname => 'text', user => 'word', uid => 'int' }
                     ],
 
            'HoH' => {
@@ -110,9 +111,12 @@ my $cfg =  {
                      ],
 
             'AoH' => [
-              { fullname => 'Homer Simpson', user => 'homer', uid => 100 },
+                      {
-              { fullname => 'Bart Simpson',  user => 'bart',  uid => 101 },
+                       fullname => 'Homer Simpson', user => 'homer', uid => 100 },
-              { fullname => 'Lisa Simpson',  user => 'lisa',  uid => 102 },
+                      {
+                       fullname => 'Bart Simpson',  user => 'bart',  uid => 101 },
+                      {
+                       fullname => 'Lisa Simpson',  user => 'lisa',  uid => 102 },
                      ],
 
             'HoH' => {
@@ -128,7 +132,6 @@ my $v = new_ok('Data::Validate::Struct', [ $ref ]);
 ok ($v->validate($cfg), "validate a reference against a OK config");
 
 
-
 # check failure matching
 my @failure = (
                {
@@ -272,13 +275,17 @@ my @failure = (
 
                {
                 cfg => [
-    { fullname => 'Homer Simpson', user => 'homer', uid => 100 },
+                        {
-    { fullname => 'Bart Simpson',  user => ':bart',  uid => 101 },
+                         fullname => 'Homer Simpson', user => 'homer', uid => 100 },
-    { fullname => 'Lisa Simpson',  user => 'lisa',  uid => '102' },
+                        {
+                         fullname => 'Bart Simpson',  user => ':bart',  uid => 101 },
+                        {
+                         fullname => 'Lisa Simpson',  user => 'lisa',  uid => '102' },
                        ],
 
                 type => [
-     { fullname => 'text', user => 'word', uid => 'int' }
+                         {
+                          fullname => 'text', user => 'word', uid => 'int' }
                         ],
 
                 descr => 'array of hashes',
@@ -339,8 +346,7 @@ foreach my $test (@failure) {
   my $errors = exists $test->{errors} ? $test->{errors} : 1;
   unless ($result) {
     is @{$v->errors}, $errors, "Caught failure for '$descr'";
-  }
+  } else {
-  else {
     fail("Couldn't catch invalid '$test->{descr}'");
   }
 }
@@ -401,9 +407,30 @@ my $v4 = Data::Validate::Struct->new({age => 'int'});
 ok(!$v4->validate({age => 'eight'}), "cache check first run, error");
 ok($v4->validate({age => 8}), "cache check second run, no error");
 
-# different references
+# optional array, see:
-my $v5 = Data::Validate::Struct->new({ foo => [{bar => 'int'}]});
+# https://github.com/TLINDEN/Data-Validate-Struct/issues/7
-ok(!$v5->validate({foo=>{bar=>10}}));
+my $ref4 = {
-
+            routers => [ {
+                          stubs => [ {
+                                      network => 'ipv4',
+                                     }, {} ],
+                         }, {}, ],
+           };
+my $test4 = {
+               'routers' => [
+                             {
+                              'stubs' => [
+                                          {
+                                           'network' => '172.31.199.0',
+                                          }
+                                         ],
+                              'router' => '172.31.199.2', # optional, ignored by validate
+                             },
+                             { # optional as well
+                              'router' => '172.30.5.5',
+                             },
+                            ],
+              };
+my $v4 = Data::Validate::Struct->new($ref4);
+ok($v4->validate($test4), "check optional " . $Data::Validate::Struct::VERSION);
 done_testing();
-