preserve $self->{name} in mk_app if defined

previously you could create a new helper object with name already defined but
when you ran mk_app you had to pass a name parameter which would overwrite the
potentially already defined name. This patch allows you to do either, however
a name defined at the creation of a new helper object will take precedence.

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 000b5c0..8a638d9 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -79,7 +79,9 @@ sub mk_app {
     # Needs to be here for PAR
     require Catalyst;
 
-    if($name eq '.') {
+    $self->{name} ||= $name;
+
+    if($self->{name} eq '.') {
         if(!-e 'META.yml') {
             system perl => 'Makefile.PL'
                 and Catalyst::Exception->throw(message => q(
@@ -87,26 +89,27 @@ sub mk_app {
                 ));
         }
 
-        $name = YAML::Tiny->read('META.yml')->[0]->{'name'};
-        $name =~ s/-/::/g;
+        $self->{name} = YAML::Tiny->read('META.yml')->[0]->{'name'};
+        $self->{name} =~ s/-/::/g;
         $self->{dir} = '.';
     }
 
-    if ( $name =~ /[^\w:]/ || $name =~ /^\d/ || $name =~ /\b:\b|:{3,}/) {
+    if (   $self->{name} =~ /[^\w:]/
+        || $self->{name} =~ /^\d/
+        || $self->{name} =~ /\b:\b|:{3,}/
+    ) {
         warn "Error: Invalid application name.\n";
         return 0;
     }
 
-
     if(!defined $self->{'dir'}) {
-        $self->{dir} = $name;
+        $self->{dir} = $self->{name};
         $self->{dir} =~ s/\:\:/-/g;
     }
 
-    $self->{name            } = $name;
     $self->{script          } = dir( $self->{dir}, 'script' );
-    $self->{appprefix       } = Catalyst::Utils::appprefix($name);
-    $self->{appenv          } = Catalyst::Utils::class2env($name);
+    $self->{appprefix       } = Catalyst::Utils::appprefix($self->{name});
+    $self->{appenv          } = Catalyst::Utils::class2env($self->{name});
     $self->{startperl       } = -r '/usr/bin/env'
                                 ? '#!/usr/bin/env perl'
                                 : "#!$Config{perlpath}";

diff --git a/t/generated_app.t b/t/generated_app.t
index 6c7a66b..a923f69 100644 (file)
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -37,7 +37,7 @@ chdir $dir or die "Cannot chdir to $dir: $!";
         }
     );
 
-    $helper->mk_app('TestApp');
+    $helper->mk_app;
 }
 
 my $app_dir = File::Spec->catdir($dir, 'TestApp');