improved name detection in Mojolicious::Plugin::Config

mojolicious · Jan 5, 2013 · 3b7848d · 3b7848d
1 parent cca3889
commit 3b7848d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,7 @@
 
+3.73  2013-01-06
+  - Improved name detection in Mojolicious::Plugin::Config.
+
 3.72  2013-01-05
   - Deprecated base_tag helper.
   - Improved documentation.

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -18,7 +18,6 @@ sub new {
 sub build_app {
   my ($self, $app) = @_;
   local $ENV{MOJO_EXE};
-  local $ENV{MOJO_APP} = $app;
   return $app->new unless my $e = Mojo::Loader->new->load($app);
   die ref $e ? $e : qq{Couldn't find application class "$app".\n};
 }

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -38,7 +38,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.72';
+our $VERSION  = '3.73';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/lib/Mojolicious/Plugin/Config.pm b/lib/Mojolicious/Plugin/Config.pm
@@ -38,9 +38,11 @@ sub register {
   my $file = $conf->{file} || $ENV{MOJO_CONFIG};
   unless ($file) {
 
-    # Class or executable
-    $file
-      = $ENV{MOJO_APP} ? decamelize($ENV{MOJO_APP}) : basename($ENV{MOJO_EXE});
+    # Executable
+    if ($app->isa('Mojolicious::Lite')) { $file = basename($ENV{MOJO_EXE}) }
+
+    # Class
+    else { $file = decamelize(ref $app) }
 
     # Replace ".pl" and ".t" with default extension
     $file =~ s/\.(?:pl|t)$//i;