package Maypole;
-use base qw(Class::Accessor Class::Data::Inheritable);
+use base qw(Class::Accessor::Fast Class::Data::Inheritable);
use attributes ();
use UNIVERSAL::require;
use strict;
use warnings;
-our $VERSION = "1.8";
+use Maypole::Config;
+our $VERSION = '2.0';
__PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
__PACKAGE__->mk_accessors(
- qw( ar params query objects model_class
- args action template )
+ qw( ar params query objects model_class template_args output path
+ args action template error document_encoding content_type table)
);
-__PACKAGE__->config( {} );
+__PACKAGE__->config( Maypole::Config->new() );
__PACKAGE__->init_done(0);
use Maypole::Constants;
sub { Maypole::handler( $calling_class, @_ ) };
}
my $config = $calling_class->config;
- $config->{model} ||= "Maypole::Model::CDBI";
- $config->{model}->require;
- die "Couldn't load the model class $config->{model}: $@" if $@;
- $config->{model}->setup_database( $config, $calling_class, @_ );
- for my $subclass ( @{ $config->{classes} } ) {
+ $config->model || $config->model("Maypole::Model::CDBI");
+ $config->model->require;
+ die "Couldn't load the model class $config->model: $@" if $@;
+ $config->model->setup_database( $config, $calling_class, @_ );
+ for my $subclass ( @{ $config->classes } ) {
no strict 'refs';
- unshift @{ $subclass . "::ISA" }, $config->{model};
- $config->{model}->adopt($subclass)
- if $config->{model}->can("adopt");
+ unshift @{ $subclass . "::ISA" }, $config->model;
+ $config->model->adopt($subclass)
+ if $config->model->can("adopt");
}
}
sub init {
my $class = shift;
my $config = $class->config;
- $config->{view} ||= "Maypole::View::TT";
- $config->{view}->require;
- die "Couldn't load the view class $config->{view}: $@" if $@;
- $config->{display_tables} ||= [ @{ $class->config->{tables} } ];
- $class->view_object( $class->config->{view}->new );
+ $config->view || $config->view("Maypole::View::TT");
+ $config->view->require;
+ die "Couldn't load the view class " . $config->view . ": $@" if $@;
+ $config->display_tables
+ || $config->display_tables( [ $class->config->tables ] );
+ $class->view_object( $class->config->view->new );
$class->init_done(1);
}
return $status;
}
+# The root of all evil
sub handler_guts {
my $r = shift;
- $r->model_class( $r->config->{model}->class_of( $r, $r->{table} ) );
+ $r->model_class( $r->config->model->class_of( $r, $r->{table} ) );
my $applicable = $r->is_applicable;
unless ( $applicable == OK ) {
}
# We authenticate every request, needed for proper session management
- my $status = $r->call_authenticate;
+ my $status;
+ eval { $status = $r->call_authenticate };
+ if ( my $error = $@ ) {
+ $status = $r->call_exception($error);
+ if ( $status != OK ) {
+ warn "caught authenticate error: $error";
+ return $r->debug ? $r->view_object->error( $r, $error ) : ERROR;
+ }
+ }
if ( $r->debug and $status != OK and $status != DECLINED ) {
$r->view_object->error( $r,
"Got unexpected status $status from calling authentication" );
}
}
if ( !$r->{output} ) { # You might want to do it yourself
- return $r->view_object->process($r);
+ eval { $status = $r->view_object->process($r) };
+ if ( my $error = $@ ) {
+ $status = $r->call_exception($error);
+ if ( $status != OK ) {
+ warn "caught view error: $error" if $r->debug;
+ return $r->debug ? $r->view_object->error( $r, $error ) : ERROR;
+ }
+ }
+ return $status;
}
else { return OK; }
}
sub is_applicable {
my $self = shift;
my $config = $self->config;
- $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})"
if $self->debug
- and not $config->{ok_tables}{ $self->{table} };
- return DECLINED() unless exists $config->{ok_tables}{ $self->{table} };
+ and not $config->ok_tables->{ $self->{table} };
+ return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
# Does the action method exist?
my $cv = $self->model_class->can( $self->{action} );
this:
package ProductDatabase;
- use base 'Apache::MVC';
+ use base 'Maypole::Application';
__PACKAGE__->set_database("dbi:mysql:products");
- ProductDatabase->config->{uri_base} = "http://your.site/catalogue/";
+ ProductDatabase->config->uri_base = "http://your.site/catalogue/";
ProductDatabase::Product->has_a("category" => ProductDatabase::Category);
# ...
Then your top-level application package should change the model class:
(Before calling C<setup>)
- ProductDatabase->config->{model} = "ProductDatabase::Model";
+ ProductDatabase->config->model("ProductDatabase::Model");
(The C<:Exported> attribute means that the method can be called via the
URL C</I<table>/supersearch/...>.)
class which does not specify how to communicate with the outside world.
The most popular subclass of Maypole is L<Apache::MVC>, which interfaces
the Maypole framework to Apache mod_perl; another important one is
-L<CGI::Maypole>.
+L<CGI::Maypole>. However, if you just don't care, use Maypole::Application,
+and it will choose the right one for you.
If you are implementing Maypole subclasses, you need to provide at least
the C<parse_location> and C<send_output> methods. You may also want to
http://maypole.simon-cozens.org/
-L<Apache::MVC>, L<CGI::Maypole>.
+L<Maypole::Application>,L<Apache::MVC>, L<CGI::Maypole>.
=head1 MAINTAINER
=head1 THANK YOU
-Jesse Scheidlower, Jody Belka, Markus Ramberg, Mickael Joanne, Simon Flack and all the others who've helped.
+Danijel Milicevic, Jesse Scheidlower, Jody Belka, Marcus Ramberg,
+Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've helped.
=head1 LICENSE