Apache::MVC version fixed

[maypole.git] / lib / Apache / MVC.pm

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 3294df0490a32d579d0bc224f09be96efdc20056..203e39449af843943ab904dfb8609adc2afe88f8 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,14 +1,16 @@
 package Apache::MVC;
 
+our $VERSION = '2.03';
+
 use strict;
 use warnings;
 
 use base 'Maypole';
 use mod_perl;
 
-use constant APACHE2   => $mod_perl::VERSION >= 1.99;
+use constant APACHE2 => $mod_perl::VERSION >= 1.99;
 
-if ( APACHE2 ) {
+if (APACHE2) {
     require Apache2;
     require Apache::RequestRec;
     require Apache::RequestUtil;
@@ -17,8 +19,6 @@ if ( APACHE2 ) {
 else { require Apache }
 require Apache::Request;
 
-our $VERSION = "0.4";
-
 sub get_request {
     my ( $self, $r ) = @_;
     $self->{ar} = Apache::Request->new($r);
@@ -42,7 +42,10 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    $r->{ar}->content_type( $r->{content_type}."; charset=".$r->{document_encoding} );
+    $r->{ar}->content_type(
+        $r->{content_type}  =~ m/^text/ ?
+       $r->{content_type} . "; charset=" . $r->{document_encoding} :
+       $r->{content_type} );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
@@ -74,8 +77,8 @@ Apache::MVC - Apache front-end to Maypole
     package BeerDB;
     use base 'Apache::MVC';
     BeerDB->setup("dbi:mysql:beerdb");
-    BeerDB->config->{uri_base} = "http://your.site/";
-    BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+    BeerDB->config->uri_base("http://your.site/");
+    BeerDB->config->display_tables([qw[beer brewery pub style]]);
     # Now set up your database:
     # has-a relationships
     # untaint columns
@@ -152,6 +155,25 @@ C<delete> commands; for instance, a list of breweries, go to
 For more information about how the system works and how to extend it,
 see L<Maypole>.
 
+=head1 Implementation
+
+This class overrides a set of methods in the base Maypole class to provide it's
+functionality. See L<Maypole> for these:
+
+=over
+
+=item get_request
+
+=item get_template_root
+
+=item parse_args
+
+=item parse_location
+
+=item send_output
+
+=back
+
 =head1 AUTHOR
 
 Simon Cozens, C<simon@cpan.org>