X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=71ce8cce0070baa35e90db9a4b62015571c4170b;hb=8e86b7f5eb874b84564daf83ffcf9f15e9964276;hp=86886b0bbe75f1c8396507d9cc9eb1cd20b688f8;hpb=41ca9ba7190b75d9ee3adebf37188309cad986a4;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 86886b0..71ce8cc 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;
@@ -36,12 +38,12 @@ our $DETACH = "catalyst_detach\n";
require Module::Pluggable::Fast;
# Helper script generation
-our $CATALYST_SCRIPT_GEN = 8;
+our $CATALYST_SCRIPT_GEN = 10;
__PACKAGE__->mk_classdata($_)
for qw/components arguments dispatcher engine log/;
-our $VERSION = '5.49_01';
+our $VERSION = '5.49_02';
sub import {
my ( $class, @arguments ) = @_;
@@ -167,6 +169,10 @@ Specify log level.
=over 4
+=item $c->action
+
+Accessor for the current action
+
=item $c->comp($name)
=item $c->component($name)
@@ -251,6 +257,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 +406,34 @@ 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;
+ $path ||= '';
$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 +450,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
@@ -531,9 +572,10 @@ Returns the Catalyst welcome HTML page.
=cut
sub welcome_message {
- my $c = shift;
- my $name = $c->config->{name};
- my $logo = $c->uri_for('/static/images/catalyst_logo.png');
+ my $c = shift;
+ my $name = $c->config->{name};
+ my $logo = $c->uri_for('/static/images/catalyst_logo.png');
+ my $prefix = Catalyst::Utils::appprefix( ref $c );
return <<"EOF";
@@ -616,41 +658,26 @@ 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.
If you want to jump right into web development with Catalyst
you might want to check out the documentation.
- perldoc Catalyst::Manual
-perldoc Catalyst::Manual::Intro
- If you would like some background information on the
- MVC-pattern, these links might be of help to you.
-
+ perldoc Catalyst::Manual::Intro
+perldoc Catalyst::Manual
What to do next?
Next it's time to write an actual application. Use the
- helper scripts to generate controllers, models and views, they
- can save you a lot of work. Also, be sure to check out the vast
- and growing collection of plugins for Catalyst on CPAN, you are
- likely to find what you need there.
+ helper scripts to generate controllers,
+ models and
+ views,
+ they can save you a lot of work.
+ script/${prefix}_create.pl -help
+ Also, be sure to check out the vast and growing
+ collection of plugins for Catalyst on CPAN,
+ you are likely to find what you need there.
Need help?
@@ -668,7 +695,7 @@ perldoc isa('Catalyst::Engine::Apache')
+ && !Catalyst::Engine::Apache->VERSION )
+ {
+ $old_engine = 1;
+ }
+
+ elsif ( $engine->isa('Catalyst::Engine::Server::Base')
+ && Catalyst::Engine::Server->VERSION le '0.02' )
+ {
+ $old_engine = 1;
+ }
+
+ elsif ($engine->isa('Catalyst::Engine::HTTP::POE')
+ && $engine->VERSION eq '0.01' )
+ {
+ $old_engine = 1;
+ }
+
+ elsif ($engine->isa('Catalyst::Engine::Zeus')
+ && $engine->VERSION eq '0.01' )
+ {
+ $old_engine = 1;
+ }
+
+ if ($old_engine) {
+ Catalyst::Exception->throw( message =>
+ qq/Engine "$engine" is not supported by this version of Catalyst/
+ );
+ }
+
# engine instance
$class->engine( $engine->new );
}
@@ -1523,8 +1608,27 @@ sub write {
return $c->engine->write( $c, @_ );
}
+=item version
+
+Returns the Catalyst version number. mostly useful for powered by messages
+in template systems.
+
+=cut
+
+sub version { return $Catalyst::VERSION }
+
=back
+=head1 INTERNAL ACTIONS
+
+Catalyst uses internal actions like C<_DISPATCH>, C<_BEGIN>, C<_AUTO>
+C<_ACTION> and C<_END>, these are by default not shown in the private
+action table.
+
+But you can deactivate this with a config parameter.
+
+ MyApp->config->{show_internal_actions} = 1;
+
=head1 CASE SENSITIVITY
By default Catalyst is not case sensitive, so C becomes
@@ -1668,6 +1772,8 @@ Matt S Trout
Robert Sedlacek
+Sam Vilain
+
Tatsuhiko Miyagawa
Ulf Edvinsson
@@ -1680,7 +1786,7 @@ Sebastian Riedel, C
=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