X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=4ce44ede85e87ec0b5608969c970561ae9af04d6;hb=c3f6d73a290413c26d0f2a1c100fb857a9eb9403;hp=21c04d8e18ae6e03604873557f0773fe44691bfc;hpb=29817f46bdaaa28fb0c1471fc74084482ce6f3ee;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 21c04d8..4ce44ed 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -17,13 +17,12 @@ use Module::Pluggable::Object (); use Text::SimpleTable (); use Path::Class::Dir (); use Path::Class::File (); -use Time::HiRes qw/gettimeofday tv_interval/; use URI (); use URI::http; use URI::https; -use Scalar::Util qw/weaken/; use Tree::Simple qw/use_weak_refs/; use Tree::Simple::Visitor::FindByUID; +use Class::C3::Adopt::NEXT; use attributes; use utf8; use Carp qw/croak carp shortmess/; @@ -77,7 +76,8 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.8000_05'; +our $VERSION = '5.8000_06'; +$VERSION = eval $VERSION; sub import { my ( $class, @arguments ) = @_; @@ -88,6 +88,12 @@ sub import { my $caller = caller(); return if $caller eq 'main'; + + # Kill Adopt::NEXT warnings if we're a non-RC version + if ($VERSION !~ /_\d{2}$/) { + Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/); + } + my $meta = Moose::Meta::Class->initialize($caller); #Moose->import({ into => $caller }); #do we want to do this? @@ -805,8 +811,8 @@ around config => sub { my $orig = shift; my $c = shift; - $c->log->warn("Setting config after setup has been run is not a good idea.") - if ( @_ and $c->setup_finished ); + croak('Setting config after setup has been run is not allowed.') + if ( @_ and $c->setup_finished ); $c->$orig(@_); }; @@ -842,13 +848,11 @@ sub debug { 0 } =head2 $c->dispatcher -Returns the dispatcher instance. Stringifies to class name. See -L. +Returns the dispatcher instance. See L. =head2 $c->engine -Returns the engine instance. Stringifies to the class name. See -L. +Returns the engine instance. See L. =head2 UTILITY METHODS @@ -873,7 +877,7 @@ sub path_to { =head2 $c->plugin( $name, $class, @args ) -Helper method for plugins. It creates a classdata accessor/mutator and +Helper method for plugins. It creates a class data accessor/mutator and loads and instantiates the given class. MyApp->plugin( 'prototype', 'HTML::Prototype' ); @@ -923,8 +927,8 @@ Catalyst> line. sub setup { my ( $class, @arguments ) = @_; - $class->log->warn("Running setup twice is not a good idea.") - if ( $class->setup_finished ); + croak('Running setup more than once') + if ( $class->setup_finished ); unless ( $class->isa('Catalyst') ) { @@ -1114,7 +1118,7 @@ using C<< $c->req->captures >>. sub uri_for { my ( $c, $path, @args ) = @_; - if ( Scalar::Util::blessed($path) ) { # action object + if ( blessed($path) ) { # action object my $captures = ( scalar @args && ref $args[0] eq 'ARRAY' ? shift(@args) : [] ); @@ -1806,10 +1810,15 @@ sub prepare_body { $c->prepare_parameters; $c->prepare_uploads; - if ( $c->debug ) { - $c->log_parameters( - 'Body Parameters are', $c->request->body_parameters - ); + if ( $c->debug && keys %{ $c->req->body_parameters } ) { + my $t = Text::SimpleTable->new( [ 35, 'Parameter' ], [ 36, 'Value' ] ); + for my $key ( sort keys %{ $c->req->body_parameters } ) { + my $param = $c->req->body_parameters->{$key}; + my $value = defined($param) ? $param : ''; + $t->row( $key, + ref $value eq 'ARRAY' ? ( join ', ', @$value ) : $value ); + } + $c->log->debug( "Body Parameters are:\n" . $t->draw ); } } @@ -1895,65 +1904,15 @@ sub prepare_query_parameters { $c->engine->prepare_query_parameters( $c, @_ ); - if ( $c->debug ) { - $c->log_parameters( - 'Query Parameters are', $c->request->query_parameters - ); - } -} - -=head2 $c->log_parameters($name, $parameters) - -Logs a hash reference of key value pairs, with a caption above the table. - -Looks like: - - [debug] Query Parameters are: - .-------------------------------------+--------------------------------------. - | Parameter | Value | - +-------------------------------------+--------------------------------------+ - | search | Moose | - | searchtype | modules | - '-------------------------------------+--------------------------------------' - -If there are query parameters you don't want to display in this output, such -as passwords or other sensitive input, you can configure your application to -redact those parameters: - - C<< MyApp->config->{Debug}->{redact_parameters} = [ 'password' ] >> - -In that case, the output will look like: - - [debug] Query Parameters are: - .-------------------------------------+--------------------------------------. - | Parameter | Value | - +-------------------------------------+--------------------------------------+ - | password | (redacted by config) | - | username | some_user | - '-------------------------------------+--------------------------------------' - -=cut - -sub log_parameters { - my ( $c, $name, $parameters ) = @_; - - my $skip = $c->config->{Debug}->{redact_parameters}; - if ( - ( not defined $skip or ref $skip eq 'ARRAY' ) - && keys %{ $parameters } - ) { - my $t = Text::SimpleTable->new( - [ 35, 'Parameter' ], [ 36, 'Value' ] ); - my %skip_params = map { $_ => $_ } @{ $skip || [] }; - for my $key ( sort keys %$parameters ) { - my $param = $parameters->{$key}; + if ( $c->debug && keys %{ $c->request->query_parameters } ) { + my $t = Text::SimpleTable->new( [ 35, 'Parameter' ], [ 36, 'Value' ] ); + for my $key ( sort keys %{ $c->req->query_parameters } ) { + my $param = $c->req->query_parameters->{$key}; my $value = defined($param) ? $param : ''; - $value = '(redacted by config)' if exists $skip_params{$key}; - $t->row( $key, ref $value eq 'ARRAY' ? ( join ', ', @$value ) : $value ); } - $c->log->debug( "$name:\n" . $t->draw ); + $c->log->debug( "Query Parameters are:\n" . $t->draw ); } } @@ -2089,7 +2048,12 @@ sub setup_components { my @comps = sort { length $a <=> length $b } $locator->plugins; my %comps = map { $_ => 1 } @comps; - + + my $deprecated_component_names = grep { /::[CMV]::/ } @comps; + $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}. + qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n} + ) if $deprecated_component_names; + for my $component ( @comps ) { # We pass ignore_loaded here so that overlay files for (e.g.) @@ -2610,8 +2574,6 @@ audreyt: Audrey Tang bricas: Brian Cassidy -Byron Young - Caelum: Rafael Kitover chansen: Christian Hansen