increased version number to 2.02

[maypole.git] / lib / Maypole.pm

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index b4e1d623ac3d2276127dd9fb16ef5c00adc2b3e2..802769378b508f554b06caf549658eca76e6cdcb 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -1,13 +1,12 @@
 package Maypole;
 use base qw(Class::Accessor::Fast Class::Data::Inheritable);
 package Maypole;
 use base qw(Class::Accessor::Fast Class::Data::Inheritable);

-use attributes ();

 use UNIVERSAL::require;
 use strict;
 use warnings;
 use Maypole::Config;
 use Maypole::Constants;
 
 use UNIVERSAL::require;
 use strict;
 use warnings;
 use Maypole::Config;
 use Maypole::Constants;
 

-our $VERSION = '2.0';
+our $VERSION = '2.02';

 
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors(
 
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors(


@@ -130,13 +129,16 @@ sub is_applicable {
     $config->ok_tables || $config->ok_tables( $config->display_tables );
     $config->ok_tables( { map { $_ => 1 } @{ $config->ok_tables } } )
       if ref $config->ok_tables eq "ARRAY";
     $config->ok_tables || $config->ok_tables( $config->display_tables );
     $config->ok_tables( { map { $_ => 1 } @{ $config->ok_tables } } )
       if ref $config->ok_tables eq "ARRAY";

-    warn "We don't have that table ($self->{table})"
+    warn "We don't have that table ($self->{table}).\n"
+      . "Available tables are: "
+      . join( ",", @{ $config->{display_tables} } )

       if $self->debug
       if $self->debug

-      and not $config->ok_tables->{ $self->{table} };
+      and not $config->ok_tables->{ $self->{table} }
+      and $self->{action};

     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?
     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?

-    return DECLINED unless $r->model_class->is_public( $r->{action} );
+    return DECLINED unless $self->model_class->is_public( $self->{action} );

     return OK();
 }
 
     return OK();
 }
 


@@ -301,6 +303,13 @@ You should only need to define this method if you are writing a new
 Maypole
 backend. Otherwise, see L<Maypole::Config/"template_root">
 
 Maypole
 backend. Otherwise, see L<Maypole::Config/"template_root">
 

+=head3 get_request
+
+You should only need to define this method if you are writing a new
+Maypole backend. It should return something that looks like an Apache
+or CGI request object, it defaults to blank.
+
+

 =head3 is_applicable
 
 Returns a Maypole::Constant to indicate whether the request is valid.
 =head3 is_applicable
 
 Returns a Maypole::Constant to indicate whether the request is valid.


@@ -385,6 +394,33 @@ Get/set the output content type. Default: text/html
 
 Sends the output and additional headers to the user.
 
 
 Sends the output and additional headers to the user.
 

+=head3 call_authenticate
+
+This method first checks if the relevant model class
+can authenticate the user, or falls back to the default
+authenticate method of your Maypole application.
+
+
+=head3 call_exception
+
+This model is called to catch exceptions, first after authenticate
+,then after processing the model class, and finally to check for
+exceptions from the view class.
+
+This method first checks if the relevant model class
+can handle exceptions the user, or falls back to the default
+exception method of your Maypole application.
+
+
+=head3 handler
+
+This method sets up the class if it's not done yet, sets some
+defaults and leaves the dirty work to handler_guts.
+
+=head3 handler_guts
+
+This is the core of maypole. You don't want to know.
+

 =head1 SEE ALSO
 
 There's more documentation, examples, and a wiki at the Maypole web
 =head1 SEE ALSO
 
 There's more documentation, examples, and a wiki at the Maypole web


@@ -394,17 +430,17 @@ http://maypole.perl.org/
 
 L<Maypole::Application>,L<Apache::MVC>, L<CGI::Maypole>.
 
 
 L<Maypole::Application>,L<Apache::MVC>, L<CGI::Maypole>.
 

-=head1 MAINTAINER
+=head1 AUTHOR

 
 Sebastian Riedel, c<sri@oook.de>
 
 
 Sebastian Riedel, c<sri@oook.de>
 

-=head1 AUTHOR
+=head1 AUTHOR EMERITUS

 
 Simon Cozens, C<simon@cpan.org>
 
 
 Simon Cozens, C<simon@cpan.org>
 

-=head1 THANK YOU
+=head1 THANKS TO

 
 

-Danijel Milicevic, Jesse Scheidlower, Jody Belka, Marcus Ramberg,
+Danijel Milicevic, Dave Slack, Jesse Sheidlower, Jody Belka, Marcus Ramberg,

 Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've
 helped.
 
 Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've
 helped.