X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=061525312241e55fe2ca4a60b304f91b19a006c9;hb=0c28fbd7d6e24a27331ea84dd6139d760cc4f689;hp=70afecb11f31c04773a898d5e2fea1fb0d0210e3;hpb=ac73326467a355b37917b030d8413c4838468aee;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 70afecb..0615253 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -4,8 +4,9 @@ use strict;
 use base 'Catalyst::Base';
 use UNIVERSAL::require;
 use Catalyst::Log;
+use Text::ASCIITable;
 
-__PACKAGE__->mk_classdata($_) for qw/engine log/;
+__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
 our $VERSION = '5.00';
 our @ISA;
@@ -40,23 +41,19 @@ Catalyst - The Elegant MVC Web Application Framework
 
     use Catalyst qw/-Debug -Engine=CGI/;
 
-    __PACKAGE__->action( '!default' => sub { $_[1]->res->output('Hello') } );
+    sub default : Private { $_[1]->res->output('Hello') } );
 
-    __PACKAGE__->action(
-        'index.html' => sub {
-            my ( $self, $c ) = @_;
-            $c->res->output('Hello');
-            $c->forward('_foo');
-        }
-    );
+    sub index : Path('/index.html') {
+        my ( $self, $c ) = @_;
+        $c->res->output('Hello');
+        $c->forward('_foo');
+    }
 
-    __PACKAGE__->action(
-        '/^product[_]*(\d*).html$/' => sub {
-            my ( $self, $c ) = @_;
-            $c->stash->{template} = 'product.tt';
-            $c->stash->{product} = $c->req->snippets->[0];
-        }
-    );
+    sub product : Regex('/^product[_]*(\d*).html$/') {
+        my ( $self, $c ) = @_;
+        $c->stash->{template} = 'product.tt';
+        $c->stash->{product} = $c->req->snippets->[0];
+    }
 
 See also L<Catalyst::Manual::Intro>
 
@@ -129,6 +126,7 @@ sub import {
     my ( $self, @options ) = @_;
     my $caller = caller(0);
 
+    # Prepare inheritance
     unless ( $caller->isa($self) ) {
         no strict 'refs';
         push @{"$caller\::ISA"}, $self;
@@ -142,62 +140,96 @@ sub import {
         $caller->log( Catalyst::Log->new );
     }
 
+    # Debug?
     if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($caller) . '_DEBUG' } ) {
         no strict 'refs';
         *{"$caller\::debug"} = sub { 1 };
         $caller->log->debug('Debug messages enabled');
     }
 
-    # Options
-    my $engine =
-      $ENV{MOD_PERL}
-      ? 'Catalyst::Engine::Apache'
-      : 'Catalyst::Engine::CGI';
+    my $engine     = 'Catalyst::Engine::CGI';
+    my $dispatcher = 'Catalyst::Dispatcher';
+
+    # Detect mod_perl
+    if ( $ENV{MOD_PERL} ) {
 
+        require mod_perl;
+
+        if ( $mod_perl::VERSION >= 1.99 ) {
+            $engine = 'Catalyst::Engine::Apache::MP2';
+        }
+        else {
+            $engine = 'Catalyst::Engine::Apache::MP1';
+        }
+    }
+
+    # Process options
+    my @plugins;
     foreach (@options) {
+
         if (/^\-Debug$/) {
             next if $caller->debug;
             no strict 'refs';
             *{"$caller\::debug"} = sub { 1 };
             $caller->log->debug('Debug messages enabled');
         }
+
+        elsif (/^-Dispatcher=(.*)$/) {
+            $dispatcher = "Catalyst::Dispatcher::$1";
+        }
+
         elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" }
         elsif (/^-.*$/) { $caller->log->error(qq/Unknown flag "$_"/) }
+
         else {
             my $plugin = "Catalyst::Plugin::$_";
 
-            # Plugin caller should be our application class
-            eval "package $caller; require $plugin";
-            if ($@) {
-                $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
-            }
+            $plugin->require;
+
+            if ($@) { die qq/Couldn't load plugin "$plugin", "$@"/ }
             else {
-                $caller->log->debug(qq/Loaded plugin "$plugin"/)
-                  if $caller->debug;
+                push @plugins, $plugin;
                 no strict 'refs';
                 push @{"$caller\::ISA"}, $plugin;
             }
         }
+
     }
 
+    # Plugin table
+    my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
+    $t->setCols('Class');
+    $t->setColWidth( 'Class', 75, 1 );
+    $t->addRow($_) for @plugins;
+    $caller->log->debug( 'Loaded plugins', $t->draw )
+      if ( @plugins && $caller->debug );
+
     # Engine
     $engine = "Catalyst::Engine::$ENV{CATALYST_ENGINE}"
       if $ENV{CATALYST_ENGINE};
 
-    if ( $engine eq 'Catalyst::Engine::Server' ) {
-        $engine = 'Catalyst::Engine::HTTP::Daemon';
-        $caller->log->warn( "Catalyst::Engine::Server is deprecated, "
-              . "using Catalyst::Engine::HTTP::Daemon." );
-    }
-
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;
     {
         no strict 'refs';
-        unshift @{"$caller\::ISA"}, $engine;
+        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};
+
+    $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;
+
 }
 
 =item $c->engine
@@ -231,8 +263,21 @@ Mailing-Lists:
 
 =head1 SEE ALSO
 
-L<Catalyst::Manual>, L<Catalyst::Test>, L<Catalyst::Request>,
-L<Catalyst::Response>, L<Catalyst::Engine>
+=over 4
+
+=item L<Catalyst::Manual> - The Catalyst Manual
+
+=item L<Catalyst::Engine> - Core Engine
+
+=item L<Catalyst::Log> - The Log Class.
+
+=item L<Catalyst::Request> - The Request Object
+
+=item L<Catalyst::Response> - The Response Object
+
+=item L<Catalyst::Test> - The test suite.
+
+=back
 
 =head1 AUTHOR