Refactor to move out ->{ar} to Apache::MVC.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@80 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 0b1c87333838ce56fd0a679d6f9f036639c2f199..0f917752bf419cc0942a1cf91f65f7a27100ad56 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -27,6 +27,19 @@ sub parse_location {
     $self->{query}  = { $self->{ar}->args };
 }
 
+sub send_output {
+    my $r = shift;
+    $r->{ar}->content_type($r->{content_type});
+    $r->{ar}->headers_out->set("Content-Length" => length $r->{output});
+    $r->{ar}->send_http_header;
+    $r->{ar}->print($r->{output});
+}
+
+sub get_template_root {
+    my $r = shift;
+    $r->{ar}->document_root . "/". $r->{ar}->location;
+}
+
 1;
 
 =head1 NAME

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 9a86489b8127d7cbb0914409d88ca0a415948415..d5d932c4816a32c8e78c4650e6042ffc9b04f938 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -2,7 +2,6 @@ package Maypole;
 use base qw(Class::Accessor Class::Data::Inheritable);
 use attributes ();
 use UNIVERSAL::require;
-use Apache::Constants ":common";
 use strict;
 use warnings;
 our $VERSION = "1.1";
@@ -12,6 +11,11 @@ args action template ));
 __PACKAGE__->config({});
 __PACKAGE__->init_done(0);
 
+# Ape Apache::Constants interface
+use constant OK => 0;
+use constant DECLINED => -1;
+
+sub debug { 0 }
 
 sub setup {
     my $calling_class = shift;
@@ -56,6 +60,10 @@ sub handler {
     my $status = $r->is_applicable;
     if ($status == OK) { 
         $status = $r->call_authenticate;
+        if ($r->debug and $status != OK and $status != DECLINED) {
+            $r->view_object->error($r,
+                "Got unexpected status $status from calling authentication");
+        }
         return $status unless $status == OK;
         $r->additional_data();
     
@@ -67,25 +75,31 @@ sub handler {
         $r->{path} =~ s{/}{}; # De-absolutify
         $r->template($r->{path});
     }
-    return $r->view_object->process($r);
+    $status = OK;
+    if (!$r->{output}) { # You might want to do it yourself
+        $status = $r->view_object->process($r);
+    }
+    $r->send_output;
+    return $status;
 }
 
 sub is_applicable {
     my $self = shift;
     my $config = $self->config;
     $config->{ok_tables} = {map {$_ => 1} @{$config->{display_tables}}};
-    #warn "We don't have that table ($self->{table})"
-    #    unless $config->{ok_tables}{$self->{table}};
+    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}};
 
     # Does the action method exist?
     my $cv = $self->model_class->can($self->{action});
-    #warn "We don't have that action ($self->{action})" unless $cv;
+    warn "We don't have that action ($self->{action})" 
+        if $self->debug and not $cv;
     return DECLINED() unless $cv;
 
     # Is it exported?
     $self->{method_attribs} = join " ", attributes::get($cv);
-    do { # warn "$self->{action} not exported";
+    do { warn "$self->{action} not exported" if $self->debug;
     return DECLINED() 
      } unless $self->{method_attribs} =~ /\bExported\b/i;
     return OK();
@@ -219,14 +233,17 @@ 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.
 
-If you are implementing Maypole subclasses, you need to provide at least 
-the C<get_request> and C<parse_location> methods. See the
+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
+provide C<get_request> and C<get_template_root>. See the
 L<Maypole::Workflow> documentation for what these are expected to do.
 
 =cut
 
-sub get_request { die "Do not use Maypole directly; use Apache::MVC or similar" }
+sub get_template_root { "." }
+sub get_request { }
 sub parse_location { die "Do not use Maypole directly; use Apache::MVC or similar" }
+sub send_output{ die "Do not use Maypole directly; use Apache::MVC or similar" }
 
 =head1 AUTHOR
 

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index 47999a4692460dc5137c53bbdd8e3d3dd5e223e7..4bd7c0ebb836af2acd0817aba039b1da8b58b7e1 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -11,7 +11,8 @@ sub new { bless {}, shift } # Not worth having
 
 sub _tt {
     my ($self, $r) = @_;
-    my $root = $r->{ar}->document_root . "/". $r->{ar}->location;
+    # This bit sucks.
+    my $root = $r->{config}{template_root} || $r->get_template_root;
     Template->new({ INCLUDE_PATH => [
         $root,
         ($r->model_class && File::Spec->catdir($root, $r->model_class->moniker)),
@@ -62,10 +63,8 @@ sub process {
     $template->process($r->template, { $self->_args($r) }, \$output)
     || return $self->error($r, $template->error);
 
-    $r->{ar}->content_type("text/html");
-    $r->{ar}->headers_out->set("Content-Length" => length $output);
-    $r->{ar}->send_http_header;
-    $r->{ar}->print($output);
+    $r->{content_type} ||= "text/html";
+    $r->{output} = $output;
     return 200;
 }
 
@@ -73,8 +72,9 @@ sub error {
     my ($self, $r, $error) = @_;
     warn $error;
     if ($error =~ /not found$/) { return DECLINED }
-    $r->{ar}->send_http_header("text/plain");
-    $r->{ar}->print($error);
+    $r->{content_type} = "text/plain";
+    $r->{output} = $error;
+    $r->send_output;
     exit;
 }