From: Graham Knop Date: Sun, 14 Apr 2019 06:55:05 +0000 (+0200) Subject: normalize whitespace in verbatim sections X-Git-Tag: v5.9010~12 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=commitdiff_plain;h=02bb2b5a140dc22d7d002fcdce868656d704676a normalize whitespace in verbatim sections --- diff --git a/lib/Catalyst/Manual/Actions.pod b/lib/Catalyst/Manual/Actions.pod index b27e14e..667f116 100644 --- a/lib/Catalyst/Manual/Actions.pod +++ b/lib/Catalyst/Manual/Actions.pod @@ -17,9 +17,9 @@ them. This is pretty simple. Actions work just like the normal dispatch attributes you are used to, like Local or Private: - sub Hello :Local :ActionClass('SayBefore') { - $c->res->output( 'Hello '.$c->stash->{what} ); - } + sub Hello :Local :ActionClass('SayBefore') { + $c->res->output( 'Hello '.$c->stash->{what} ); + } In this example, we expect the SayBefore action to magically populate stash with something relevant before C is run. In the next @@ -35,23 +35,23 @@ Implementing the action itself is almost as easy. Just use L as a base class and decorate the C call in the Action class: - package Catalyst::Action::MyAction; - use Moose; - use namespace::autoclean; + package Catalyst::Action::MyAction; + use Moose; + use namespace::autoclean; - extends 'Catalyst::Action'; + extends 'Catalyst::Action'; - before 'execute' => sub { - my ( $self, $controller, $c, $test ) = @_; - $c->stash->{what} = 'world'; - }; + before 'execute' => sub { + my ( $self, $controller, $c, $test ) = @_; + $c->stash->{what} = 'world'; + }; - after 'execute' => sub { - my ( $self, $controller, $c, $test ) = @_; - $c->stash->{foo} = 'bar'; - }; + after 'execute' => sub { + my ( $self, $controller, $c, $test ) = @_; + $c->stash->{foo} = 'bar'; + }; - __PACKAGE__->meta->make_immutable; + __PACKAGE__->meta->make_immutable; Pretty simple, huh? @@ -63,33 +63,33 @@ inflexible. The solution to this is to use L, which would make the example above look like this: - package Catalyst::ActionRole::MyActionRole; - use Moose::Role; + package Catalyst::ActionRole::MyActionRole; + use Moose::Role; - before 'execute' => sub { - my ( $self, $controller, $c, $test ) = @_; - $c->stash->{what} = 'world'; - }; + before 'execute' => sub { + my ( $self, $controller, $c, $test ) = @_; + $c->stash->{what} = 'world'; + }; - after 'execute' => sub { - my ( $self, $controller, $c, $test ) = @_; - $c->stash->{foo} = 'bar'; - }; + after 'execute' => sub { + my ( $self, $controller, $c, $test ) = @_; + $c->stash->{foo} = 'bar'; + }; - 1; + 1; and this would be used in a controller like this: - package MyApp::Controller::Foo; - use Moose; - use namespace::autoclean; - BEGIN { extends 'Catalyst::Controller::ActionRole'; } + package MyApp::Controller::Foo; + use Moose; + use namespace::autoclean; + BEGIN { extends 'Catalyst::Controller::ActionRole'; } - sub foo : Does('MyActionRole') { - my ($self, $c) = @_; - } + sub foo : Does('MyActionRole') { + my ($self, $c) = @_; + } - 1; + 1; =head1 EXAMPLE ACTIONS diff --git a/lib/Catalyst/Manual/Cookbook.pod b/lib/Catalyst/Manual/Cookbook.pod index 7249c5c..bf6372b 100644 --- a/lib/Catalyst/Manual/Cookbook.pod +++ b/lib/Catalyst/Manual/Cookbook.pod @@ -117,41 +117,39 @@ reference. =head3 EXAMPLE - package MyApp; - use Moose; - use namespace::autoclean; - - use Catalyst qw/ - Session - Session::Store::FastMmap - Session::State::Cookie - /; - extends 'Catalyst'; - __PACKAGE__->setup; - - package MyApp::Controller::Foo; - use Moose; - use namespace::autoclean; - BEGIN { extends 'Catalyst::Controller' }; - ## Write data into the session - - sub add_item : Local { - my ( $self, $c ) = @_; - - my $item_id = $c->req->params->{item}; - - push @{ $c->session->{items} }, $item_id; + package MyApp; + use Moose; + use namespace::autoclean; + + use Catalyst qw/ + Session + Session::Store::FastMmap + Session::State::Cookie + /; + extends 'Catalyst'; + __PACKAGE__->setup; + + package MyApp::Controller::Foo; + use Moose; + use namespace::autoclean; + BEGIN { extends 'Catalyst::Controller' }; + ## Write data into the session + + sub add_item : Local { + my ( $self, $c ) = @_; - } + my $item_id = $c->req->params->{item}; - ## A page later we retrieve the data from the session: + push @{ $c->session->{items} }, $item_id; + } - sub get_items : Local { - my ( $self, $c ) = @_; + ## A page later we retrieve the data from the session: - $c->stash->{items_to_display} = $c->session->{items}; + sub get_items : Local { + my ( $self, $c ) = @_; - } + $c->stash->{items_to_display} = $c->session->{items}; + } =head3 More information @@ -310,9 +308,9 @@ C<< $c->user >> call. Examples: - Password - Simple username/password checking. - HTTPD - Checks using basic HTTP auth. - TypeKey - Check using the typekey system. + Password - Simple username/password checking. + HTTPD - Checks using basic HTTP auth. + TypeKey - Check using the typekey system. =head3 Storage backends @@ -322,8 +320,8 @@ within this system; you will need to do it yourself. Examples: - DBIC - Storage using a database via DBIx::Class. - Minimal - Storage using a simple hash (for testing). + DBIC - Storage using a database via DBIx::Class. + Minimal - Storage using a simple hash (for testing). =head3 User objects @@ -332,7 +330,7 @@ credential verifier, and is filled with the retrieved user information. Examples: - Hash - A simple hash of keys and values. + Hash - A simple hash of keys and values. =head3 ACL authorization @@ -361,67 +359,67 @@ the user is a member. =head3 EXAMPLE - package MyApp; - use Moose; - use namespace::autoclean; - extends qw/Catalyst/; - use Catalyst qw/ - Authentication - Authorization::Roles - /; + package MyApp; + use Moose; + use namespace::autoclean; + extends qw/Catalyst/; + use Catalyst qw/ + Authentication + Authorization::Roles + /; - __PACKAGE__->config( - authentication => { - default_realm => 'test', - realms => { - test => { - credential => { - class => 'Password', - password_field => 'password', - password_type => 'self_check', - }, - store => { - class => 'Htpasswd', - file => 'htpasswd', - }, - }, - }, - }, - ); + __PACKAGE__->config( + authentication => { + default_realm => 'test', + realms => { + test => { + credential => { + class => 'Password', + password_field => 'password', + password_type => 'self_check', + }, + store => { + class => 'Htpasswd', + file => 'htpasswd', + }, + }, + }, + }, + ); - package MyApp::Controller::Root; - use Moose; - use namespace::autoclean; + package MyApp::Controller::Root; + use Moose; + use namespace::autoclean; - BEGIN { extends 'Catalyst::Controller' } + BEGIN { extends 'Catalyst::Controller' } - __PACKAGE__->config(namespace => ''); + __PACKAGE__->config(namespace => ''); - sub login : Local { - my ($self, $c) = @_; + sub login : Local { + my ($self, $c) = @_; - if ( my $user = $c->req->params->{user} - and my $password = $c->req->param->{password} ) - { - if ( $c->authenticate( username => $user, password => $password ) ) { - $c->res->body( "hello " . $c->user->name ); - } else { - # login incorrect - } - } - else { - # invalid form input - } - } + if ( my $user = $c->req->params->{user} + and my $password = $c->req->param->{password} ) + { + if ( $c->authenticate( username => $user, password => $password ) ) { + $c->res->body( "hello " . $c->user->name ); + } else { + # login incorrect + } + } + else { + # invalid form input + } + } - sub restricted : Local { - my ( $self, $c ) = @_; + sub restricted : Local { + my ( $self, $c ) = @_; - $c->detach("unauthorized") - unless $c->check_user_roles( "admin" ); + $c->detach("unauthorized") + unless $c->check_user_roles( "admin" ); - # do something restricted here - } + # do something restricted here + } =head3 Using authentication in a testing environment @@ -575,7 +573,7 @@ clean up in your C private action instead. Also, it's important to note that if you restrict access to "/" then C, C, etc. will also be restricted. - MyApp->acl_allow_root_internals; + MyApp->acl_allow_root_internals; will create rules that permit access to C, C, and C in the root of your app (but not in any other controller). @@ -1083,7 +1081,7 @@ attached. These can be one of several types. Assume our Controller module starts with the following package declaration: - package MyApp::Controller::Buckets; + package MyApp::Controller::Buckets; and we are running our application on localhost, port 3000 (the test server default). @@ -1097,19 +1095,19 @@ or an absolute path. A relative path will be relative to the controller namespace, an absolute path will represent an exact matching URL. - sub my_handles : Path('handles') { .. } + sub my_handles : Path('handles') { .. } becomes - http://localhost:3000/buckets/handles + http://localhost:3000/buckets/handles and - sub my_handles : Path('/handles') { .. } + sub my_handles : Path('/handles') { .. } becomes - http://localhost:3000/handles + http://localhost:3000/handles See also: L @@ -1119,22 +1117,22 @@ When using a Local attribute, no parameters are needed, instead, the name of the action is matched in the URL. The namespaces created by the name of the controller package is always part of the URL. - sub my_handles : Local { .. } + sub my_handles : Local { .. } becomes - http://localhost:3000/buckets/my_handles + http://localhost:3000/buckets/my_handles =item Global A Global attribute is similar to a Local attribute, except that the namespace of the controller is ignored, and matching starts at root. - sub my_handles : Global { .. } + sub my_handles : Global { .. } becomes - http://localhost:3000/my_handles + http://localhost:3000/my_handles =item Regex @@ -1142,15 +1140,15 @@ By now you should have figured that a Regex attribute is just what it sounds like. This one takes a regular expression, and matches starting from root. These differ from the rest as they can match multiple URLs. - sub my_handles : Regex('^handles') { .. } + sub my_handles : Regex('^handles') { .. } matches - http://localhost:3000/handles + http://localhost:3000/handles and - http://localhost:3000/handles_and_other_parts + http://localhost:3000/handles_and_other_parts etc. @@ -1161,15 +1159,15 @@ See also: L A LocalRegex is similar to a Regex, except it only matches below the current controller namespace. - sub my_handles : LocalRegex(^handles') { .. } + sub my_handles : LocalRegex(^handles') { .. } matches - http://localhost:3000/buckets/handles + http://localhost:3000/buckets/handles and - http://localhost:3000/buckets/handles_and_other_parts + http://localhost:3000/buckets/handles_and_other_parts etc. @@ -1184,7 +1182,7 @@ Last but not least, there is the Private attribute, which allows you to create your own internal actions, which can be forwarded to, but won't be matched as URLs. - sub my_handles : Private { .. } + sub my_handles : Private { .. } becomes nothing at all.. @@ -1201,7 +1199,7 @@ part of your namespace, you'll get an error page instead. If you want to find out where it was the user was trying to go, you can look in the request object using C<< $c->req->path >>. - sub default :Path { .. } + sub default :Path { .. } works for all unknown URLs, in this controller namespace, or every one if put directly into MyApp.pm. @@ -1213,11 +1211,11 @@ namespace of your controller. If index, default and matching Path actions are defined, then index will be used instead of default and Path. - sub index :Path :Args(0) { .. } + sub index :Path :Args(0) { .. } becomes - http://localhost:3000/buckets + http://localhost:3000/buckets =item begin @@ -1227,11 +1225,11 @@ can be used to set up variables/data for this particular part of your app. A single begin action is called, its always the one most relevant to the current namespace. - sub begin : Private { .. } + sub begin : Private { .. } is called once when - http://localhost:3000/bucket/(anything)? + http://localhost:3000/bucket/(anything)? is visited. @@ -1243,11 +1241,11 @@ processing to the View component. A single end action is called, its always the one most relevant to the current namespace. - sub end : Private { .. } + sub end : Private { .. } is called once after any actions when - http://localhost:3000/bucket/(anything)? + http://localhost:3000/bucket/(anything)? is visited. @@ -1258,8 +1256,8 @@ chain of paths up to and including the ending namespace, will be called. (In contrast, only one of the begin/end/default actions will be called, the relevant one). - package MyApp::Controller::Root; - sub auto : Private { .. } + package MyApp::Controller::Root; + sub auto : Private { .. } and @@ -1267,7 +1265,7 @@ and will both be called when visiting - http://localhost:3000/bucket/(anything)? + http://localhost:3000/bucket/(anything)? =back @@ -1360,9 +1358,9 @@ To implement uploads in Catalyst, you need to have a HTML form similar to this:
- - - + + +
It's very important not to forget C in @@ -1396,11 +1394,11 @@ Code for uploading multiple files from one form needs a few changes: The form should have this basic structure:
- -
-
-
- + +
+
+
+
And in the controller: @@ -1444,22 +1442,22 @@ action. As of version 5.30, arguments can be passed in the call to C; in earlier versions, you can manually set the arguments in the Catalyst Request object: - # version 5.30 and later: - $c->forward('/wherever', [qw/arg1 arg2 arg3/]); + # version 5.30 and later: + $c->forward('/wherever', [qw/arg1 arg2 arg3/]); - # pre-5.30 - $c->req->args([qw/arg1 arg2 arg3/]); - $c->forward('/wherever'); + # pre-5.30 + $c->req->args([qw/arg1 arg2 arg3/]); + $c->forward('/wherever'); (See the L Flow_Control section for more information on passing arguments via C.) =head2 Chained dispatch using base classes, and inner packages. - package MyApp::Controller::Base; - use base qw/Catalyst::Controller/; + package MyApp::Controller::Base; + use base qw/Catalyst::Controller/; - sub key1 : Chained('/') + sub key1 : Chained('/') =head2 Extending RenderView (formerly DefaultEnd) @@ -1476,8 +1474,8 @@ To add something to an C action that is called before rendering method: sub end : ActionClass('RenderView') { - my ( $self, $c ) = @_; - # do stuff here; the RenderView action is called afterwards + my ( $self, $c ) = @_; + # do stuff here; the RenderView action is called afterwards } To add things to an C action that are called I rendering, @@ -1486,9 +1484,9 @@ you can set it up like this: sub render : ActionClass('RenderView') { } sub end : Private { - my ( $self, $c ) = @_; - $c->forward('render'); - # do stuff here + my ( $self, $c ) = @_; + $c->forward('render'); + # do stuff here } @@ -1512,7 +1510,7 @@ F is found and served. Using the plugin is as simple as setting your use line in MyApp.pm to include: - use Catalyst qw/Static::Simple/; + use Catalyst qw/Static::Simple/; and already files will be served. @@ -1547,14 +1545,14 @@ Template Toolkit files. You may of course want to change the default locations, and make Static::Simple look somewhere else, this is as easy as: - MyApp->config( - static => { - include_path => [ - MyApp->path_to('/'), - '/path/to/my/files', - ], - }, - ); + MyApp->config( + static => { + include_path => [ + MyApp->path_to('/'), + '/path/to/my/files', + ], + }, + ); When you override include_path, it will not automatically append the normal root path, so you need to add it yourself if you still want @@ -1566,14 +1564,14 @@ served. If you want to force some directories to be only static, you can set them using paths relative to the root dir, or regular expressions: - MyApp->config( - static => { - dirs => [ - 'static', - qr/^(images|css)/, - ], - }, - ); + MyApp->config( + static => { + dirs => [ + 'static', + qr/^(images|css)/, + ], + }, + ); =item File extensions @@ -1581,22 +1579,22 @@ By default, the following extensions are not served (that is, they will be processed by Catalyst): B. This list can be replaced easily: - MyApp->config( + MyApp->config( static => { ignore_extensions => [ qw/tmpl tt tt2 html xhtml/ ], }, - ); + ); =item Ignoring directories Entire directories can be ignored. If used with include_path, directories relative to the include_path dirs will also be ignored: - MyApp->config( static => { + MyApp->config( static => { ignore_dirs => [ qw/tmpl css/ ], - }); + }); =back @@ -1620,7 +1618,7 @@ static content to the view, perhaps like this: my ( $self, $c ) = @_; $c->forward( 'MyApp::View::TT' ) - unless ( $c->res->body || !$c->stash->{template} ); + unless ( $c->res->body || !$c->stash->{template} ); } This code will only forward to the view if a template has been diff --git a/lib/Catalyst/Manual/DevelopmentProcess.pod b/lib/Catalyst/Manual/DevelopmentProcess.pod index a0183e6..3c16439 100644 --- a/lib/Catalyst/Manual/DevelopmentProcess.pod +++ b/lib/Catalyst/Manual/DevelopmentProcess.pod @@ -176,4 +176,3 @@ This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut - diff --git a/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod b/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod index 120db49..8c166dd 100644 --- a/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod +++ b/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod @@ -507,9 +507,9 @@ Open F in your editor and enter:
- - - + + +
Title:
Rating:
Author ID:
Title:
Rating:
Author ID:
@@ -609,32 +609,32 @@ header, and 2) the five lines for the Delete link near the bottom): TitleRatingAuthor(s)Links [% # Display each book in a table row %] [% FOREACH book IN books -%] - - [% book.title %] - [% book.rating %] - - [% # NOTE: See Chapter 4 for a better way to do this! -%] - [% # First initialize a TT variable to hold a list. Then use a TT FOREACH -%] - [% # loop in 'side effect notation' to load just the last names of the -%] - [% # authors into the list. Note that the 'push' TT vmethod doesn't return -%] - [% # a value, so nothing will be printed here. But, if you have something -%] - [% # in TT that does return a value and you don't want it printed, you -%] - [% # 1) assign it to a bogus value, or -%] - [% # 2) use the CALL keyword to call it and discard the return value. -%] - [% tt_authors = [ ]; - tt_authors.push(author.last_name) FOREACH author = book.authors %] - [% # Now use a TT 'virtual method' to display the author count in parens -%] - [% # Note the use of the TT filter "| html" to escape dangerous characters -%] - ([% tt_authors.size | html %]) - [% # Use another TT vmethod to join & print the names & comma separators -%] - [% tt_authors.join(', ') | html %] - - - [% # Add a link to delete a book %] - Delete - - + + [% book.title %] + [% book.rating %] + + [% # NOTE: See Chapter 4 for a better way to do this! -%] + [% # First initialize a TT variable to hold a list. Then use a TT FOREACH -%] + [% # loop in 'side effect notation' to load just the last names of the -%] + [% # authors into the list. Note that the 'push' TT vmethod doesn't return -%] + [% # a value, so nothing will be printed here. But, if you have something -%] + [% # in TT that does return a value and you don't want it printed, you -%] + [% # 1) assign it to a bogus value, or -%] + [% # 2) use the CALL keyword to call it and discard the return value. -%] + [% tt_authors = [ ]; + tt_authors.push(author.last_name) FOREACH author = book.authors %] + [% # Now use a TT 'virtual method' to display the author count in parens -%] + [% # Note the use of the TT filter "| html" to escape dangerous characters -%] + ([% tt_authors.size | html %]) + [% # Use another TT vmethod to join & print the names & comma separators -%] + [% tt_authors.join(', ') | html %] + + + [% # Add a link to delete a book %] + Delete + + [% END -%] @@ -1296,21 +1296,21 @@ F): ... - [% # NOTE: See Chapter 4 for a better way to do this! -%] - [% # First initialize a TT variable to hold a list. Then use a TT FOREACH -%] - [% # loop in 'side effect notation' to load just the last names of the -%] - [% # authors into the list. Note that the 'push' TT vmethod does not print -%] - [% # a value, so nothing will be printed here. But, if you have something -%] - [% # in TT that does return a method and you don't want it printed, you -%] - [% # can: 1) assign it to a bogus value, or 2) use the CALL keyword to -%] - [% # call it and discard the return value. -%] - [% tt_authors = [ ]; - tt_authors.push(author.full_name) FOREACH author = book.authors %] - [% # Now use a TT 'virtual method' to display the author count in parens -%] - [% # Note the use of the TT filter "| html" to escape dangerous characters -%] - ([% tt_authors.size | html %]) - [% # Use another TT vmethod to join & print the names & comma separators -%] - [% tt_authors.join(', ') | html %] + [% # NOTE: See Chapter 4 for a better way to do this! -%] + [% # First initialize a TT variable to hold a list. Then use a TT FOREACH -%] + [% # loop in 'side effect notation' to load just the last names of the -%] + [% # authors into the list. Note that the 'push' TT vmethod does not print -%] + [% # a value, so nothing will be printed here. But, if you have something -%] + [% # in TT that does return a method and you don't want it printed, you -%] + [% # can: 1) assign it to a bogus value, or 2) use the CALL keyword to -%] + [% # call it and discard the return value. -%] + [% tt_authors = [ ]; + tt_authors.push(author.full_name) FOREACH author = book.authors %] + [% # Now use a TT 'virtual method' to display the author count in parens -%] + [% # Note the use of the TT filter "| html" to escape dangerous characters -%] + ([% tt_authors.size | html %]) + [% # Use another TT vmethod to join & print the names & comma separators -%] + [% tt_authors.join(', ') | html %] ... @@ -1365,8 +1365,8 @@ match the following: ... - [% # Print count and author list using Result Class methods -%] - ([% book.author_count | html %]) [% book.author_list | html %] + [% # Print count and author list using Result Class methods -%] + ([% book.author_count | html %]) [% book.author_list | html %] ... diff --git a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod index 1b6078f..87ab435 100644 --- a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod +++ b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod @@ -85,22 +85,22 @@ opening F in your editor and insert: -- PRAGMA foreign_keys = ON; CREATE TABLE users ( - id INTEGER PRIMARY KEY, - username TEXT, - password TEXT, - email_address TEXT, - first_name TEXT, - last_name TEXT, - active INTEGER + id INTEGER PRIMARY KEY, + username TEXT, + password TEXT, + email_address TEXT, + first_name TEXT, + last_name TEXT, + active INTEGER ); CREATE TABLE role ( - id INTEGER PRIMARY KEY, - role TEXT + id INTEGER PRIMARY KEY, + role TEXT ); CREATE TABLE user_role ( - user_id INTEGER REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE, - role_id INTEGER REFERENCES role(id) ON DELETE CASCADE ON UPDATE CASCADE, - PRIMARY KEY (user_id, role_id) + user_id INTEGER REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE, + role_id INTEGER REFERENCES role(id) ON DELETE CASCADE ON UPDATE CASCADE, + PRIMARY KEY (user_id, role_id) ); -- -- Load up some initial test data @@ -433,19 +433,19 @@ Create a login form by opening F and inserting:
- - - - - - - - - - - - -
Username:
Password:
+ + + + + + + + + + + + +
Username:
Password:
@@ -515,8 +515,8 @@ lines to the bottom of the file: ...

[% - # This code illustrates how certain parts of the TT - # template will only be shown to users who have logged in + # This code illustrates how certain parts of the TT + # template will only be shown to users who have logged in %] [% IF c.user_exists %] Please Note: You are already logged in as '[% c.user.username %]'. @@ -525,11 +525,11 @@ lines to the bottom of the file: You need to log in to use this application. [% END %] [%# - Note that this whole block is a comment because the "#" appears - immediate after the "[%" (with no spaces in between). Although it - can be a handy way to temporarily "comment out" a whole block of - TT code, it's probably a little too subtle for use in "normal" - comments. + Note that this whole block is a comment because the "#" appears + immediate after the "[%" (with no spaces in between). Although it + can be a handy way to temporarily "comment out" a whole block of + TT code, it's probably a little too subtle for use in "normal" + comments. %]

@@ -575,8 +575,8 @@ bottom (below the closing tag): ...

- Login - Create + Login + Create

Reload your browser and you should now see a "Login" and "Create" links diff --git a/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormFu.pod b/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormFu.pod index 20622cb..3ef5fd4 100644 --- a/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormFu.pod +++ b/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormFu.pod @@ -593,50 +593,50 @@ below into the file F and delete the F file. The below is in L format which follows the syntax of Apache config files. - constraints Required - - - min 5 - max 40 - type Length - message Length must be between 5 and 40 characters - - filter TrimEdges - filter HTMLEscape - name title - type Text - label Title - - title Enter a book title here - - - - constraints Integer - filter TrimEdges - filter NonNumeric - name rating - type Text - label Rating - - title Enter a rating between 1 and 5 here - - - - constraints Integer - filter TrimEdges - filter HTMLEscape - name authors - type Select - label Author - multiple 1 - size 3 - - - value Submit - name submit - type Submit - - indicator submit + constraints Required + + + min 5 + max 40 + type Length + message Length must be between 5 and 40 characters + + filter TrimEdges + filter HTMLEscape + name title + type Text + label Title + + title Enter a book title here + + + + constraints Integer + filter TrimEdges + filter NonNumeric + name rating + type Text + label Rating + + title Enter a rating between 1 and 5 here + + + + constraints Integer + filter TrimEdges + filter HTMLEscape + name authors + type Select + label Author + multiple 1 + size 3 + + + value Submit + name submit + type Submit + + indicator submit =head1 AUTHOR diff --git a/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormHandler.pod b/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormHandler.pod index ff372ea..e15245c 100644 --- a/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormHandler.pod +++ b/lib/Catalyst/Manual/Tutorial/09_AdvancedCRUD/09_FormHandler.pod @@ -2,7 +2,6 @@ Catalyst::Manual::Tutorial::09_AdvancedCRUD::09_FormHandler - Catalyst Tutorial - Chapter 9: Advanced CRUD - FormHandler - =head1 OVERVIEW This is B for the Catalyst tutorial. @@ -178,8 +177,8 @@ the bottom of the existing file: ...

- HTML::FormHandler: - Create + HTML::FormHandler: + Create

This adds a new link to the bottom of the book list page that we can @@ -264,10 +263,10 @@ Update the F, adding an 'edit' link below the "Delete" link to use the FormHandler edit method: - [% # Add a link to delete a book %] - Delete - [% # Add a link to edit a book %] - Edit + [% # Add a link to delete a book %] + Delete + [% # Add a link to edit a book %] + Edit diff --git a/lib/Catalyst/Manual/Tutorial/10_Appendices.pod b/lib/Catalyst/Manual/Tutorial/10_Appendices.pod index 84c5d6a..9d088d1 100644 --- a/lib/Catalyst/Manual/Tutorial/10_Appendices.pod +++ b/lib/Catalyst/Manual/Tutorial/10_Appendices.pod @@ -2,7 +2,6 @@ Catalyst::Manual::Tutorial::10_Appendices - Catalyst Tutorial - Chapter 10: Appendices - =head1 OVERVIEW This is B for the Catalyst tutorial. @@ -616,23 +615,23 @@ Open the F in your editor and enter: -- Create a very simple database to hold book and author information -- CREATE TABLE IF NOT EXISTS `books` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `title` text CHARACTER SET utf8, - `rating` int(11) DEFAULT NULL, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `title` text CHARACTER SET utf8, + `rating` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- 'book_authors' is a many-to-many join table between books & authors CREATE TABLE IF NOT EXISTS `book_authors` ( - `book_id` int(11) NOT NULL DEFAULT '0', - `author_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`book_id`,`author_id`), - KEY `author_id` (`author_id`) + `book_id` int(11) NOT NULL DEFAULT '0', + `author_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`book_id`,`author_id`), + KEY `author_id` (`author_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `authors` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `first_name` text CHARACTER SET utf8, - `last_name` text CHARACTER SET utf8, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `first_name` text CHARACTER SET utf8, + `last_name` text CHARACTER SET utf8, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- --- Load some sample data @@ -751,25 +750,25 @@ Open F in your editor and enter: -- Add users and roles tables, along with a many-to-many join table -- CREATE TABLE IF NOT EXISTS `roles` ( - `id` int(11) NOT NULL, - `role` text CHARACTER SET utf8, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL, + `role` text CHARACTER SET utf8, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `users` ( - `id` int(11) NOT NULL, - `username` text CHARACTER SET utf8, - `password` text CHARACTER SET utf8, - `email_address` text CHARACTER SET utf8, - `first_name` text CHARACTER SET utf8, - `last_name` text CHARACTER SET utf8, - `active` int(11) DEFAULT NULL, - PRIMARY KEY (`id`) + `id` int(11) NOT NULL, + `username` text CHARACTER SET utf8, + `password` text CHARACTER SET utf8, + `email_address` text CHARACTER SET utf8, + `first_name` text CHARACTER SET utf8, + `last_name` text CHARACTER SET utf8, + `active` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `user_roles` ( - `user_id` int(11) NOT NULL DEFAULT '0', - `role_id` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`user_id`,`role_id`), - KEY `role_id` (`role_id`) + `user_id` int(11) NOT NULL DEFAULT '0', + `role_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_id`,`role_id`), + KEY `role_id` (`role_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- -- Load up some initial test data