X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=81117c91e6d45b6f53d370155b9c3d3c0d90b5da;hp=034eb1052ab4df97f2aa7f0c68058ccc8804e4ae;hb=33108eafaedec785c7ebdef4eb65a8d935b3af55;hpb=4f5ebacdba8bc446f80d0e8999d117d80f9d2c98 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 034eb10..81117c9 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -36,7 +36,7 @@ our $DETACH = "catalyst_detach\n"; require Module::Pluggable::Fast; # Helper script generation -our $CATALYST_SCRIPT_GEN = 6; +our $CATALYST_SCRIPT_GEN = 8; __PACKAGE__->mk_classdata($_) for qw/components arguments dispatcher engine log/; @@ -500,9 +500,17 @@ Contains the return value of the last executed action. Returns a hashref containing all your data. - $c->stash->{foo} ||= 'yada'; print $c->stash->{foo}; +Keys may be set in the stash by assigning to the hash reference, or by passing +either a single hash reference or a list of key/value pairs as arguments. + +For example: + + $c->stash->{foo} ||= 'yada'; + $c->stash( { moose => 'majestic', qux => 0 } ); + $c->stash( bar => 1, gorch => 2 ); + =cut sub stash { @@ -516,6 +524,159 @@ sub stash { return $c->{stash}; } +=head1 $c->welcome_message + +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'); + return <<"EOF"; + + + $name on Catalyst $VERSION + + + +
+
+

$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.

+

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.

+ +

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.

+

Need help?

+

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

+ +

In conclusion

+

The Catalyst team hope you will enjoy using Catalyst as much + as we enjoyed making it, and rest assured that any and all + feedback is welcomed.

+
+
+ + +EOF +} + =back =head1 INTERNAL METHODS @@ -1027,15 +1188,16 @@ sub prepare_uploads { if ( $c->debug && keys %{ $c->request->uploads } ) { my $t = Text::ASCIITable->new; - $t->setCols( 'Filename', 'Type', 'Size' ); - $t->setColWidth( 'Filename', 37, 1 ); - $t->setColWidth( 'Type', 24, 1 ); + $t->setCols( 'Key', 'Filename', 'Type', 'Size' ); + $t->setColWidth( 'Key', 12, 1 ); + $t->setColWidth( 'Filename', 28, 1 ); + $t->setColWidth( 'Type', 18, 1 ); $t->setColWidth( 'Size', 9, 1 ); $t->alignCol( 'Size', 'left' ); for my $key ( sort keys %{ $c->request->uploads } ) { my $upload = $c->request->uploads->{$key}; for my $u ( ref $upload eq 'ARRAY' ? @{$upload} : ($upload) ) { - $t->addRow( $key, $u->type, $u->size ); + $t->addRow( $key, $u->filename, $u->type, $u->size ); } } $c->log->debug( "File Uploads are:\n" . $t->draw ); @@ -1461,6 +1623,8 @@ Andy Grundman Andy Wardley +Andreas Marienborg + Andrew Ford Andrew Ruthven @@ -1505,6 +1669,8 @@ Tatsuhiko Miyagawa Ulf Edvinsson +Yuval Kogman + =head1 AUTHOR Sebastian Riedel, C