X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=6c72b8b20840e6067633d126a649b6df93f222c6;hp=768ad238520c1d384ed1318124b0ba0fa893a539;hb=5d9a6d472d46896c9f878011e34485de7508c326;hpb=2f9e6321fd866918db5602f6e0b4f5c6c6c1b9e9

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 768ad23..6c72b8b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,16 +1,17 @@
 package Catalyst;
 
 use strict;
-use base 'Catalyst::Base';
+use base qw[ Catalyst::Base Catalyst::Setup ];
 use UNIVERSAL::require;
 use Catalyst::Exception;
 use Catalyst::Log;
 use Catalyst::Utils;
+use NEXT;
 use Text::ASCIITable;
 use Path::Class;
 our $CATALYST_SCRIPT_GEN = 4;
 
-__PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
+__PACKAGE__->mk_classdata($_) for qw/arguments dispatcher engine log/;
 
 our $VERSION = '5.24';
 our @ISA;
@@ -268,204 +269,44 @@ sub plugin {
       if $class->debug;
 }
 
-=item $c->setup_dispatcher
+=item $class->setup
 
-=cut
-
-sub setup_dispatcher {
-    my ( $class, $dispatcher ) = @_;
-
-    if ( $dispatcher ) {
-        $dispatcher = 'Catalyst::Dispatcher::' . $dispatcher;
-    }
-
-    if ( $ENV{CATALYST_DISPATCHER} ) {
-        $dispatcher = 'Catalyst::Dispatcher::' . $ENV{CATALYST_DISPATCHER};
-    }
-
-    if ( $ENV{ uc($class) . '_DISPATCHER' } ) {
-        $dispatcher = 'Catalyst::Dispatcher::' . $ENV{ uc($class) . '_DISPATCHER' };
-    }
-
-    unless ( $dispatcher ) {
-        $dispatcher = 'Catalyst::Dispatcher';
-    }
-
-    $dispatcher->require;
-
-    if ( $@ ) {
-        Catalyst::Exception->throw(
-            message => qq/Couldn't load dispatcher "$dispatcher", "$@"/
-        );
-    }
-
-    {
-        no strict 'refs';
-        push @{"$class\::ISA"}, $dispatcher;
-    }
-
-    $class->dispatcher($dispatcher);
-}
-
-=item $c->setup_engine
-
-=cut
-
-sub setup_engine {
-    my ( $class, $engine ) = @_;
-
-    if ( $engine ) {
-        $engine = 'Catalyst::Engine::' . $engine;
-    }
-
-    if ( $ENV{CATALYST_ENGINE} ) {
-        $engine = 'Catalyst::Engine::' . $ENV{CATALYST_ENGINE};
-    }
-
-    if ( $ENV{ uc($class) . '_ENGINE' } ) {
-        $engine = 'Catalyst::Engine::' . $ENV{ uc($class) . '_ENGINE' };
-    }
-
-    if ( ! $engine && $ENV{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';
-                }
-            }
-
-            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 ( $software eq 'Zeus-Perl' ) {
-            $engine = 'Catalyst::Engine::Zeus';
-        }
-
-        else {
-            Catalyst::Exception->throw(
-                message => qq/Unsupported mod_perl: $ENV{MOD_PERL}/
-            );
-        }
-    }
-
-    unless ( $engine ) {
-        $engine = 'Catalyst::Engine::CGI';
-    }
-
-    $engine->require;
-
-    if ( $@ ) {
-        Catalyst::Exception->throw(
-            message => qq/Couldn't load engine "$engine", "$@"/
-        );
-    }
-
-    {
-        no strict 'refs';
-        push @{"$class\::ISA"}, $engine;
-    }
-
-    $class->engine($engine);
-}
+Setup.
 
-=item $c->setup_home
+    MyApp->setup;
 
 =cut
 
-sub setup_home {
-    my ( $class, $home ) = @_;
-
-    if ( $ENV{CATALYST_HOME} ) {
-        $home = $ENV{CATALYST_HOME};
-    }
-
-    if ( $ENV{ uc($class) . '_HOME' } ) {
-        $home = $ENV{ uc($class) . '_HOME' };
-    }
-
-    unless ( $home ) {
-        $home = Catalyst::Utils::home($class);
-    }
-
-    if ( $home ) {
-        $class->config->{home} = $home;
-        $class->config->{root} = dir($home)->subdir('root');
-    }
-}
-
-=item $c->setup_log
-
-=cut
-
-sub setup_log {
-    my ( $class, $debug ) = @_;
-
-    unless ( $class->log ) {
-        $class->log( Catalyst::Log->new );
+sub setup {
+    my $class = shift;
+    
+    # Call plugins setup
+    $class->NEXT::setup;
+
+    # Initialize our data structure
+    $class->components( {} );
+
+    $class->setup_components;
+
+    if ( $class->debug ) {
+        my $t = Text::ASCIITable->new;
+        $t->setOptions( 'hide_HeadRow',  1 );
+        $t->setOptions( 'hide_HeadLine', 1 );
+        $t->setCols('Class');
+        $t->setColWidth( 'Class', 75, 1 );
+        $t->addRow($_) for sort keys %{ $class->components };
+        $class->log->debug( "Loaded components:\n" . $t->draw )
+          if ( @{ $t->{tbl_rows} } );
     }
 
-    if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($class) . '_DEBUG' } || $debug ) {
-        no strict 'refs';
-        *{"$class\::debug"} = sub { 1 };
-        $class->log->debug('Debug messages enabled');
-    }
-}
+    # Add our self to components, since we are also a component
+    $class->components->{$class} = $class;
 
-=item $c->setup_plugins
+    $class->setup_actions;
 
-=cut
-
-sub setup_plugins {
-    my ( $class, $plugins ) = @_;
-
-    for my $plugin ( @$plugins ) {
-
-        $plugin = "Catalyst::Plugin::$plugin";
-
-        $plugin->require;
-
-        if ( $@ ) {
-            Catalyst::Exception->throw(
-                message => qq/Couldn't load plugin "$plugin", "$@"/
-            );
-        }
-
-        {
-            no strict 'refs';
-            push @{"$class\::ISA"}, $plugin;
-        }
+    if ( $class->debug ) {
+        my $name = $class->config->{name} || 'Application';
+        $class->log->info("$name powered by Catalyst $Catalyst::VERSION");
     }
 }