From 45e4b287c0925cab5cc2692093034275dd0d17b9 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Wed, 29 Dec 2004 01:35:18 +0000 Subject: [PATCH] fix manual so search.cpan.org indexes it properly (it uses the NAME section for cross-linking). A couple of other minor POD/unit test fixes. git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@330 48953598-375a-da11-a14b-00016c27c3ee --- Changes | 4 +++- lib/Maypole/Manual.pod | 6 +++++- lib/Maypole/Manual/About.pod | 6 +++++- lib/Maypole/Manual/Beer.pod | 6 +++++- lib/Maypole/Manual/BuySpy.pod | 6 +++++- lib/Maypole/Manual/Flox.pod | 6 +++++- lib/Maypole/Manual/Model.pod | 6 +++++- lib/Maypole/Manual/Request.pod | 6 +++++- lib/Maypole/Manual/StandardTemplates.pod | 6 +++++- lib/Maypole/Manual/View.pod | 6 +++++- lib/Maypole/Manual/Workflow.pod | 8 ++++++-- lib/Maypole/View/Base.pm | 4 ++-- t/cgi_maypole.t | 3 ++- 13 files changed, 58 insertions(+), 15 deletions(-) diff --git a/Changes b/Changes index 64f042b..1af0f4c 100644 --- a/Changes +++ b/Changes @@ -2,9 +2,11 @@ This file documents the revision history for Perl extension Maypole. For information about current developments and future releases, see: http://maypole.perl.org/?TheRoadmap -2.06 XXX +2.06 Wed Dec 29 01:30:00 2004 Fixes: + - Minor restructuring of the manual so search.cpan.org indexes it better - #9129: Skip t/apache_mvc.t if Apache::Request isn't installed + 2.05 Fri Dec 24 03:20:00 2004 - Revised and updated documentation. Many thanks to Dave Howorth for his diff --git a/lib/Maypole/Manual.pod b/lib/Maypole/Manual.pod index 9c5dd0c..dc60222 100644 --- a/lib/Maypole/Manual.pod +++ b/lib/Maypole/Manual.pod @@ -1,4 +1,8 @@ -=head1 The Maypole Manual +=head1 NAME + +Maypole::Manual - The Maypole Manual + +=head1 DESCRIPTION The Maypole documentation is arranged over several files; this is the right one to start with, as it provides an overview of the diff --git a/lib/Maypole/Manual/About.pod b/lib/Maypole/Manual/About.pod index f2ab859..d78be34 100644 --- a/lib/Maypole/Manual/About.pod +++ b/lib/Maypole/Manual/About.pod @@ -1,5 +1,9 @@ -=head1 Introduction to Maypole +=head1 NAME + +Maypole::Manual::About - Introduction to Maypole + +=head1 DESCRIPTION This chapter serves as a gentle introduction to Maypole and setting up Maypole applications. We look at what Maypole is, how to get it up and diff --git a/lib/Maypole/Manual/Beer.pod b/lib/Maypole/Manual/Beer.pod index b6bd669..542b570 100644 --- a/lib/Maypole/Manual/Beer.pod +++ b/lib/Maypole/Manual/Beer.pod @@ -1,4 +1,8 @@ -=head1 The Beer Database, Twice +=head1 NAME + +Maypole::Manual::Beer - The Beer Database, Twice + +=head1 DESCRIPTION We briefly introduced the "beer database" example in the L chapter, where we diff --git a/lib/Maypole/Manual/BuySpy.pod b/lib/Maypole/Manual/BuySpy.pod index bf828a3..622b4d9 100644 --- a/lib/Maypole/Manual/BuySpy.pod +++ b/lib/Maypole/Manual/BuySpy.pod @@ -1,4 +1,8 @@ -=head1 The Maypole iBuySpy Portal +=head1 NAME + +Maypole::Manual::BugSpy - The Maypole iBuySpy Portal + +=head1 DESCRIPTION I think it's good fun to compare Maypole against other frameworks, so here's how to build the ASP.NET tutorial site in Maypole. diff --git a/lib/Maypole/Manual/Flox.pod b/lib/Maypole/Manual/Flox.pod index 3a1e92e..ed3309c 100644 --- a/lib/Maypole/Manual/Flox.pod +++ b/lib/Maypole/Manual/Flox.pod @@ -1,4 +1,8 @@ -=head1 Flox: A Free Social Networking Site +=head1 NAME + +Maypole::Manual::Flox - Flox: A Free Social Networking Site + +=head1 DESCRIPTION Friendster, Tribe, and now Google's Orkut - it seems like in early 2004, everyone wanted to be a social networking site. At the time, I was too diff --git a/lib/Maypole/Manual/Model.pod b/lib/Maypole/Manual/Model.pod index 9add893..5f310fe 100644 --- a/lib/Maypole/Manual/Model.pod +++ b/lib/Maypole/Manual/Model.pod @@ -1,4 +1,8 @@ -=head1 Maypole Model Classes +=head1 NAME + +Maypole::Manual::Model - Maypole Model Classes + +=head1 DESCRIPTION Maypole's model classes provide an interface to your data store. In principle Maypole can connect to pretty much any data source, diff --git a/lib/Maypole/Manual/Request.pod b/lib/Maypole/Manual/Request.pod index d3d66f2..f9788bd 100644 --- a/lib/Maypole/Manual/Request.pod +++ b/lib/Maypole/Manual/Request.pod @@ -1,4 +1,8 @@ -=head1 Maypole Request Hacking Cookbook +=head1 NAME + +Maypole::Manual::Request - Maypole Request Hacking Cookbook + +=head1 DESCRIPTION Hacks; design patterns; recipes: call it what you like, this chapter is a developing collection of techniques which can be slotted in to Maypole diff --git a/lib/Maypole/Manual/StandardTemplates.pod b/lib/Maypole/Manual/StandardTemplates.pod index 35f9a8a..dbf1279 100644 --- a/lib/Maypole/Manual/StandardTemplates.pod +++ b/lib/Maypole/Manual/StandardTemplates.pod @@ -1,5 +1,9 @@ -=head1 Maypole's Standard Templates and Actions +=head1 NAME + +Maypole::Manual::StandardTemplates - Maypole's Standard Templates and Actions + +=head1 DESCRIPTION As we saw in our Create-Read-Update-Delete (CRUD) example, Maypole does all it can to make your life diff --git a/lib/Maypole/Manual/View.pod b/lib/Maypole/Manual/View.pod index 01745ed..5477d05 100644 --- a/lib/Maypole/Manual/View.pod +++ b/lib/Maypole/Manual/View.pod @@ -1,4 +1,8 @@ -=head1 Maypole View Classes +=head1 NAME + +Maypole::Manual::View - Maypole View Classes + +=head1 DESCRIPTION In a large application, you will almost certainly want to customize the layout and design of the output pages. This task may even be the purview diff --git a/lib/Maypole/Manual/Workflow.pod b/lib/Maypole/Manual/Workflow.pod index d860523..0ab3267 100644 --- a/lib/Maypole/Manual/Workflow.pod +++ b/lib/Maypole/Manual/Workflow.pod @@ -1,6 +1,10 @@ =pod -=head1 Maypole's Request Workflow +=head1 NAME + +Maypole::Manual::Workflow - Maypole's Request Workflow + +=head1 DESCRIPTION This chapter describes the progress of a request through Maypole. @@ -154,4 +158,4 @@ Next L, Previous L - +=cut diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm index f687309..f7881a2 100644 --- a/lib/Maypole/View/Base.pm +++ b/lib/Maypole/View/Base.pm @@ -151,8 +151,8 @@ during view initialization. =head2 paths -Returns search paths for templates. the default method returns factory, custom -and EtablenameE under the configured template root. +Returns search paths for templates. the default method returns folders for the +model class's C, factory, custom under the configured template root. =head2 vars diff --git a/t/cgi_maypole.t b/t/cgi_maypole.t index 977201a..e179866 100644 --- a/t/cgi_maypole.t +++ b/t/cgi_maypole.t @@ -14,7 +14,8 @@ my $mock_maypole = new Test::MockModule('CGI::Maypole'); my $mock_cgi = new Test::MockModule('CGI::Simple'); $mock_cgi->mock(path_info => sub { delete $_[0]->{'.path_info'}; - goto $mock_cgi->original('path_info') + my $orig_path_info = $mock_cgi->original('path_info'); + goto $orig_path_info; }); # run() -- 2.39.5