X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=0d2f091abd556b22a8e3ebee11b59118e13f5e14;hb=2c63fc071ea38e61f4bb9b176ba22058df798b36;hp=790f2c93b6b7c27f210b8eca0078f404b90fd46e;hpb=26e731318112842b5a605bec2092ccae3369c5e4;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 790f2c9..0d2f091 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,160 @@ sub stash {
return $c->{stash};
}
+=item $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";
+
+
+
+
+
+
+
+
+
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 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.
+
+
+
Need help?
+
Catalyst has a very active community. Here are the main places to
+ get in touch with us.
+
+
In conclusion
+
The Catalyst team hope you will enjoy using Catalyst as much
+ as we enjoyed making it. Please contact us if you have ideas
+ for improvement or other feedback.
+
+
+
+
+EOF
+}
+
=back
=head1 INTERNAL METHODS
@@ -805,7 +967,6 @@ sub prepare {
arguments => [],
body_parameters => {},
cookies => {},
- handle => \*STDIN,
headers => HTTP::Headers->new,
parameters => {},
query_parameters => {},
@@ -818,7 +979,6 @@ sub prepare {
{
body => '',
cookies => {},
- handle => \*STDOUT,
headers => HTTP::Headers->new(),
status => 200
}
@@ -910,8 +1070,8 @@ Prepare a chunk of data before sending it to HTTP::Body.
=cut
-sub prepare_body_chunk {
- my $c = shift;
+sub prepare_body_chunk {
+ my $c = shift;
$c->engine->prepare_body_chunk( $c, @_ );
}
@@ -1029,15 +1189,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 );
@@ -1353,7 +1514,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
@@ -1456,6 +1624,10 @@ Andy Grundman
Andy Wardley
+Andreas Marienborg
+
+Andrew Bramble
+
Andrew Ford
Andrew Ruthven
@@ -1500,6 +1672,8 @@ Tatsuhiko Miyagawa
Ulf Edvinsson
+Yuval Kogman
+
=head1 AUTHOR
Sebastian Riedel, C