X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole.pm;h=ae2ae58cd1b7046f6eb58cbcbbfc5542a1a6677e;hb=fcef7418a2171a0a7fb8302285f56b0331ba1a4a;hp=4633b1f2a508f114d528d1eb03db3b65dedaa4cb;hpb=a183ff6bda2ae98ef8f4a4f979647052e0020dea;p=maypole.git

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 4633b1f..ae2ae58 100644
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -3,6 +3,7 @@ use base qw(Class::Accessor::Fast Class::Data::Inheritable);
 use UNIVERSAL::require;
 use strict;
 use warnings;
+use Data::Dumper;
 use Maypole::Config;
 use Maypole::Constants;
 use Maypole::Headers;
@@ -254,7 +255,7 @@ Some packages respond to higher debug levels, try increasing it to 2 or 3.
 
 =cut
 
-sub debug { 0 }
+sub debug { 1 }
 
 =item config
 
@@ -274,7 +275,7 @@ documentation. However here is the most usage of setup where
 Maypole::Model::CDBI is the base class.
 
  My::App->setup($data_source, $user, $password,
-       {  opitons => {  # These are DB connection options
+       {  options => {  # These are DB connection options
                AutoCommit => 0,
                RaiseError => 1,
                ...
@@ -444,8 +445,9 @@ sub handler : method  {
   # initialise the request
   $self->headers_out(Maypole::Headers->new);
   $self->get_request($req);
+
   $self->parse_location;
-    
+
   # hook useful for declining static requests e.g. images, or perhaps for 
   # sanitizing request parameters
   $self->status(Maypole::Constants::OK()); # set the default
@@ -459,6 +461,7 @@ sub handler : method  {
   $self->get_user;
     
   my $status = $self->handler_guts;
+
   return $status unless $status == OK;
 
   # TODO: require send_output to return a status code
@@ -558,17 +561,14 @@ sub handler_guts
     $self->__load_request_model;
 
     my $applicable = $self->is_model_applicable == OK;
-    
-    $self->__setup_plain_template unless $applicable;
 
     my $status;
 
+    # handle authentication
     eval { $status = $self->call_authenticate };
-    
     if ( my $error = $@ ) 
     {
         $status = $self->call_exception($error, "authentication");
-        
         if ( $status != OK ) 
         {
             warn "caught authenticate error: $error";
@@ -576,35 +576,33 @@ sub handler_guts
                     $self->view_object->error($self, $error) : ERROR;
         }
     }
-    
     if ( $self->debug and $status != OK and $status != DECLINED ) 
     {
         $self->view_object->error( $self,
             "Got unexpected status $status from calling authentication" );
     }
-    
+
     return $status unless $status == OK;
 
     # We run additional_data for every request
     $self->additional_data;
-    
-    if ($applicable) 
-    {
-        eval { $self->model_class->process($self) };
-        
-        if ( my $error = $@ ) 
+
+    if ($applicable) {
+      eval { $self->model_class->process($self) };
+      if ( my $error = $@ ) 
         {
-            $status = $self->call_exception($error, "model");
-            
-            if ( $status != OK ) 
+	  $status = $self->call_exception($error, "model");
+	  if ( $status != OK ) 
             {
-                warn "caught model error: $error";
-                return $self->debug ? 
-                    $self->view_object->error($self, $error) : ERROR;
+	      warn "caught model error: $error";
+	      return $self->debug ? 
+		$self->view_object->error($self, $error) : ERROR;
             }
         }
+    } else {
+      $self->__setup_plain_template;
     }
-    
+
     # less frequent path - perhaps output has been set to an error message
     return OK if $self->output;
 
@@ -614,6 +612,7 @@ sub handler_guts
     $self->{content_type}      ||= $self->__get_mime_type();
     $self->{document_encoding} ||= "utf-8";
 
+
     return $processed_view_ok;
 }
 
@@ -626,11 +625,14 @@ my %filetypes = (
 
 sub __get_mime_type {
   my $self = shift;
-  my $type;
+  my $type = 'text/html';
   if ($self->path =~ m/.*\.(\w{3,4})$/) {
     $type = $filetypes{$1};
   } else {
-    $type = $mmagic->checktype_contents($self->output);
+    my $output = $self->output;
+    if (defined $output) {
+      $type = $mmagic->checktype_contents($output);
+    }
   }
   return $type;
 }
@@ -647,7 +649,7 @@ sub __load_request_model
 sub __setup_plain_template
 {
     my ($self) = @_;
-    
+
     # It's just a plain template
     $self->model_class(undef);
     
@@ -660,27 +662,24 @@ sub __setup_plain_template
 
 # The model has been processed or skipped (if is_applicable returned false), 
 # any exceptions have been handled, and there's no content in $self->output
-sub __call_process_view
-{
-    my ($self) = @_;
-    
-    my $status;
-    
-    eval { $status = $self->view_object->process($self) };
-    
-    if ( my $error = $@ ) 
-    {
-        $status = $self->call_exception($error, "view");
-        
-        if ( $status != OK ) 
-        {
-            warn "caught view error: $error" if $self->debug;
-            return $self->debug ? 
-                $self->view_object->error($self, $error) : ERROR;
-        }
+sub __call_process_view {
+  my ($self) = @_;
+
+  my $status = eval { $self->view_object->process($self) };
+
+  my $error = $@ || $self->{error};
+
+  if ( $error ) {
+    $status = $self->call_exception($error, "view");
+
+    if ( $status != OK ) {
+      warn "caught view error: $error" if $self->debug;
+      return $self->debug ? 
+	$self->view_object->error($self, $error) : ERROR;
     }
-    
-    return $status;
+  }
+
+  return $status;
 }
 
 =item get_request
@@ -1437,8 +1436,7 @@ L<Maypole::Application>, L<Apache::MVC>, L<CGI::Maypole>.
 
 =head1 AUTHOR
 
-Maypole is currently maintained by Aaron Trevena, David Baird, Dave Howorth and
-Peter Speltz.
+Maypole is currently maintained by Aaron Trevena.
 
 =head1 AUTHOR EMERITUS