fixed small name generation bug in Mojolicious::Plugin::Config

mojolicious · Sep 13, 2011 · 5ed131f · 5ed131f
1 parent 62057f8
commit 5ed131f
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 14 deletions.
diff --git a/Changes b/Changes
@@ -12,6 +12,7 @@ This file documents the revision history for Perl extension Mojolicious.
           (viliampucik)
         - Improved non-blocking resolver by allowing it to be disabled.
         - Improved tests.
+        - Fixed small name generation bug in Mojolicious::Plugin::Config.
         - Fixed small bug in cookie jar.
         - Fixed small plugin loader bug.
         - Fixed Hypnotoad to clean up lock files.

diff --git a/lib/Mojolicious/Plugin/Config.pm b/lib/Mojolicious/Plugin/Config.pm
@@ -1,8 +1,9 @@
 package Mojolicious::Plugin::Config;
 use Mojo::Base 'Mojolicious::Plugin';
 
-require File::Basename;
-require File::Spec;
+use File::Basename 'basename';
+use File::Spec;
+use Mojo::Util 'decamelize';
 
 use constant DEBUG => $ENV{MOJO_CONFIG_DEBUG} || 0;
 
@@ -37,15 +38,19 @@ sub register {
   my ($self, $app, $conf) = @_;
   $conf ||= {};
 
-  # File
+  # Config file
   my $file = $conf->{file} || $ENV{MOJO_CONFIG};
   unless ($file) {
+    $file = $ENV{MOJO_APP};
 
-    # Basename
-    $file = File::Basename::basename($ENV{MOJO_EXE} || $0);
+    # Class
+    if ($file && !ref $file) { decamelize $file }
 
-    # Remove .pl, .p6 and .t extentions
-    $file =~ s/(?:\.p(?:l|6))|\.t$//i;
+    # File
+    else { $file = basename($ENV{MOJO_EXE} || $0) }
+
+    # Remove .pl and .t extentions
+    $file =~ s/\.(?:pl|t)$//i;
 
     # Default extension
     $file .= '.' . ($conf->{ext} || 'conf');

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -230,8 +230,6 @@ sub _list_data_templates {
   return [keys %$all];
 }
 
-# "Well, at least here you'll be treated with dignity.
-#  Now strip naked and get on the probulator."
 sub _render_template {
   my ($self, $c, $output, $options) = @_;
 

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -37,9 +37,10 @@ EOF
 }
 
 sub app {
-  my $self = shift;
-  return $self->ua->app unless @_;
-  $self->ua->app(@_);
+  my ($self, $app) = @_;
+  return $self->ua->app unless $app;
+  $ENV{MOJO_APP} ||= $app;
+  $self->ua->app($app);
   return $self;
 }
 

diff --git a/t/mojolicious/external/lib/MyApp.pm b/t/mojolicious/external/lib/MyApp.pm
@@ -0,0 +1,30 @@
+package MyApp;
+use Mojo::Base 'Mojolicious';
+
+# "Well, at least here you'll be treated with dignity.
+#  Now strip naked and get on the probulator."
+sub startup {
+  my $self = shift;
+  my $r    = $self->routes;
+
+  # Load plugin
+  $self->plugin('Config');
+
+  # GET /
+  $r->get(
+    '/' => sub {
+      my $self = shift;
+      $self->render(text => $self->config->{works});
+    }
+  );
+
+  # GET /test
+  $r->get(
+    '/test' => sub {
+      my $self = shift;
+      $self->render(text => $self->config->{whatever});
+    }
+  );
+}
+
+1;
diff --git a/t/mojolicious/external/my_app.conf b/t/mojolicious/external/my_app.conf
@@ -0,0 +1 @@
+{works => 'too!'}
diff --git a/t/mojolicious/external/my_app.testing.conf b/t/mojolicious/external/my_app.testing.conf
@@ -0,0 +1 @@
+{whatever => 'works!'};
diff --git a/t/mojolicious/external_app.t b/t/mojolicious/external_app.t
@@ -0,0 +1,30 @@
+#!/usr/bin/env perl
+use Mojo::Base -strict;
+
+use utf8;
+
+# Disable Bonjour, IPv6 and libev
+BEGIN {
+  $ENV{MOJO_NO_BONJOUR} = $ENV{MOJO_NO_IPV6} = 1;
+  $ENV{MOJO_IOWATCHER}  = 'Mojo::IOWatcher';
+  $ENV{MOJO_MODE}       = 'testing';
+}
+
+# "Of all the parasites I've had over the years,
+#  these worms are among the best."
+use Test::More tests => 9;
+use Test::Mojo;
+
+use FindBin;
+use lib "$FindBin::Bin/external/lib";
+my $t = Test::Mojo->new('MyApp');
+
+# GET /
+$t->get_ok('/')->status_is(200)->content_is('too!');
+
+# GET /index.html
+$t->get_ok('/index.html')->status_is(200)
+  ->content_is('External static file!');
+
+# GET /test
+$t->get_ok('/test')->status_is(200)->content_is('works!');
diff --git a/t/mojolicious/external_lite_app.t b/t/mojolicious/external_lite_app.t
@@ -13,8 +13,6 @@ BEGIN {
 # "Who are you, and why should I care?"
 use Test::More tests => 15;
 
-# "Of all the parasites I've had over the years,
-#  these worms are among the best."
 use FindBin;
 require "$FindBin::Bin/external/myapp.pl";
 use Test::Mojo;