X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=a1fc1fbf97363438e6e04fa675c13924f2f15078;hb=d91474f509dab7dce4c3e4328e674ab9fea29284;hp=faa7ae8537524946f8a9bb44d9b80bad65811aa7;hpb=fbedfd6b5429958bd65800beef2951db97ea50f2;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index faa7ae8..a1fc1fb 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1,8 +1,14 @@ package Catalyst; +# we don't need really need this, but if we load it before MRO::Compat gets +# loaded (via Moose and Class::MOP), we can avoid some nasty warnings +use Class::C3; + use Moose; +use Class::MOP::Object (); extends 'Catalyst::Component'; use bytes; +use B::Hooks::EndOfScope; use Catalyst::Exception; use Catalyst::Log; use Catalyst::Request; @@ -29,7 +35,7 @@ use Carp qw/croak carp/; BEGIN { require 5.008001; } -has stack => (is => 'rw', default => sub { [] }); +has stack => (is => 'ro', default => sub { [] }); has stash => (is => 'rw', default => sub { {} }); has state => (is => 'rw', default => 0); has stats => (is => 'rw'); @@ -76,7 +82,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.8000_02'; +our $VERSION = '5.8000_04'; sub import { my ( $class, @arguments ) = @_; @@ -257,7 +263,9 @@ MYAPP_WEB_HOME. If both variables are set, the MYAPP_HOME one will be used. =head2 -Log -Specifies log level. + use Catalyst '-Log=warn,fatal,error'; + +Specifies a comma-delimited list of log levels. =head2 -Stats @@ -526,7 +534,7 @@ sub _comp_names { sub _filter_component { my ( $c, $comp, @args ) = @_; - if ( Scalar::Util::blessed($c) && eval { $comp->can('ACCEPT_CONTEXT'); } ) { + if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) { return $comp->ACCEPT_CONTEXT( $c, @args ); } @@ -965,8 +973,8 @@ EOF my $engine = $class->engine; my $home = $class->config->{home}; - $class->log->debug(qq/Loaded dispatcher "$dispatcher"/); - $class->log->debug(qq/Loaded engine "$engine"/); + $class->log->debug(sprintf(q/Loaded dispatcher "%s"/, blessed($dispatcher))); + $class->log->debug(sprintf(q/Loaded engine "%s"/, blessed($engine))); $home ? ( -d $home ) @@ -1010,6 +1018,17 @@ EOF } $class->log->_flush() if $class->log->can('_flush'); + # Make sure that the application class becomes immutable at this point, + # which ensures that it gets an inlined constructor. This means that it + # works even if the user has added a plugin which contains a new method. + # Note however that we have to do the work on scope end, so that method + # modifiers work correctly in MyApp (as you have to call setup _before_ + # applying modifiers). + on_scope_end { + my $meta = $class->Moose::Object::meta(); + $meta->make_immutable unless $meta->is_immutable; + }; + $class->setup_finished(1); } @@ -1073,7 +1092,7 @@ sub uri_for { # join args with '/', or a blank string my $args = join('/', grep { defined($_) } @args); $args =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE - $args =~ s!^/!!; + $args =~ s!^/+!!; my $base = $c->req->base; my $class = ref($base); $base =~ s{(?Wiki
This item has moved here.
} @@ -2078,9 +2096,10 @@ sub setup_engine { } if ( $ENV{MOD_PERL} ) { - + my $meta = $class->Class::MOP::Object::meta(); + # create the apache method - $class->meta->add_method('apache' => sub { shift->engine->apache }); + $meta->add_method('apache' => sub { shift->engine->apache }); my ( $software, $version ) = $ENV{MOD_PERL} =~ /^(\S+)\/(\d+(?:[\.\_]\d+)+)/; @@ -2199,20 +2218,35 @@ sub setup_home { =head2 $c->setup_log -Sets up log. +Sets up log by instantiating a L