X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=162c1bfd45dde427d125a0e73c2e0b4820b23972;hb=7e95ba12950606b1563751e907ef4ed1cdc9d2e2;hp=21c04d8e18ae6e03604873557f0773fe44691bfc;hpb=29817f46bdaaa28fb0c1471fc74084482ce6f3ee;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 21c04d8..162c1bf 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -17,11 +17,9 @@ 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 attributes;
@@ -77,7 +75,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.8000_05';
+our $VERSION = '5.8000_06';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -805,8 +803,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 +840,11 @@ sub debug { 0 }
 
 =head2 $c->dispatcher
 
-Returns the dispatcher instance. Stringifies to class name. See
-L<Catalyst::Dispatcher>.
+Returns the dispatcher instance. See L<Catalyst::Dispatcher>.
 
 =head2 $c->engine
 
-Returns the engine instance. Stringifies to the class name. See
-L<Catalyst::Engine>.
+Returns the engine instance. See L<Catalyst::Engine>.
 
 
 =head2 UTILITY METHODS
@@ -873,7 +869,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 +919,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 +1110,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 +1802,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 +1896,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 );
     }
 }
 
@@ -2610,8 +2561,6 @@ audreyt: Audrey Tang
 
 bricas: Brian Cassidy <bricas@cpan.org>
 
-Byron Young <Byron.Young@riverbed.com>
-
 Caelum: Rafael Kitover <rkitover@io.com>
 
 chansen: Christian Hansen