From: Kennedy Clark Date: Wed, 17 Feb 2010 02:44:54 +0000 (+0000) Subject: Convert tabs to spaces. X-Git-Tag: v5.8005~37 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=0ed3df53a9644cf30fe2a79828fd2e15044dbcd6 Convert tabs to spaces. Convert to $c->stash(name => 'value') vs. $c->stash->{name} = $value --- diff --git a/lib/Catalyst/Manual/Tutorial/01_Intro.pod b/lib/Catalyst/Manual/Tutorial/01_Intro.pod index a825e28..2115710 100644 --- a/lib/Catalyst/Manual/Tutorial/01_Intro.pod +++ b/lib/Catalyst/Manual/Tutorial/01_Intro.pod @@ -384,7 +384,7 @@ Once the system has booted to a "C" prompt, first install the Subversion client in case you want to check out the completed chapter example code: - sudo aptitude -y install subversion + sudo aptitude -y install subversion Then enter the following command to add the more current "unstable" package repository so we get the latest versions of Catalyst and @@ -626,16 +626,16 @@ of each part for the appropriate svn command to use). B You can run the test cases for the final code through Chapter 8 with the following commands: - svn co http://dev.catalystframework.org/repos/Catalyst/trunk/examples/Tutorial/MyApp_Chapter8 - cd MyApp_Chapter8/MyApp + svn co http://dev.catalystframework.org/repos/Catalyst/trunk/examples/Tutorial/MyApp_Chapter8 + cd MyApp_Chapter8/MyApp CATALYST_DEBUG=0 prove -wl t If you wish to include the L section in your tests, substitute C for C in the URL above (don't forget to "cd" out of the Ch8 directory if you ran the code above). - svn co http://dev.catalystframework.org/repos/Catalyst/trunk/examples/Tutorial/MyApp_Chapter9_FormFu - cd MyApp_Chapter9_FormFu/MyApp + svn co http://dev.catalystframework.org/repos/Catalyst/trunk/examples/Tutorial/MyApp_Chapter9_FormFu + cd MyApp_Chapter9_FormFu/MyApp CATALYST_DEBUG=0 prove -wl t You can also fire up the application under the development server that is conveniently diff --git a/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod index dde6b86..4c44d1d 100644 --- a/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod +++ b/lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod @@ -330,7 +330,7 @@ Save the file, and you should notice the following in your server output: - /home/me/Hello/lib/Hello/Controller/Root.pm (modify) Attempting to restart the server - ... + ... [debug] Loaded Private actions: .----------------------+--------------------------------------+--------------. | Private | Class | Method | @@ -480,7 +480,7 @@ In C, add the following method: my ( $self, $c ) = @_; $c->stash(username => 'John', - template => 'site/test.tt'); + template => 'site/test.tt'); } Notice the "Local" attribute on the C method. This will cause diff --git a/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod b/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod index 23c6077..c92075c 100644 --- a/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod +++ b/lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod @@ -303,9 +303,9 @@ and add the following method to the controller: # Retrieve all of the book records as book model objects and store in the # stash where they can be accessed by the TT template - # $c->stash->{books} = [$c->model('DB::Book')->all]; + # $c->stash(books => [$c->model('DB::Book')->all]); # But, for now, use this code until we create the model later - $c->stash->{books} = ''; + $c->stash(books => ''); # Set the TT template to use. You will almost always want to do this # in your action methods (action methods respond to user input in @@ -857,7 +857,7 @@ and delete the next 2 lines): # Retrieve all of the book records as book model objects and store # in the stash where they can be accessed by the TT template - $c->stash->{books} = [$c->model('DB::Book')->all]; + $c->stash(books => [$c->model('DB::Book')->all]); # Set the TT template to use. You will almost always want to do this # in your action methods (action methods respond to user input in @@ -1555,7 +1555,7 @@ has changed): # Retrieve all of the book records as book model objects and store in the # stash where they can be accessed by the TT template - $c->stash->{books} = [$c->model('DB::Book')->all]; + $c->stash(books => [$c->model('DB::Book')->all]); # Set the TT template to use. You will almost always want to do this # in your action methods (actions methods respond to user input in @@ -1582,7 +1582,7 @@ In order to be able to use C<$c-Eforward> and C<$c-Edetach> later in the tutorial, you should remove the comment from the statement in C in C: - $c->stash->{template} = 'books/list.tt2'; + $c->stash(template => 'books/list.tt2'); Then delete the C line in C. diff --git a/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod b/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod index 2adc72f..39d3413 100644 --- a/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod +++ b/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod @@ -116,11 +116,9 @@ Edit C and enter the following method: # Note: Above is a shortcut for this: # $book->create_related('book_authors', {author_id => $author_id}); - # Assign the Book object to the stash for display in the view - $c->stash->{book} = $book; - - # Set the TT template to use - $c->stash->{template} = 'books/create_done.tt2'; + # Assign the Book object to the stash for display and set template + $c->stash(book => $book, + template => 'books/create_done.tt2'); } Notice that Catalyst takes "extra slash-separated information" from the @@ -412,7 +410,7 @@ method: my ($self, $c) = @_; # Store the ResultSet in stash so it's available for other methods - $c->stash->{resultset} = $c->model('DB::Book'); + $c->stash(resultset => $c->model('DB::Book')); # Print a message to the debug log $c->log->debug('*** INSIDE BASE METHOD ***'); @@ -494,7 +492,7 @@ Edit C and add the following method: my ($self, $c) = @_; # Set the TT template to use - $c->stash->{template} = 'books/form_create.tt2'; + $c->stash(template => 'books/form_create.tt2'); } This action simply invokes a view containing a form to create a book. @@ -548,15 +546,13 @@ save the form information to the database: # Note: Above is a shortcut for this: # $book->create_related('book_authors', {author_id => $author_id}); - # Store new model object in stash - $c->stash->{book} = $book; - # Avoid Data::Dumper issue mentioned earlier # You can probably omit this $Data::Dumper::Useperl = 1; - # Set the TT template to use - $c->stash->{template} = 'books/create_done.tt2'; + # Store new model object in stash and set template + $c->stash(book => $book, + template => 'books/create_done.tt2'); } @@ -1085,13 +1081,13 @@ Then add the following method to the C: # Retrieve all of the book records as book model objects and store in the # stash where they can be accessed by the TT template, but only # retrieve books created within the last $min number of minutes - $c->stash->{books} = [$c->model('DB::Book') - ->created_after(DateTime->now->subtract(minutes => $mins))]; + $c->stash(books => [$c->model('DB::Book') + ->created_after(DateTime->now->subtract(minutes => $mins))]); # Set the TT template to use. You will almost always want to do this # in your action methods (action methods respond to user input in # your controllers). - $c->stash->{template} = 'books/list.tt2'; + $c->stash(template => 'books/list.tt2'); } Now try different values for the "minutes" argument (the final number @@ -1135,15 +1131,15 @@ C and add the following method: # stash where they can be accessed by the TT template, but only # retrieve books created within the last $min number of minutes # AND that have 'TCP' in the title - $c->stash->{books} = [$c->model('DB::Book') + $c->stash(books => [$c->model('DB::Book') ->created_after(DateTime->now->subtract(minutes => $mins)) ->search({title => {'like', '%TCP%'}}) - ]; + ]); # Set the TT template to use. You will almost always want to do this # in your action methods (action methods respond to user input in # your controllers). - $c->stash->{template} = 'books/list.tt2'; + $c->stash(template => 'books/list.tt2'); } To try this out, enter the following URL into your browser: @@ -1202,15 +1198,15 @@ shown here -- the rest of the method should be the same): # stash where they can be accessed by the TT template, but only # retrieve books created within the last $min number of minutes # AND that have 'TCP' in the title - $c->stash->{books} = [$c->model('DB::Book') + $c->stash(books => [$c->model('DB::Book') ->created_after(DateTime->now->subtract(minutes => $mins)) ->title_like('TCP') - ]; + ]); # Set the TT template to use. You will almost always want to do this # in your action methods (action methods respond to user input in # your controllers). - $c->stash->{template} = 'books/list.tt2'; + $c->stash(template => 'books/list.tt2'); } Try out the C and C URLs as we did above. diff --git a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod index dc6e2bd..d2e0257 100644 --- a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod +++ b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod @@ -370,15 +370,15 @@ and update the definition of C to match: return; } else { # Set an error message - $c->stash->{error_msg} = "Bad username or password."; + $c->stash(error_msg => "Bad username or password."); } } else { # Set an error message - $c->stash->{error_msg} = "Empty username or password."; + $c->stash(error_msg => "Empty username or password."); } # If either of above don't work out, send to the login page - $c->stash->{template} = 'login.tt2'; + $c->stash(template => 'login.tt2'); } Be sure to remove the