X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=6e1a14f0e2c779b9853d97c7962f69171407d696;hp=790f2c93b6b7c27f210b8eca0078f404b90fd46e;hb=ab2374d3a68f4d44601813f351b38222822b7c39;hpb=26e731318112842b5a605bec2092ccae3369c5e4
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 790f2c9..6e1a14f 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/;
@@ -516,6 +516,126 @@ 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
+
+
+
Welcome to the wonderfull world of Catalyst.
+ This MVC framework will make webdevelopment
+ something you had never expected it to be:
+ Fun, rewarding and quick.
+
What to do now?
+
That all depends really, 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 following links.
+
+
If you would like some background information on the
+ MVC-pattern, theese links might be able to help you out.
+
+
What to do next?
+
Next you need to create an actuall application. Use the
+ helper scripts for what they are worth, they can save you
+ alot of work getting everything set up. Also, be sure to
+ check out the vast array of plugins for Catalyst.
+ They can handle everything from Authentication to Static
+ files, and a whole lot in between.
+
In conclusion
+
The Catalyst team hope you will enjoy Catalyst as much as we enjoyed making it, and that rest asure that any and all
+ feedback is welcomed
+
-- there is no cabal, 2005
+
+
+
+
+EOF
+}
+
=back
=head1 INTERNAL METHODS
@@ -805,7 +925,6 @@ sub prepare {
arguments => [],
body_parameters => {},
cookies => {},
- handle => \*STDIN,
headers => HTTP::Headers->new,
parameters => {},
query_parameters => {},
@@ -818,7 +937,6 @@ sub prepare {
{
body => '',
cookies => {},
- handle => \*STDOUT,
headers => HTTP::Headers->new(),
status => 200
}
@@ -910,8 +1028,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 +1147,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 +1472,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
@@ -1500,6 +1626,8 @@ Tatsuhiko Miyagawa
Ulf Edvinsson
+Yuval Kogman
+
=head1 AUTHOR
Sebastian Riedel, C