made ::View::TT and ::Mason hard deps. patches welcome if you no likey.

diff --git a/Changes b/Changes
index df05564..c0206f5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension Catalyst::View::Email.
 
+0.26    2010-03-23
+        - made ::View::TT and ::View::Mason hard deps
+        - adjusted tests to reflect the aforementioned
+        - patches welcome
+
 0.25_02 2010-02-21
         - cleaned up tests
         - made Test::More 0.88 a prereq

diff --git a/Makefile.PL b/Makefile.PL
index 6b44a23..e8fb322 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,9 +1,9 @@
 use inc::Module::Install 0.91;
 
-name     'Catalyst-View-Email';
+name 'Catalyst-View-Email';
 all_from 'lib/Catalyst/View/Email.pm';
-author   'J. Shirley <jshirley@gmail.com>';
-license  'perl';
+author 'J. Shirley <jshirley@gmail.com>';
+license 'perl';
 
 test_requires 'Test::More';
 
@@ -16,14 +16,9 @@ requires 'Email::Sender::Simple' => '0.100110';
 requires 'Email::MIME'           => '1.859';
 requires 'Email::MIME::Creator'  => '1.455';
 requires 'Test::More'            => '0.88';
-
-feature 'Template Toolkit support',
-    -default                => 0,
-    'Catalyst::View::TT'    => '0.31';
-
-feature 'HTML::Mason support',
-    -default                => 0,
-    'Catalyst::View::Mason' => '0.18';
+## patches welcome if you don't want these installed.  I'm not maintaining a dist with optional deps.
+requires 'Catalyst::View::TT'    => '0.31';
+requires 'Catalyst::View::Mason' => '0.18';
 
 # Rebuild README for maintainers
 if ($Module::Install::AUTHOR) {
@@ -32,10 +27,12 @@ if ($Module::Install::AUTHOR) {
 
 realclean_files 'README';
 
-resources 'IRC'         => 'irc://irc.perl.org/#catalyst';
-resources 'license'     => 'http://dev.perl.org/licenses/';
-resources 'repository'  => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-View-Email/';
-resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst';
+resources 'IRC'     => 'irc://irc.perl.org/#catalyst';
+resources 'license' => 'http://dev.perl.org/licenses/';
+resources 'repository' =>
+  'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-View-Email/';
+resources 'MailingList' =>
+  'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst';
 
 auto_provides;
 auto_install;

diff --git a/lib/Catalyst/View/Email.pm b/lib/Catalyst/View/Email.pm
index 730e78e..768bd93 100644 (file)
--- a/lib/Catalyst/View/Email.pm
+++ b/lib/Catalyst/View/Email.pm
@@ -8,7 +8,7 @@ use Email::Sender::Simple qw/ sendmail /;
 use Email::MIME::Creator;
 extends 'Catalyst::View';
 
-our $VERSION = '0.26_01';
+our $VERSION = '0.26';
 $VERSION = eval $VERSION;
 
 has 'mailer' => (

diff --git a/lib/Catalyst/View/Email/Template.pm b/lib/Catalyst/View/Email/Template.pm
index 3a9947e..e1246bb 100644 (file)
--- a/lib/Catalyst/View/Email/Template.pm
+++ b/lib/Catalyst/View/Email/Template.pm
@@ -5,7 +5,7 @@ use Carp;
 use Scalar::Util qw/ blessed /;
 extends 'Catalyst::View::Email';
 
-our $VERSION = '0.26_01';
+our $VERSION = '0.26';
 $VERSION = eval $VERSION;
 =head1 NAME
 

diff --git a/t/05template.t b/t/05template.t
index 7b26c3e..38d8ae3 100644 (file)
--- a/t/05template.t
+++ b/t/05template.t
@@ -8,11 +8,6 @@ use Email::Sender::Simple;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
-eval "use Catalyst::View::TT";
-if ( $@ ) {
-    plan skip_all => 'Catalyst::View::TT required for Template tests';
-}
-
 use_ok('Catalyst::Test', 'TestApp');
 
 my $response;