moved ar accessor to Apache::MVC - bug 14014

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

diff --git a/Changes b/Changes
index a559aa5dea90fc3577ef439e887e298884fe530f..e8706ad404372590f657d7028421ccd4d612a73c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@ For information about current developments and future releases, see:
     add() alias to push() in Mp::Headers (wishlist 14142)
     Fixed inheritance issues in Mp::Application - Mp::App now manipulates the caller's 
         @ISA directly, and doesn't inject itself into the chain (bugs 12923 & 14120)
+    Moved ar accessor to Apache::MVC (bug 14014)
 
 2.10 Tue 19 Jul 2005
     Multiple Template Paths added ( http://rt.cpan.org/NoAuth/Bug.html?id=13447 )

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 62afc950f4167080b85b68aa1bed456afa2b5766..c9d6a32c762e4c11dc19babf369df6904061a2dd 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -8,6 +8,8 @@ use warnings;
 use base 'Maypole';
 use Maypole::Headers;
 
+__PACKAGE__->mk_accessors( qw( ar ) );
+
 BEGIN {
     my $version;
     eval 'use mod_perl2; $version = $mod_perl2::VERSION; ';

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 7854caf42f02b4d297f70df6ea8be5f556b4afab..b060f15a50cf529bd4f408be38736ccc6df5af1a 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -11,7 +11,7 @@ our $VERSION = '2.10';
 
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors(
-    qw( ar params query objects model_class template_args output path
+    qw( params query objects model_class template_args output path
         args action template error document_encoding content_type table
         headers_in headers_out )
 );

diff --git a/t/apache_mvc.t b/t/apache_mvc.t
index 07bfae931f95da2405b407a4c18ad3c8de911ed2..e6a110047b69b79d1b519c3960d406955c9c0544 100644 (file)
--- a/t/apache_mvc.t
+++ b/t/apache_mvc.t
@@ -3,7 +3,7 @@ use strict;
 use Test::More;
 BEGIN {
     if (eval { require Apache::Request }) {
-        plan tests => 2;
+        plan tests => 3;
     } else {
         Test::More->import(skip_all =>"Apache::Request is not installed: $@");
     }
@@ -11,6 +11,7 @@ BEGIN {
 
 require_ok('Apache::MVC');
 ok($Apache::MVC::VERSION, 'defines $VERSION');
+ok(Apache::MVC->can('ar'), 'defines an "ar" accessor');
 # defines $VERSION
 # uses mod_perl
 # @ISA = 'Maypole'

diff --git a/t/maypole.t b/t/maypole.t
index 4c07d21b2834f0a044de9b6983beabadc0baa72f..63e7e6585c0a6f97c1c33adc9167c8271ab402ee 100755 (executable)
--- a/t/maypole.t
+++ b/t/maypole.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More tests => 108;
+use Test::More tests => 107;
 use Test::MockModule;
 
 # module compilation
@@ -23,7 +23,7 @@ ok(Maypole->can('init_done'), 'defines an init_done attribute');
 ok(! Maypole->init_done, '... which is false by default');
 ok(Maypole->can('view_object'), 'defines a view_object attribute');
 is(Maypole->view_object, undef, '... which is undefined');
-ok(Maypole->can('ar'), 'defines an "ar" accessor');
+#ok(Maypole->can('ar'), 'defines an "ar" accessor'); moved to Apache::MVC
 ok(Maypole->can('params'), 'defines a "params" accessor');
 ok(Maypole->can('query'), 'defines a "query" accessor');
 ok(Maypole->can('objects'), 'defines an "objects" accessor');