Added a failing test for args passed to default
[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm
index 3040c2d..89b7f9f 100644 (file)
@@ -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;
@@ -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,10 @@ 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->setup
 
 Setup.
@@ -524,15 +534,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";
 <html>
     <head>
@@ -554,25 +566,26 @@ sub welcome_message {
                 border: 1px solid #aaa;
                 -moz-border-radius: 10px;
             }
-            p, h1, h2, a {
+            p, h1, h2 {
                 margin-left: 20px;
                 margin-right: 20px;
                 font-family: verdana, tahoma, sans-serif;
             }
+            a {
+                font-family: verdana, tahoma, sans-serif;
+            }
             :link, :visited {
                     text-decoration: none;
                     color: #b00;
                     border-bottom: 1px dotted #bbb;
             }
             :link:hover, :visited:hover {
-                    background-color: #fff;
                     color: #555;
             }
             div#topbar {
                 margin: 0px;
             }
             pre {
-                border: 1px dotted #555;
                 margin: 10px;
                 padding: 8px;
             }
@@ -584,7 +597,8 @@ sub welcome_message {
                 -moz-border-radius: 10px;
             }
             h1 {
-                font-size: 1.2em;
+                font-size: 0.9em;
+                font-weight: normal;
                 text-align: center;
             }
             h2 {
@@ -593,58 +607,51 @@ sub welcome_message {
             p {
                 font-size: 0.9em;
             }
-            p.signature {
-                text-align: right;
-                font-style: italic;
+            p img {
+                float: right;
+                margin-left: 10px;
+            }
+            b#appname {
+                font-size: 1.6em;
             }
         </style>
     </head>
     <body>
         <div id="content">
             <div id="topbar">
-                <h1>$name on Catalyst $VERSION</h1>
+                <h1><b id="appname">$name</b> on <a href="http://catalyst.perl.org">Catalyst</a>
+                    $VERSION</h1>
              </div>
              <div id="answers">
+                 <p>
+                 <img src="$logo"/>
+                 </p>
                  <p>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.</p>
+                    This <a href="http://en.wikipedia.org/wiki/MVC">MVC</a>
+                    framework will make web development something you had
+                    never expected it to be: Fun, rewarding and quick.</p>
                  <h2>What to do now?</h2>
                  <p>That really depends  on what <b>you</b> want to do.
                     We do, however, provide you with a few starting points.</p>
                  <p>If you want to jump right into web development with Catalyst
                     you might want to check out the documentation.</p>
-                 <pre><code>perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual.pod">Catalyst::Manual</a>
-perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Intro.pod">Catalyst::Manual::Intro</a></code></pre>
-                 <p>If you would like some background information on the
-                    MVC-pattern, these links might be of help to you.</p>
-                 <ul>
-                     <li>
-                         <a href="http://dev.catalyst.perl.org/wiki/Models">
-                             Introduction to Models
-                         </a>
-                     </li>
-                     <li>
-                         <a href="http://dev.catalyst.perl.org/wiki/Views">
-                             Introduction to Views
-                         </a>
-                     </li>
-                     <li>
-                         <a href="http://dev.catalyst.perl.org/wiki/Controllers">
-                             Introduction to Controllers
-                         </a>
-                     </li>
-                 </ul>
+                 <pre><code>perldoc <a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Intro.pod">Catalyst::Manual::Intro</a>
+perldoc <a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual.pod">Catalyst::Manual</a></code></pre>
                  <h2>What to do next?</h2>
-                 <p>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.</p>
+                 <p>Next it's time to write an actual application. Use the
+                    helper scripts to generate <a href="http://cpansearch.perl.org/search?query=Catalyst%3A%3AController%3A%3A&mode=all">controllers</a>,
+                    <a href="http://cpansearch.perl.org/search?query=Catalyst%3A%3AModel%3A%3A&mode=all">models</a> and
+                    <a href="http://cpansearch.perl.org/search?query=Catalyst%3A%3AView%3A%3A&mode=all">views</a>,
+                    they can save you a lot of work.</p>
+                    <pre><code>script/${prefix}_create.pl -help</code></pre>
+                    <p>Also, be sure to check out the vast and growing
+                    collection of <a href="http://cpansearch.perl.org/search?query=Catalyst%3A%3APlugin%3A%3A&mode=all">plugins for Catalyst on CPAN</a>,
+                    you are likely to find what you need there.
+                    </p>
+
                  <h2>Need help?</h2>
-                 <p>Catalyst has a very active community. The main places to get
-                    in touch are these.</p>
+                 <p>Catalyst has a very active community. Here are the main places to
+                    get in touch with us.</p>
                  <ul>
                      <li>
                          <a href="http://dev.catalyst.perl.org">Wiki</a>
@@ -658,12 +665,8 @@ perldoc<a href="http://cpansearch.perl.org/dist/Catalyst/lib/Catalyst/Manual/Int
                  </ul>
                  <h2>In conclusion</h2>
                  <p>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.</p>
-                 <p class="signature">-- #1. the first rule of the Cabal is, you do not 
-                                         talk about the Cabal.<br/>
-                                         #2. the second rule of the Cabal is, you DO NOT
-                                         talk about the Cabal.</p>
+                    as we enjoyed making it. Please contact us if you have ideas
+                    for improvement or other feedback.</p>
              </div>
          </div>
     </body>
@@ -1617,6 +1620,10 @@ Andy Grundman
 
 Andy Wardley
 
+Andreas Marienborg
+
+Andrew Bramble
+
 Andrew Ford
 
 Andrew Ruthven
@@ -1670,7 +1677,7 @@ Sebastian Riedel, C<sri@oook.de>
 =head1 LICENSE
 
 This library is free software . You can redistribute it and/or modify it under
-the same terms as perl itself.
+the same terms as Perl itself.
 
 =cut