X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=f1f2ebe96254d3cba94f899a4ed8cdea6d3b5170;hp=04f52403b7bb9061bceaa0f35e7250964a614024;hb=a9dc674c99f36ff40d94b80753a1504074ba5e22;hpb=ae7c52524547f43903b7dd9a4d741079726ac114 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 04f5240..f1f2ebe 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 = 9; __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,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 +449,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 @@ -524,15 +564,17 @@ sub stash { return $c->{stash}; } -=head1 $c->welcome_message +=item $c->welcome_message Returns the Catalyst welcome HTML page. =cut sub welcome_message { - my $c = shift; - my $name = $c->config->{name}; + 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"; @@ -574,7 +616,6 @@ sub welcome_message { margin: 0px; } pre { - border: 1px dotted #555; margin: 10px; padding: 8px; } @@ -586,7 +627,8 @@ sub welcome_message { -moz-border-radius: 10px; } h1 { - font-size: 1.2em; + font-size: 0.9em; + font-weight: normal; text-align: center; } h2 { @@ -599,62 +641,47 @@ sub welcome_message { float: right; margin-left: 10px; } - p.signature { - text-align: right; - font-style: italic; + b#appname { + font-size: 1.6em; }
-

$name on Catalyst +

$name on Catalyst $VERSION

- +

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 you need to create an actual application. Use the - helper scripts for what they are worth, they can save you - a lot of work getting everything set up. Also, be sure to - check out the vast array of plugins for Catalyst on CPAN. - They can handle everything from A to Z - , and a whole lot in between.

+

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.

+ 
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?

-

Catalyst has a very active community. The main places to get - in touch are these.

+

Catalyst has a very active community. Here are the main places to + get in touch with us.

@@ -764,7 +787,9 @@ sub execute { push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ]; $c->state(@state); } - else { $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ) } + else { + $c->state( &$code( $class, $c, @{ $c->req->args } ) || 0 ); + } }; $c->{depth}--; @@ -894,7 +919,7 @@ Finalize uploads. Cleans up any temporary files. sub finalize_uploads { my $c = shift; $c->engine->finalize_uploads( $c, @_ ) } -=item $c->get_action( $action, $namespace, $inherit ) +=item $c->get_action( $action, $namespace ) Get an action in a given namespace. @@ -902,6 +927,14 @@ Get an action in a given namespace. sub get_action { my $c = shift; $c->dispatcher->get_action( $c, @_ ) } +=item $c->get_actions( $action, $namespace ) + +Get all actions of a given name in a namespace and all base namespaces. + +=cut + +sub get_actions { my $c = shift; $c->dispatcher->get_actions( $c, @_ ) } + =item handle_request( $class, @arguments ) Handles the request. @@ -1526,8 +1559,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 @@ -1627,6 +1679,10 @@ Andy Grundman Andy Wardley +Andreas Marienborg + +Andrew Bramble + Andrew Ford Andrew Ruthven @@ -1667,6 +1723,8 @@ Matt S Trout Robert Sedlacek +Sam Vilain + Tatsuhiko Miyagawa Ulf Edvinsson @@ -1679,8 +1737,8 @@ Sebastian Riedel, C =head1 LICENSE -This library is free software . You can redistribute it and/or modify it under -the same terms as perl itself. +This library is free software, you can redistribute it and/or modify it under +the same terms as Perl itself. =cut