X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=bf3049ba7b71637ea1d31b3dc53517a005a385e6;hp=a412efae15f2220bfe395f5b74167fa2d70baafb;hb=21465c884872c1ec8c30acd72796445f9eaacb31;hpb=38cb5be33d7e884a6bc604f7e55ffa7a436475d1

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a412efa..bf3049b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,18 +1,18 @@
 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 Text::ASCIITable;
+use NEXT;
 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 $VERSION = '5.34';
 our @ISA;
 
 =head1 NAME
@@ -126,94 +126,19 @@ Returns a hashref containing your applications settings.
 sub import {
     my ( $class, @arguments ) = @_;
     
+    # We have to limit $class to Catalyst to avoid pushing Catalyst upon every
+    # callers @ISA.
+    return unless $class eq 'Catalyst';
+
     my $caller = caller(0);
-    
-    if ( $caller eq 'main' ) {
-        return;
-    }
 
-    # Prepare inheritance
-    unless ( $caller->isa($class) ) {
+    unless ( $caller->isa('Catalyst') ) {
         no strict 'refs';
         push @{"$caller\::ISA"}, $class;
     }
-    
-    if ( $caller->engine ) {
-        $caller->log->warn( qq/Attempt to re-initialize "$caller"/ );
-        return;
-    }
-
-    # Process options
-    my $flags = { };
-
-    foreach (@arguments) {
-
-        if ( /^-Debug$/ ) {
-            $flags->{log} = 1
-        }
-        elsif (/^-(\w+)=?(.*)$/) {
-            $flags->{ lc $1 } = $2;
-        }
-        else {
-            push @{ $flags->{plugins} }, $_;
-        }
-    }
-
-    $caller->setup_log        ( delete $flags->{log}        );
-    $caller->setup_plugins    ( delete $flags->{plugins}    );
-    $caller->setup_dispatcher ( delete $flags->{dispatcher} );
-    $caller->setup_engine     ( delete $flags->{engine}     );
-    $caller->setup_home       ( delete $flags->{home}       );
-
-    for my $flag ( sort keys %{ $flags } ) {
-
-        if ( my $code = $caller->can( 'setup_' . $flag ) ) {
-            &$code( $caller, delete $flags->{$flag} );
-        }
-        else {
-            $caller->log->warn(qq/Unknown flag "$flag"/);
-        }
-    }
-
-    $caller->log->warn( "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 ) );
-
-
-    if ( $caller->debug ) {
-
-        my @plugins = ();
 
-        {
-            no strict 'refs';
-            @plugins = grep { /^Catalyst::Plugin/ } @{"$caller\::ISA"};
-        }
-
-        if ( @plugins ) {
-            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 @plugins;
-            $caller->log->debug( 'Loaded plugins', $t->draw );
-        }
-
-        my $dispatcher = $caller->dispatcher;
-        my $engine     = $caller->engine;
-        my $home       = $caller->config->{home};
-
-        $caller->log->debug(qq/Loaded dispatcher "$dispatcher"/);
-        $caller->log->debug(qq/Loaded engine "$engine"/);
-
-        $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->arguments( [ @arguments ] );
+    $caller->setup_home;
 }
 
 =item $c->engine
@@ -268,258 +193,104 @@ 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}/
-                );
-            }
-        }
+=back
 
-        elsif ( $software eq 'Zeus-Perl' ) {
-            $engine = 'Catalyst::Engine::Zeus';
-        }
+=head1 CASE SENSITIVITY
 
-        else {
-            Catalyst::Exception->throw(
-                message => qq/Unsupported mod_perl: $ENV{MOD_PERL}/
-            );
-        }
-    }
-
-    unless ( $engine ) {
-        $engine = 'Catalyst::Engine::CGI';
-    }
+By default Catalyst is not case sensitive, so C<MyApp::C::FOO::Bar> becomes
+C</foo/bar>.
 
-    $engine->require;
+But you can activate case sensitivity with a config parameter.
 
-    if ( $@ ) {
-        Catalyst::Exception->throw(
-            message => qq/Couldn't load engine "$engine", "$@"/
-        );
-    }
+    MyApp->config->{case_sensitive} = 1;
 
-    {
-        no strict 'refs';
-        push @{"$class\::ISA"}, $engine;
-    }
+=head1 LIMITATIONS
 
