X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=95e3dd3f131b4a3791348cd636e8ba88b2f0ffac;hb=fa685ce517bd35c12ed6681803d9d0d6b1793159;hp=f567badb87ceaf00c650ca6f10b9b8d99b2d8074;hpb=feefb416b3c1aafdea07aa47378d007ee760e9f9;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index f567bad..95e3dd3 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -2,12 +2,15 @@ package Apache::MVC;
 use base qw(Class::Accessor Class::Data::Inheritable);
 use attributes ();
 use Class::DBI::Loader;
+use UNIVERSAL::require;
+use Apache::Constants ":common";
 use strict;
 use warnings;
 our $VERSION = "1.0";
 
 __PACKAGE__->mk_classdata($_) for qw( _config init_done view_object );
-__PACKAGE__->mk_accessors ( qw( config ar params objects model_class args ));
+__PACKAGE__->mk_accessors ( qw( config ar params objects model_class
+args action template ));
 __PACKAGE__->config({});
 __PACKAGE__->init_done(0);
 
@@ -33,13 +36,16 @@ sub init {
     my $config = $class->config;
     $config->{model} ||= "Apache::MVC::Model::CDBI";
     $config->{view}  ||= "Apache::MVC::View::TT";
+    $config->{model}->require;
+    $config->{view}->require;
     $config->{classes} = [ $class->config->{loader}->classes ];
     $config->{display_tables} ||= [ $class->config->{loader}->tables ];
-    for my $class (@{$config->{classes}}) {
+    for my $subclass (@{$config->{classes}}) {
         no strict 'refs';
-        push @{$class."::ISA"}, $class->config->{model};
+        push @{$subclass."::ISA"}, $class->config->{model};
     }
     $class->view_object($class->config->{view}->new);
+    $class->init_done(1);
 
 }
 
@@ -50,19 +56,21 @@ sub class_of {
 
 sub handler {
     # See Apache::MVC::Workflow before trying to understand this.
-    my $class = (caller(0))[0];
+    # XXX This needs to work with Apache without method handlers
+    my $class = shift;
     $class->init unless $class->init_done;
     my $r = bless { config => $class->config }, $class;
     $r->get_request();
     $r->parse_location();
     $r->model_class($r->class_of($r->{table}));
     my $status = $r->is_applicable;
-    return $status unless $status == 200;
+    return $status unless $status == OK;
     $status = $r->call_authenticate;
-    return $status unless $status == 200;
-    $r->find_objects();
+    return $status unless $status == OK;
     $r->additional_data();
-    $r->class->process($r);
+    $r->model_class->process($r);
+    $r->view_object->process($r);
+    return $r; # For debugging.
 }
 
 sub get_request {
@@ -78,14 +86,14 @@ sub parse_location {
     $self->{table} = shift @pi;
     $self->{action} = shift @pi;
     $self->{args} = \@pi;
+
+    $self->{params} = $self->{ar}->content;
 }
 
 sub is_applicable {
     my $self = shift;
-    require Apache::Constants;
-    Apache::Constants->import(":common");
     my $config = $self->config;
-    my %ok = map {$_ => 1} @{$config->{displaying_tables}};
+    my %ok = map {$_ => 1} @{$config->{display_tables}};
     return DECLINED() unless exists $ok{$self->{table}};
 
     # Does the action method exist?
@@ -95,14 +103,19 @@ sub is_applicable {
     # Is it exported?
     $self->{method_attribs} = join " ", attributes::get($cv);
     return DECLINED() 
-     unless $self->{method_attribs} =~ /\b(Exported|Class|Single|Multiple)\b/i;
+     unless $self->{method_attribs} =~ /\bExported\b/i;
     return OK();
 }
 
-sub find_objects {
-    # First, how many arguments are we?
+sub call_authenticate {
+    my $self = shift;
+    return $self->model_class->authenticate($self) if 
+        $self->model_class->can("authenticate");
+    return $self->authenticate();
 }
 
-sub authenticate { return 200 }
+sub additional_data {}
+
+sub authenticate { return OK }
 
 1;