Move setup to C::Setup

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 61439c2..c5b03e3 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,17 +1,16 @@
 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/;
-
 our $VERSION = '5.24';
 our @ISA;
 
@@ -198,7 +197,7 @@ sub import {
             $t->setCols('Class');
             $t->setColWidth( 'Class', 75, 1 );
             $t->addRow($_) for @plugins;
-            $caller->log->debug( 'Loaded plugins', $t->draw );
+            $caller->log->debug( "Loaded plugins:\n" . $t->draw );
         }
 
         my $dispatcher = $caller->dispatcher;
@@ -268,207 +267,6 @@ sub plugin {
       if $class->debug;
 }
 
-=item $c->setup_dispatcher
-
-=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);
-}
-
-=item $c->setup_home
-
-=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 );
-    }
-
-    if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($class) . '_DEBUG' } || $debug ) {
-        no strict 'refs';
-        *{"$class\::debug"} = sub { 1 };
-        $class->log->debug('Debug messages enabled');
-    }
-}
-
-=item $c->setup_plugins
-
-=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;
-        }
-    }
-}
-
 =back
 
 =head1 LIMITATIONS