X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=ebf88a355341ed3d0b19b18ad6ace6c266660e8e;hp=8a864ce130491a505b993f700af1900bb828252f;hb=c1f338169cf72d22126599c81f75ca39901a85be;hpb=a783a49ea9a815f1d424331fe95dd73062879c92 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 8a864ce..ebf88a3 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -3,14 +3,16 @@ package Catalyst; use strict; use base 'Catalyst::Base'; use UNIVERSAL::require; +use Catalyst::Exception; use Catalyst::Log; +use Catalyst::Utils; use Text::ASCIITable; use Path::Class; -our $CATALYST_SCRIPT_GEN = 3; +our $CATALYST_SCRIPT_GEN = 4; __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/; -our $VERSION = '5.11'; +our $VERSION = '5.24'; our @ISA; =head1 NAME @@ -24,15 +26,15 @@ Catalyst - The Elegant MVC Web Application Framework cd MyApp # add models, views, controllers - script/create.pl model Something - script/create.pl view Stuff - script/create.pl controller Yada + script/myapp_create.pl model Something + script/myapp_create.pl view Stuff + script/myapp_create.pl controller Yada # built in testserver - script/server.pl + script/myapp_server.pl # command line interface - script/test.pl /yada + script/myapp_test.pl /yada use Catalyst; @@ -61,9 +63,6 @@ See also L =head1 DESCRIPTION -Catalyst is based upon L, which you should consider for smaller -projects. - The key concept of Catalyst is DRY (Don't Repeat Yourself). See L for more documentation. @@ -152,19 +151,57 @@ sub import { my $engine = 'Catalyst::Engine::CGI'; my $dispatcher = 'Catalyst::Dispatcher'; - # Detect mod_perl if ( $ENV{MOD_PERL} ) { - require mod_perl; + my ( $software, $version ) = $ENV{MOD_PERL} =~ /^(\S+)\/(\d+(?:[\.\_]\d+)+)/; + + $version =~ s/_//g; + $version =~ s/(\.[^.]+)\./$1/g; + + if ( $software eq 'mod_perl') { + + if ( $version >= 1.99922 ) { + + $engine = 'Catalyst::Engine::Apache::MP20'; + + if ( Apache2::Request->require ) { + $engine = 'Catalyst::Engine::Apache::MP20::Apreq'; + } + } + + elsif ( $version >= 1.9901 ) { + + $engine = 'Catalyst::Engine::Apache::MP19'; + + if ( Apache::Request->require ) { + $engine = 'Catalyst::Engine::Apache::MP19::Apreq'; + } + } - if ( $ENV{MOD_PERL_API_VERSION} == 2 ) { - $engine = 'Catalyst::Engine::Apache::MP20'; + elsif ( $version >= 1.24 ) { + + $engine = 'Catalyst::Engine::Apache::MP13'; + + if ( Apache::Request->require ) { + $engine = 'Catalyst::Engine::Apache::MP13::Apreq'; + } + } + + else { + Catalyst::Exception->throw( + message => qq/Unsupported mod_perl version: $ENV{MOD_PERL}/ + ); + } } - elsif ( $mod_perl::VERSION >= 1.99 ) { - $engine = 'Catalyst::Engine::Apache::MP19'; + + elsif ( $software eq 'Zeus-Perl' ) { + $engine = 'Catalyst::Engine::Zeus'; } + else { - $engine = 'Catalyst::Engine::Apache::MP13'; + Catalyst::Exception->throw( + message => qq/Unsupported mod_perl: $ENV{MOD_PERL}/ + ); } } @@ -197,7 +234,11 @@ sub import { $plugin->require; - if ($@) { die qq/Couldn't load plugin "$plugin", "$@"/ } + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't load plugin "$plugin", "$@"/ + ); + } else { push @plugins, $plugin; no strict 'refs'; @@ -218,9 +259,17 @@ sub import { # Dispatcher $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}" if $ENV{CATALYST_DISPATCHER}; + my $appdis = $ENV{ uc($caller) . '_DISPATCHER' }; + $dispatcher = "Catalyst::Dispatcher::$appdis" if $appdis; $dispatcher->require; - die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@; + + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't load dispatcher "$dispatcher", "$@"/ + ); + } + { no strict 'refs'; push @{"$caller\::ISA"}, $dispatcher; @@ -231,28 +280,56 @@ sub import { # Engine $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}" if $ENV{CATALYST_ENGINE}; + my $appeng = $ENV{ uc($caller) . '_ENGINE' }; + $engine = "Catalyst::Engine::$appeng" if $appeng; $engine->require; - die qq/Couldn't load engine "$engine", "$@"/ if $@; + + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't load engine "$engine", "$@"/ + ); + } + { 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 $path = $INC{"$name.pm"}; - my $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 ( my $h = $ENV{CATALYST_HOME} ) { + + $home = $h if -d $h; + + unless ( -e _ ) { + $caller->log->warn(qq/CATALYST_HOME does not exist "$h"/); + } + + unless ( -e _ && -d _ ) { + $caller->log->warn(qq/CATALYST_HOME is not a directory "$h"/); + } + } + + if ( my $h = $ENV{ uc($caller) . '_HOME' } ) { + + $home = $h if -d $h; + + unless ( -e _ ) { + my $e = uc($caller) . '_HOME'; + $caller->log->warn(qq/$e does not exist "$h"/) + } + unless ( -e _ && -d _ ) { + my $e = uc($caller) . '_HOME'; + $caller->log->warn(qq/$e is not a directory "$h"/); + } + } + if ( $caller->debug ) { $home ? ( -d $home ) @@ -260,8 +337,8 @@ sub import { : $caller->log->debug(qq/Home "$home" doesn't exist/) : $caller->log->debug(q/Couldn't find home/); } - $caller->config->{home} = $home; - $caller->config->{root} = dir($home)->subdir('root'); + $caller->config->{home} = $home || ''; + $caller->config->{root} = defined $home ? dir($home)->subdir('root') : ''; } =item $c->engine @@ -293,13 +370,24 @@ Classdata accessor/mutator will be created, class loaded and instantiated. sub plugin { my ( $class, $name, $plugin, @args ) = @_; $plugin->require; - my $error = $UNIVERSAL::require::ERROR; - die qq/Couldn't load instant plugin "$plugin", "$error"/ if $error; + + if ( my $error = $UNIVERSAL::require::ERROR ) { + Catalyst::Exception->throw( + message => qq/Couldn't load instant plugin "$plugin", "$error"/ + ); + } + eval { $plugin->import }; $class->mk_classdata($name); my $obj; eval { $obj = $plugin->new(@args) }; - die qq/Couldn't instantiate instant plugin "$plugin", "$@"/ if $@; + + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't instantiate instant plugin "$plugin", "$@"/ + ); + } + $class->$name($obj); $class->log->debug(qq/Initialized instant plugin "$plugin" as "$name"/) if $class->debug; @@ -352,8 +440,9 @@ Sebastian Riedel, C Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen, Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton, -Gary Ashton Jones, Jesse Sheidlower, Jody Belka, Johan Lindstrom, Leon Brocard, -Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped. +Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka, +Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg, +Tatsuhiko Miyagawa and all the others who've helped. =head1 LICENSE