-    $class->engine($engine);
-}
+mod_perl2 support is considered experimental and may contain bugs.
 
-=item $c->setup_home
+=head1 SUPPORT
 
-=cut
+IRC:
 
-sub setup_home {
-    my ( $class, $home ) = @_;
+    Join #catalyst on irc.perl.org.
 
-    if ( $ENV{CATALYST_HOME} ) {
-        $home = $ENV{CATALYST_HOME};
-    }
+Mailing-Lists:
 
-    if ( $ENV{ uc($class) . '_HOME' } ) {
-        $home = $ENV{ uc($class) . '_HOME' };
-    }
+    http://lists.rawmode.org/mailman/listinfo/catalyst
+    http://lists.rawmode.org/mailman/listinfo/catalyst-dev
 
-    unless ( $home ) {
-        $home = Catalyst::Utils::home($class);
-    }
+Web:
 
-    if ( $home ) {
-        $class->config->{home} = $home;
-        $class->config->{root} = dir($home)->subdir('root');
-    }
-}
+    http://catalyst.perl.org
 
-=item $c->setup_log
+=head1 SEE ALSO
 
-=cut
+=over 4
 
-sub setup_log {
-    my ( $class, $debug ) = @_;
+=item L<Catalyst::Manual> - The Catalyst Manual
 
-    unless ( $class->log ) {
-        $class->log( Catalyst::Log->new );
-    }
+=item L<Catalyst::Engine> - Core Engine
 
-    if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($class) . '_DEBUG' } || $debug ) {
-        no strict 'refs';
-        *{"$class\::debug"} = sub { 1 };
-        $class->log->debug('Debug messages enabled');
-    }
-}
+=item L<Catalyst::Log> - The Log Class.
 
-=item $c->setup_plugins
+=item L<Catalyst::Request> - The Request Object
 
-=cut
+=item L<Catalyst::Response> - The Response Object
 
-sub setup_plugins {
-    my ( $class, $plugins ) = @_;
+=item L<Catalyst::Test> - The test suite.
 
-    for my $plugin ( @$plugins ) {
+=back
 
-        $plugin = "Catalyst::Plugin::$plugin";
+=head1 CREDITS
 
-        $plugin->require;
+Andy Grundman
 
-        if ( $@ ) {
-            Catalyst::Exception->throw(
-                message => qq/Couldn't load plugin "$plugin", "$@"/
-            );
-        }
+Andrew Ford
 
-        {
-            no strict 'refs';
-            push @{"$class\::ISA"}, $plugin;
-        }
-    }
-}
+Andrew Ruthven
 
-=back
+Autrijus Tang
 
-=head1 LIMITATIONS
+Christian Hansen
 
-mod_perl2 support is considered experimental and may contain bugs.
+Christopher Hicks
 
-=head1 SUPPORT
+Dan Sully
 
-IRC:
+Danijel Milicevic
 
-    Join #catalyst on irc.perl.org.
+David Naughton
 
-Mailing-Lists:
+Gary Ashton Jones
 
-    http://lists.rawmode.org/mailman/listinfo/catalyst
-    http://lists.rawmode.org/mailman/listinfo/catalyst-dev
+Geoff Richards
 
-Web:
+Jesse Sheidlower
 
-    http://catalyst.perl.org
+Jody Belka
 
-=head1 SEE ALSO
+Johan Lindstrom
 
-=over 4
+Juan Camacho
 
-=item L<Catalyst::Manual> - The Catalyst Manual
+Leon Brocard
 
-=item L<Catalyst::Engine> - Core Engine
+Marcus Ramberg
 
-=item L<Catalyst::Log> - The Log Class.
+Matt S Trout
 
-=item L<Catalyst::Request> - The Request Object
+Robert Sedlacek
 
-=item L<Catalyst::Response> - The Response Object
+Sebastian Riedel
 
-=item L<Catalyst::Test> - The test suite.
+Tatsuhiko Miyagawa
 
-=back
+Ulf Edvinsson
 
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@oook.de>
 
-=head1 THANK YOU
-
-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, Juan Camacho, Leon Brocard, Marcus Ramberg,
-Tatsuhiko Miyagawa and all the others who've helped.
-
 =head1 LICENSE
 
 This library is free software . You can redistribute it and/or modify it under