X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=68244610952a237eda86a367c69654f71802aa18;hb=bd357f391bf8e0df526773dc2555127f1cc9e331;hp=b103d9a2dacd291804a588c8204b323e7868908a;hpb=bf1f2c60b9a7191134cb962aeb1c98fe1f1ea372;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index b103d9a..6824461 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -17,7 +17,9 @@ use Time::HiRes qw/gettimeofday tv_interval/;
use URI;
use Scalar::Util qw/weaken/;
-__PACKAGE__->mk_accessors(qw/counter depth request response state/);
+__PACKAGE__->mk_accessors(
+ qw/counter depth request response state action namespace/
+);
# Laziness++
*comp = \&component;
@@ -43,6 +45,8 @@ __PACKAGE__->mk_classdata($_)
our $VERSION = '5.49_01';
+sub version { return $Catalyst::VERSION }
+
sub import {
my ( $class, @arguments ) = @_;
@@ -167,6 +171,10 @@ Specify log level.
=over 4
+=item $c->action
+
+Accessor for the current action
+
=item $c->comp($name)
=item $c->component($name)
@@ -251,6 +259,27 @@ from the function.
sub forward { my $c = shift; $c->dispatcher->forward( $c, @_ ) }
+=item $c->namespace
+
+Accessor to the namespace of the current action
+
+=item $c->path_to(@path)
+
+Merges C<@path> with $c->config->{home} and returns a L object.
+
+For example:
+
+ $c->path_to( 'db', 'sqlite.db' );
+
+=cut
+
+sub path_to {
+ my ( $c, @path ) = @_;
+ my $path = dir( $c->config->{home}, @path );
+ if ( -d $path ) { return $path }
+ else { return file( $c->config->{home}, @path ) }
+}
+
=item $c->setup
Setup.
@@ -379,27 +408,33 @@ sub setup {
$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 object.
+L 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
@@ -416,13 +451,20 @@ Add a new 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
@@ -617,9 +659,9 @@ sub welcome_message {
Welcome to the wonderful world of Catalyst.
- This MVC framework will make web development
- something you had never expected it to be:
- Fun, rewarding and quick.
+ This MVC
+ framework will make web development something you had
+ never expected it to be: Fun, rewarding and quick.
What to do now?
That really depends on what you want to do.
We do, however, provide you with a few starting points.
@@ -654,7 +696,7 @@ perldoc