X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=ef134b156f0ac41939f6bc905ae5c99d385e1d06;hp=3a52ccf5e79a43a39d375ed0afa7d4f66d600744;hb=23eb3f513f7f03e9f84a441e0e0c78581e4c6c90;hpb=fdba7a9dced6b7a39c18632468ee593208ed006f diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 3a52ccf..ef134b1 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/; @@ -119,7 +119,7 @@ so C becomes C. use Catalyst 'My::Module'; -Special flags like -Debug and -Engine can also be specifed as arguments when +Special flags like -Debug and -Engine can also be specified as arguments when Catalyst is loaded: use Catalyst qw/-Debug My::Module/; @@ -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,153 @@ 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}; + 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.

+ 
perldocCatalyst::Manual
+perldocCatalyst::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

+

-- #1. the first rule of the Cabal is, you do not + talk about the Cabal.
+ #2. the second rule of the Cabal is, you DO NOT + talkk about the Cabal.

+
+
+ + +EOF +} + =back =head1 INTERNAL METHODS @@ -805,7 +960,6 @@ sub prepare { arguments => [], body_parameters => {}, cookies => {}, - handle => \*STDIN, headers => HTTP::Headers->new, parameters => {}, query_parameters => {}, @@ -818,7 +972,6 @@ sub prepare { { body => '', cookies => {}, - handle => \*STDOUT, headers => HTTP::Headers->new(), status => 200 } @@ -904,6 +1057,17 @@ sub prepare_body { } } +=item $c->prepare_body_chunk( $chunk ) + +Prepare a chunk of data before sending it to HTTP::Body. + +=cut + +sub prepare_body_chunk { + my $c = shift; + $c->engine->prepare_body_chunk( $c, @_ ); +} + =item $c->prepare_body_parameters Prepare body parameters. @@ -1018,15 +1182,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 ); @@ -1342,7 +1507,14 @@ data, if known. =cut -sub write { my $c = shift; return $c->engine->write( $c, @_ ) } +sub write { + my $c = shift; + + # Finalize headers if someone manually writes output + $c->finalize_headers; + + return $c->engine->write( $c, @_ ); +} =back @@ -1489,6 +1661,8 @@ Tatsuhiko Miyagawa Ulf Edvinsson +Yuval Kogman + =head1 AUTHOR Sebastian Riedel, C