use Text::SimpleTable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
+use Class::Load qw(load_class try_load_class);
use namespace::clean -except => 'meta';
my $error = $path
? qq/Unknown resource "$path"/
: "No default action defined";
- $c->log->error($error) if $c->debug;
+ $c->trace(1, $error);
$c->error($error);
}
}
my ( $self, $c, $command, @extra_params ) = @_;
unless ($command) {
- $c->log->debug('Nothing to go to') if $c->debug;
+ $c->trace(1,'Nothing to go to');
return 0;
}
if($error) {
$c->error($error);
- $c->log->debug($error) if $c->debug;
+ $c->trace(1,$error);
return 0;
}
my $error .= qq/Couldn't $opname to command "$command": /
.qq/Invalid action or component./;
$c->error($error);
- $c->log->debug($error) if $c->debug;
+ $c->trace(1,$error);
return 0;
}
my $error =
qq/Couldn't forward to "$component_class". Does not implement "$method"/;
$c->error($error);
- $c->log->debug($error)
- if $c->debug;
+ $c->trace(1,$error);
return 0;
}
}
s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg for grep { defined } @{$req->captures||[]};
- $c->log->debug( 'Path is "' . $req->match . '"' )
- if ( $c->debug && defined $req->match && length $req->match );
+ $c->trace(1, 'Path is "' . $req->match . '"' )
+ if (defined $req->match && length $req->match );
- $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
- if ( $c->debug && @args );
+ $c->trace(1, 'Arguments are "' . join( '/', @args ) . '"' )
+ if @args;
}
=head2 $self->get_action( $action, $namespace )
unless ( $registered->{$class} ) {
# FIXME - Some error checking and re-throwing needed here, as
# we eat exceptions loading dispatch types.
- eval { Class::MOP::load_class($class) };
+ # see also try_load_class
+ eval { load_class($class) };
my $load_failed = $@;
- $self->_check_depreciated_dispatch_type( $key, $load_failed );
+ $self->_check_deprecated_dispatch_type( $key, $load_failed );
push( @{ $self->dispatch_types }, $class->new ) unless $load_failed;
$registered->{$class} = 1;
}
$self->_load_dispatch_types( @{ $self->postload_dispatch_types } );
- return unless $c->debug;
+ return unless $c->trace_level;
$self->_display_action_tables($c);
}
};
$walker->( $walker, $self->_tree, '' );
- $c->log->debug( "Loaded Private actions:\n" . $privates->draw . "\n" )
+ $c->trace(1, "Loaded Private actions:\n" . $privates->draw . "\n" )
if $has_private;
# List all public actions
# first param is undef because we cannot get the appclass
my $class = Catalyst::Utils::resolve_namespace(undef, 'Catalyst::DispatchType', $type);
- eval { Class::MOP::load_class($class) };
- Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
- if $@;
+ my ($success, $error) = try_load_class($class);
+ Catalyst::Exception->throw( message => $error ) if not $success;
push @{ $self->dispatch_types }, $class->new;
push @loaded, $class;
return undef;
}
-sub _check_depreciated_dispatch_type {
+sub _check_deprecated_dispatch_type {
my ($self, $key, $load_failed) = @_;
return unless $key =~ /^(Local)?Regexp?/;
. " Use Chained methods or install the standalone\n"
. " Catalyst::DispatchType::Regex if necessary.\n" );
} elsif ( !defined $Catalyst::DispatchType::Regex::VERSION
- || $Catalyst::DispatchType::Regex::VERSION <= 5.90020 ) {
+ || $Catalyst::DispatchType::Regex::VERSION le '5.90020' ) {
# We loaded the old core version of the Regex module this will break
warn( "The $key DispatchType has been removed from Catalyst core.\n"
. " An old version of the core Catalyst::DispatchType::Regex\n"
. " has been loaded and will likely fail. Please remove\n"
- . " $INC{'Catalyst::DispatchType::Regex'}\n"
+ . " $INC{'Catalyst/DispatchType/Regex.pm'}\n"
. " and use Chained methods or install the standalone\n"
. " Catalyst::DispatchType::Regex if necessary.\n" );
}