X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=3164c0110ef8a25369a9dd19d1cd55c304439e18;hb=2c41363d0f5abf35c8d642db4b837f52f5954b2c;hp=fdc66298adf38c5db34cb02258197ff5a2e441dd;hpb=5f530b5f17106319faa2f437a567332c86bf6a2c;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index fdc6629..3164c01 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -3,23 +3,35 @@ use File::Spec;
 use UNIVERSAL::moniker;
 use strict;
 use Maypole::Constants;
+use Carp;
 
 sub new { bless {}, shift }    # By default, do nothing.
 
 sub paths {
     my ( $self, $r ) = @_;
     my $root = $r->config->template_root || $r->get_template_root;
-    return (
-        $root,
-        (
-            $r->model_class
-              && File::Spec->catdir( $root, $r->model_class->moniker )
-        ),
-        File::Spec->catdir( $root, "custom" ),
-        File::Spec->catdir( $root, "factory" )
-    );
+    if(ref($root) ne 'ARRAY') {
+	$root = [ $root ];
+    }
+    my @output = ();
+    foreach my $path (@$root) {
+	push(@output, $path);
+	push(@output,
+	     (
+              $r->model_class
+	      && File::Spec->catdir( $path, $r->model_class->table )
+	      )
+	     );
+	push(@output, File::Spec->catdir( $path, "custom" ));
+	push(@output, File::Spec->catdir( $path, "factory" ));
+    }
+
+    return @output;
 }
 
+
+
+
 sub vars {
     my ( $self, $r ) = @_;
     my $class = $r->model_class;
@@ -34,16 +46,17 @@ sub vars {
           # ...
     );
     if ($class) {
-        $args{classmetadata} = {
-            name              => $class,
-            table             => $class->table,
-            columns           => [ $class->display_columns ],
-            colnames          => { $class->column_names },
-            related_accessors => [ $class->related($r) ],
-            moniker           => $class->moniker,
-            plural            => $class->plural_moniker,
-            cgi               => { $class->to_cgi },
-        };
+        my $classmeta = $r->template_args->{classmetadata} ||= {};
+        $classmeta->{name}              ||= $class;
+        $classmeta->{table}             ||= $class->table;
+        $classmeta->{columns}           ||= [ $class->display_columns ];
+        $classmeta->{list_columns}      ||= [ $class->list_columns ];
+        $classmeta->{colnames}          ||= { $class->column_names };
+        $classmeta->{related_accessors} ||= [ $class->related($r) ];
+        $classmeta->{moniker}           ||= $class->moniker;
+        $classmeta->{plural}            ||= $class->plural_moniker;
+        $classmeta->{cgi}               ||= { $class->to_cgi };
+	$classmeta->{stringify_column}  ||= $class->stringify_column;
 
         # User-friendliness facility for custom template writers.
         if ( @{ $r->objects || [] } > 1 ) {
@@ -55,7 +68,7 @@ sub vars {
     }
 
     # Overrides
-    %args = ( %args, %{ $r->{template_args} || {} } );
+    %args = ( %args, %{ $r->template_args || {} } );
     %args;
 }
 
@@ -63,48 +76,101 @@ sub process {
     my ( $self, $r ) = @_;
     my $status = $self->template($r);
     return $self->error($r) if $status != OK;
-    $r->{content_type}      ||= "text/html";
-    $r->{document_encoding} ||= "utf-8";
     return OK;
 }
 
 sub error {
-    my ( $self, $r ) = @_;
-    warn $r->{error};
+    my ( $self, $r, $desc ) = @_;
+    $desc = $desc ? "$desc: " : "";
     if ( $r->{error} =~ /not found$/ ) {
-
+	warn "template not found error : ", $r->{error};
         # This is a rough test to see whether or not we're a template or
         # a static page
         return -1 unless @{ $r->{objects} || [] };
 
+	my $template_error = $r->{error};
         $r->{error} = <<EOF;
+<h1> Template not found </h1>
 
-<H1> Template not found </H1>
-
-This template was not found while processing the following request:
+A template was not found while processing the following request:
 
-<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
+<strong>@{[$r->{action}]}</strong> on table
+<strong>@{[ $r->{table} ]}</strong> with objects:
 
-<PRE>
+<pre>
 @{[join "\n", @{$r->{objects}}]}
-</PRE>
+</pre>
 
-Looking for template <B>@{[$r->{template}]}</B> in paths:
 
-<PRE>
+The main template is <strong>@{[$r->{template}]}</strong>.
+The template subsystem's error message was
+<pre>
+$template_error
+</pre>
+We looked in paths:
+
+<pre>
 @{[ join "\n", $self->paths($r) ]}
-</PRE>
+</pre>
 EOF
         $r->{content_type} = "text/html";
         $r->{output}       = $r->{error};
         return OK;
     }
-    $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!" }
 
 1;
+
+
+=head1 NAME
+
+Maypole::View::Base - Base class for view classes
+
+=head1 DESCRIPTION
+
+This is the base class for Maypole view classes. This is an abstract class
+that defines the interface, and can't be used directly.
+
+=head2 process
+
+This is the entry point for the view. It templates the request and returns a
+C<Maypole::Constant> indicate success or failure for the view phase.
+
+Anyone subclassing this for a different rendering mechanism needs to provide
+the following methods:
+
+=head2 template
+
+In this method you do the actual processing of your template. it should use
+L<paths> to search for components, and provide the templates with easy access
+to the contents of L<vars>. It should put the result in C<$r-E<gt>output> and
+return C<OK> if processing was sucessfull, or populate C<$r-E<gt>error> and
+return C<ERROR> if it fails.
+
+=head1 Other overrides
+
+Additionally, individual derived model classes may want to override the
+
+=head2 new
+
+The default constructor does nothing. You can override this to perform actions
+during view initialization.
+
+=head2 paths
+
+Returns search paths for templates. the default method returns folders for the
+model class's C<moniker>, factory, custom under the configured template root.
+
+=head2 vars
+
+returns a hash of data the template should have access to. The default one
+populates classmetadata if there is a table class, as well as setting the data
+objects by name if there is one or more objects available.
+
+=head2 error
+
+
+=cut