Flatten new arrayref into previous arrayref in merge()

rwstauner · Oct 16, 2011 · 66bdaea · 66bdaea
1 parent 56e3c2b
commit 66bdaea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/Config/MVP/Slicer.pm b/lib/Config/MVP/Slicer.pm
@@ -179,7 +179,7 @@ sub merge {
       if( $previous ){
         # FIXME: do we need to check blessed() and/or isa()?
         if( ref $previous eq 'ARRAY' ){
-          push(@$previous, $value);
+          push(@$previous, ref $value eq 'ARRAY' ? @$value : $value);
         }
         # is this useful?
         elsif( $type->name eq 'Str' && $opts->{join} ){

diff --git a/t/merge-object.t b/t/merge-object.t
@@ -11,6 +11,7 @@ my $slicer = new_ok($mod, [{
     'Plug.attr'         => 'pa',
     'Mod::Name.opt'     => 'val',
     'Moose.and[]'       => 'squirrel',
+    'BigMoose.and'      => 'little squirrel',
     'Hunting.season[0]' => 'duck',
     'Hunting.season[1]' => 'wabbit',
     'Hunting.season[9]' => 'fudd',
@@ -34,6 +35,7 @@ foreach my $spec (
   [qw( X::Plug    attr   Str )],
   [qw( Mod::Name  opt    Str )],
   [qw( X::Hunting season ArrayRef[Str] )],
+  [qw( X::Moose   and    Any )],
 ){
   my ($pack, $attr, $type) = @$spec;
   eval "{ package $pack; use Moose;" .
@@ -59,4 +61,14 @@ is_deeply
   $exp,
   'merge modifies object';
 
+is_deeply
+  $slicer->merge(X::Moose->new({name => 'Moose'})),
+  X::Moose->new({name => Moose => and => [qw(squirrel)] }),
+  'set as arrayref when specified as []';
+
+is_deeply
+  $slicer->merge(X::Moose->new({name => BigMoose => and => ['cow']})),
+  X::Moose->new({name => BigMoose => and => ['cow', 'little squirrel'] }),
+  'merged array ref when previous value was arrayref';
+
 done_testing;