our $VERSION = '5.49_01';
+sub version { return $Catalyst::VERSION }
+
sub import {
my ( $class, @arguments ) = @_;
$class->log->_flush() if $class->log->can('_flush');
}
-=item $c->uri_for($path)
+=item $c->uri_for($path,[@args])
Merges path with $c->request->base for absolute uri's and with
$c->request->match for relative uri's, then returns a normalized
-L<URI> object.
+L<URI> object. If any args are passed, they are added at the end
+of the path.
=cut
sub uri_for {
- my ( $c, $path ) = @_;
+ my ( $c, $path, @args ) = @_;
my $base = $c->request->base->clone;
my $basepath = $base->path;
$basepath =~ s/\/$//;
$basepath .= '/';
my $match = $c->request->match;
+
+ # massage match, empty if absolute path
$match =~ s/^\///;
$match .= '/' if $match;
$match = '' if $path =~ /^\//;
$path =~ s/^\///;
- return URI->new_abs( URI->new_abs( $path, "$basepath$match" ), $base )
- ->canonical;
+
+ # join args with '/', or a blank string
+ my $args = ( scalar @args ? '/' . join( '/', @args ) : '' );
+ return URI->new_abs( URI->new_abs( "$path$args", "$basepath$match" ),
+ $base )->canonical;
}
=item $c->error
$c->error('Something bad happened');
+Clean errors.
+
+ $c->error(0);
+
=cut
sub error {
my $c = shift;
- my $error = ref $_[0] eq 'ARRAY' ? $_[0] : [@_];
- push @{ $c->{error} }, @$error;
- return $c->{error};
+ if ( $_[0] ) {
+ my $error = ref $_[0] eq 'ARRAY' ? $_[0] : [@_];
+ push @{ $c->{error} }, @$error;
+ }
+ elsif ( defined $_[0] ) { $c->{error} = undef }
+ return $c->{error} || [];
}
=item $c->engine
}
$c->{depth}++;
eval {
- if ( $c->debug ) {
+ if ( $c->debug )
+ {
my ( $elapsed, @state ) =
$c->benchmark( $code, $class, $c, @{ $c->req->args } );
push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
$c->state(@state);
}
else {
- $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 )
+ $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 );
}
};
$c->{depth}--;
=head1 LICENSE
-This library is free software . You can redistribute it and/or modify it under
+This library is free software, you can redistribute it and/or modify it under
the same terms as Perl itself.
=cut