X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=36e6da07050cc98a340fde2a1be21a163ced2b44;hb=812a28c90c5b43bdf5ce87f1b2a688725e552429;hp=061525312241e55fe2ca4a60b304f91b19a006c9;hpb=f88238ea2dbb6336a33f17ed3c72ea9204a6556d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0615253..36e6da0 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,11 +4,14 @@ 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;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
-our $VERSION = '5.00';
+our $VERSION = '5.20';
 our @ISA;
 
 =head1 NAME
@@ -46,10 +49,10 @@ Catalyst - The Elegant MVC Web Application Framework
     sub index : Path('/index.html') {
         my ( $self, $c ) = @_;
         $c->res->output('Hello');
-        $c->forward('_foo');
+        $c->forward('foo');
     }
 
-    sub product : Regex('/^product[_]*(\d*).html$/') {
+    sub product : Regex('^product[_]*(\d*).html$') {
         my ( $self, $c ) = @_;
         $c->stash->{template} = 'product.tt';
         $c->stash->{product} = $c->req->snippets->[0];
@@ -133,7 +136,7 @@ sub import {
     }
 
     if ( $caller->engine ) {
-        return;    # Catalyst is allready initialized
+        return;    # Catalyst is already initialized
     }
 
     unless ( $caller->log ) {
@@ -155,14 +158,23 @@ sub import {
 
         require mod_perl;
 
-        if ( $mod_perl::VERSION >= 1.99 ) {
-            $engine = 'Catalyst::Engine::Apache::MP2';
+        if ( $ENV{MOD_PERL_API_VERSION} == 2 ) {
+            $engine = 'Catalyst::Engine::Apache::MP20';
+        }
+        elsif ( $mod_perl::VERSION >= 1.99 ) {
+            $engine = 'Catalyst::Engine::Apache::MP19';
         }
         else {
-            $engine = 'Catalyst::Engine::Apache::MP1';
+            $engine = 'Catalyst::Engine::Apache::MP13';
         }
     }
 
+    $caller->log->info( "You are running an old helper script! "
+          . "Please update your scripts by regenerating the "
+          . "application and copying over the new scripts." )
+      if ( $ENV{CATALYST_SCRIPT_GEN}
+        && ( $ENV{CATALYST_SCRIPT_GEN} < $CATALYST_SCRIPT_GEN ) );
+
     # Process options
     my @plugins;
     foreach (@options) {
@@ -204,9 +216,26 @@ 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;
+    die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
+    {
+        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 $@;
@@ -217,19 +246,17 @@ sub import {
     $caller->engine($engine);
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 
-    # Dispatcher
-    $dispatcher = "Catalyst::Dispatcher::$ENV{CATALYST_DISPATCHER}"
-      if $ENV{CATALYST_DISPATCHER};
-
-    $dispatcher->require;
-    die qq/Couldn't load dispatcher "$dispatcher", "$@"/ if $@;
-    {
-        no strict 'refs';
-        push @{"$caller\::ISA"}, $dispatcher;
+    # Find home
+    my $home = Catalyst::Utils::home($caller);
+    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->dispatcher($dispatcher);
-    $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/) if $caller->debug;
-
+    $caller->config->{home} = $home || '';
+    $caller->config->{root} = defined $home ? dir($home)->subdir('root') : '';
 }
 
 =item $c->engine
@@ -247,9 +274,38 @@ C<Catalyst::Log> object.  To use your own log class:
 Your log class should implement the methods described in the C<Catalyst::Log>
 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;
+    my $error = $UNIVERSAL::require::ERROR;
+    die qq/Couldn't load instant plugin "$plugin", "$error"/ if $error;
+    eval { $plugin->import };
+    $class->mk_classdata($name);
+    my $obj;
+    eval { $obj = $plugin->new(@args) };
+    die qq/Couldn't instantiate instant plugin "$plugin", "$@"/ if $@;
+    $class->$name($obj);
+    $class->log->debug(qq/Initialized instant plugin "$plugin" as "$name"/)
+      if $class->debug;
+}
 
 =back
 
+=head1 LIMITATIONS
+
+mod_perl2 support is considered experimental and may contain bugs.
+
 =head1 SUPPORT
 
 IRC:
@@ -261,6 +317,10 @@ Mailing-Lists:
     http://lists.rawmode.org/mailman/listinfo/catalyst
     http://lists.rawmode.org/mailman/listinfo/catalyst-dev
 
+Web:
+
+    http://catalyst.perl.org
+
 =head1 SEE ALSO
 
 =over 4
@@ -285,9 +345,10 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 THANK YOU
 
-Andrew Ford, Andrew Ruthven, Christian Hansen, Christopher Hicks,
-Dan Sully, Danijel Milicevic, David Naughton, Gary Ashton Jones,
-Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa
+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.
 
 =head1 LICENSE