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=6e70b811d2663142467c6bf43f929e5bbce9ba09;hb=c1f338169cf72d22126599c81f75ca39901a85be;hpb=d7953572e6a9bcdb29e0ce8439656c343d1bb328 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 6e70b81..ebf88a3 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -3,13 +3,16 @@ package Catalyst; use strict; use base 'Catalyst::Base'; use UNIVERSAL::require; +use Catalyst::Exception; use Catalyst::Log; -use Catalyst::Helper; +use Catalyst::Utils; use Text::ASCIITable; +use Path::Class; +our $CATALYST_SCRIPT_GEN = 4; __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/; -our $VERSION = '5.01'; +our $VERSION = '5.24'; our @ISA; =head1 NAME @@ -23,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; @@ -60,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. @@ -151,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 ( $ENV{MOD_PERL_API_VERSION} == 2 ) { - $engine = 'Catalyst::Engine::Apache::MP20'; + if ( Apache::Request->require ) { + $engine = 'Catalyst::Engine::Apache::MP19::Apreq'; + } + } + + 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}/ + ); } } @@ -171,9 +209,7 @@ sub import { . "Please update your scripts by regenerating the " . "application and copying over the new scripts." ) if ( $ENV{CATALYST_SCRIPT_GEN} - && ( - $ENV{CATALYST_SCRIPT_GEN} < $Catalyst::Helper::CATALYST_SCRIPT_GEN ) - ); + && ( $ENV{CATALYST_SCRIPT_GEN} < $CATALYST_SCRIPT_GEN ) ); # Process options my @plugins; @@ -198,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'; @@ -216,32 +256,89 @@ sub import { $caller->log->debug( 'Loaded plugins', $t->draw ) if ( @plugins && $caller->debug ); + # 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; + + if ( $@ ) { + Catalyst::Exception->throw( + message => qq/Couldn't load dispatcher "$dispatcher", "$@"/ + ); + } + + { + no strict 'refs'; + push @{"$caller\::ISA"}, $dispatcher; + } + $caller->dispatcher($dispatcher); + $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug; + # 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; - # Dispatcher - $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}" - if $ENV{CATALYST_DISPATCHER}; + # Find home + my $home = Catalyst::Utils::home($caller); - $dispatcher->require; - die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@; - { - no strict 'refs'; - push @{"$caller\::ISA"}, $dispatcher; + 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"/); + } } - $caller->dispatcher($dispatcher); - $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug; + 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 ) + ? $caller->log->debug(qq/Found home "$home"/) + : $caller->log->debug(qq/Home "$home" doesn't exist/) + : $caller->log->debug(q/Couldn't find home/); + } + $caller->config->{home} = $home || ''; + $caller->config->{root} = defined $home ? dir($home)->subdir('root') : ''; } =item $c->engine @@ -259,15 +356,48 @@ C object. To use your own log class: Your log class should implement the methods described in the C man page. +=item $c->plugin( $name, $class, @args ) + +Instant plugins for Catalyst. +Classdata accessor/mutator will be created, class loaded and instantiated. + + MyApp->plugin( 'prototype', 'HTML::Prototype' ); + + $c->prototype->define_javascript_functions; + +=cut + +sub plugin { + my ( $class, $name, $plugin, @args ) = @_; + $plugin->require; + + 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) }; + + 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; +} =back =head1 LIMITATIONS -FCGI and mod_perl2 support are considered experimental and may contain bugs. - -You may encounter problems accessing the built in test server on public ip -addresses on the internet, thats because of a bug in HTTP::Daemon. +mod_perl2 support is considered experimental and may contain bugs. =head1 SUPPORT @@ -308,9 +438,10 @@ Sebastian Riedel, C =head1 THANK YOU -Andy Grundman, Andrew Ford, Andrew Ruthven, Christian Hansen, +Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen, Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton, -Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg, +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