Updated changes file

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 26b4cac..e573b0d 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
+use Catalyst::Utils;
 use Text::ASCIITable;
 use Path::Class;
 our $CATALYST_SCRIPT_GEN = 4;
@@ -152,20 +153,25 @@ sub import {
     my $engine     = 'Catalyst::Engine::CGI';
     my $dispatcher = 'Catalyst::Dispatcher';
 
-    # Detect mod_perl
     if ( $ENV{MOD_PERL} ) {
+    
+        mod_perl->require;
 
-        require mod_perl;
-
-        if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
+        if ( $mod_perl::VERSION >= 1.99_90_22 ) {
             $engine = 'Catalyst::Engine::Apache::MP20';
         }
-        elsif ( $mod_perl::VERSION >= 1.99 ) {
+
+        elsif ( $mod_perl::VERSION >= 1.99_01 ) {
             $engine = 'Catalyst::Engine::Apache::MP19';
         }
-        else {
+
+        elsif ( $mod_perl::VERSION >= 1.27 ) {
             $engine = 'Catalyst::Engine::Apache::MP13';
         }
+
+        else {
+            die( qq/Unsupported mod_perl version: "$mod_perl::VERSION"/ );
+        }
     }
 
     $caller->log->info( "You are running an old helper script! "
@@ -238,27 +244,17 @@ sub import {
 
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;
+
     {
         no strict 'refs';
         push @{"$caller\::ISA"}, $engine;
     }
+
     $caller->engine($engine);
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 
     # Find home
-    my $name = $caller;
-    $name =~ s/\:\:/\//g;
-    my $home;
-    if ( my $path = $INC{"$name.pm"} ) {
-        $home = file($path)->absolute->dir;
-        $name =~ /(\w+)$/;
-        my $append = $1;
-        my $subdir = dir($home)->subdir($append);
-        for ( split '/', $name ) { $home = dir($home)->parent }
-        if ( $home =~ /blib$/ ) { $home = dir($home)->parent }
-        elsif ( !-f file( $home, 'Makefile.PL' ) ) { $home = $subdir }
-    }
-
+    my $home = Catalyst::Utils::home($caller);
     if ( $caller->debug ) {
         $home
           ? ( -d $home )
@@ -359,8 +355,8 @@ Sebastian Riedel, C<sri@oook.de>
 Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
 Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
 Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka,
-Johan Lindstrom, Leon Brocard, Marcus Ramberg, Tatsuhiko Miyagawa
-and all the others who've helped.
+Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg,
+Tatsuhiko Miyagawa and all the others who've helped.
 
 =head1 LICENSE