Add constants; refactor View classes and tests to use them; refactor out

handler_guts to allow subcomponent stuff.

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

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index eaff544adaabc56f61e8b4a45c6170a45ef5c9c3..37ca4318d32304a42977e1cb996c36eb0ea5152b 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -2,6 +2,7 @@ package Maypole::View::Base;
 use File::Spec;
 use UNIVERSAL::moniker;
 use strict;
+use Maypole::Constants;
 
 sub new { bless {}, shift } # By default, do nothing.
 
@@ -53,24 +54,12 @@ sub vars {
     %args;
 }
 
-sub do_it {
-    my ($self, $r) = @_;
-    my $template = Template->new({ INCLUDE_PATH => [ $self->paths($r) ]});
-    my $output;
-    if ($template->process($r->template, { $self->args($r) }, \$output)) {
-        $r->{output} = $output;
-        return 1;
-    } else { 
-         $r->{error} = $template->error;
-    }
-
-}
-
 sub process {
     my ($self, $r) = @_;
-    $self->template($r) || return $self->error($r);
+    my $status = $self->template($r);
+    return $self->error($r) if $status != OK;
     $r->{content_type} ||= "text/html";
-    return 200;
+    return OK;
 }
 
 sub error {
@@ -80,6 +69,7 @@ sub error {
     $r->{content_type} = "text/plain";
     $r->{output} = $r->{error};
     $r->send_output;
+    return ERROR;
 }
 
 sub template { die shift()." didn't define a decent template method!" }

diff --git a/lib/Maypole/View/Mason.pm b/lib/Maypole/View/Mason.pm
index 4d50bbdc0a04ca7cc7820af578555a39fe3cbc79..90b3b4ee8e7e57f8fca8007d029a6f7f58f917f5 100644 (file)
--- a/lib/Maypole/View/Mason.pm
+++ b/lib/Maypole/View/Mason.pm
@@ -1,6 +1,7 @@
 package Maypole::View::Mason;
 use base 'Maypole::View::Base';
 use HTML::Mason;
+use Maypole::Constants;
 
 sub template {
     my ($self, $r) = @_;
@@ -13,7 +14,7 @@ sub template {
     );
     $mason->exec($r->template, $self->vars($r))
     $r->{output} = $output;
-    return 1;
+    return OK;
 }
 
 1;

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index 15581e8a78cb1a40f2270952c14736391648dd54..0e8d89fbc1b2476f992c7aee9c57a1f7eafd3ea3 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -1,5 +1,6 @@
 package Maypole::View::TT;
 use base 'Maypole::View::Base';
+use Maypole::Constants;
 use Template;
 
 sub template {
@@ -8,10 +9,10 @@ sub template {
     my $output;
     if ($template->process($r->template, { $self->vars($r) }, \$output)) {
         $r->{output} = $output;
-        return 1;
+        return OK;
     } else {
         $r->{error} = $template->error;
-        return 0;
+        return ERROR;
     }
 }