X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView%2FEmail.pm;h=f7605e8b3263cda0e6b2409be2d16ce1e64a82de;hb=5d205d68e1cd576075c734a6d9ce2a286cc0d607;hp=70991c2a41c701b05dae566ae5973383ed2fdbca;hpb=d8e2374d5ccae54eef343876e58f677ba033bf5e;p=catagits%2FCatalyst-View-Email.git

diff --git a/lib/Catalyst/View/Email.pm b/lib/Catalyst/View/Email.pm
index 70991c2..f7605e8 100644
--- a/lib/Catalyst/View/Email.pm
+++ b/lib/Catalyst/View/Email.pm
@@ -8,7 +8,8 @@ use Email::Sender::Simple qw/ sendmail /;
 use Email::MIME::Creator;
 extends 'Catalyst::View';
 
-our $VERSION = '0.13.01';
+our $VERSION = '0.28';
+$VERSION = eval $VERSION;
 
 has 'mailer' => (
     is      => 'rw',
@@ -17,6 +18,13 @@ has 'mailer' => (
     default => sub { "sendmail" }
 );
 
+has '_mailer_obj' => (
+    is      => 'rw',
+    isa     => 'Email::Sender::Transport',
+    lazy    => 1,
+    builder => '_build_mailer_obj',
+);
+
 has 'stash_key' => (
     is      => 'rw',
     isa     => 'Str',
@@ -40,9 +48,9 @@ has 'sender' => (
 
 has 'content_type' => (
     is      => 'rw',
-	isa     => 'Str',
-	default => sub { shift->default->{content_type} },
-	lazy    => 1,
+    isa     => 'Str',
+    default => sub { shift->default->{content_type} },
+    lazy    => 1,
 );
 
 =head1 NAME
@@ -83,10 +91,12 @@ In your app configuration:
                 charset => 'utf-8'
             },
             # Setup how to send the email
-            # all those options are passed directly to Email::Send
+            # all those options are passed directly to Email::Sender::Simple
             sender => {
+                # if mailer doesn't start with Email::Sender::Simple::Transport::,
+                # then this is prepended.
                 mailer => 'SMTP',
-                # mailer_args is passed directly into Email::Send 
+                # mailer_args is passed directly into Email::Sender::Simple 
                 mailer_args => {
                     Host     => 'smtp.example.com', # defaults to localhost
                     username => 'username',
@@ -98,7 +108,7 @@ In your app configuration:
 
 =head1 NOTE ON SMTP
 
-If you use SMTP and don't specify Host, it will default to localhost and
+If you use SMTP and don't specify host, it will default to localhost and
 attempt delivery. This often means an email will sit in a queue and
 not be delivered.
 
@@ -178,7 +188,7 @@ favourite template engine to render the mail body.
 
 =item new
 
-Validates the base config and creates the L<Email::Send> object for later use
+Validates the base config and creates the L<Email::Sender::Simple> object for later use
 by process.
 
 =cut
@@ -192,11 +202,25 @@ sub BUILD {
 
 }
 
+sub _build_mailer_obj {
+    my ($self) = @_;
+    my $transport_class = ucfirst $self->sender->{mailer};
+
+    # borrowed from Email::Sender::Simple -- apeiron, 2010-01-26
+    if ( $transport_class !~ /^Email::Sender::Transport::/ ) {
+        $transport_class = "Email::Sender::Transport::$transport_class";
+    }
+
+    Class::MOP::load_class($transport_class);
+
+    return $transport_class->new( $self->sender->{mailer_args} || {} );
+}
+
 =item process($c)
 
 The process method does the actual processing when the view is dispatched to.
 
-This method sets up the email parts and hands off to L<Email::Send> to handle
+This method sets up the email parts and hands off to L<Email::Sender::Simple> to handle
 the actual email delivery.
 
 =cut
@@ -205,7 +229,7 @@ sub process {
     my ( $self, $c ) = @_;
 
     croak "Unable to send mail, bad mail configuration"
-      unless $self->mailer;
+      unless $self->sender->{mailer};
 
     my $email = $c->stash->{ $self->stash_key };
     croak "Can't send email without a valid email structure"
@@ -259,7 +283,7 @@ sub process {
     my $message = $self->generate_message( $c, \%mime );
 
     if ($message) {
-        my $return = sendmail( $message, { transport => $self->mailer } );
+        my $return = sendmail( $message, { transport => $self->_mailer_obj } );
 
         # return is a Return::Value object, so this will stringify as the error
         # in the case of a failure.
@@ -330,21 +354,19 @@ sub generate_message {
     my ( $self, $c, $attr ) = @_;
 
     # setup the attributes (merge with defaultis)
-	$attr->{attributes} = $self->setup_attributes($c, $attr->{attributes});
-    return Email::Simple->create(
-        header => $attr->{header},
-        body   => $attr->{body}
-    );
+    $attr->{attributes} = $self->setup_attributes( $c, $attr->{attributes} );
+    Email::MIME->create( %$attr );
 }
 
 =back
 
+
 =head1 TROUBLESHOOTING
 
 As with most things computer related, things break.  Email even more so.  
 Typically any errors are going to come from using SMTP as your sending method,
 which means that if you are having trouble the first place to look is at
-L<Email::Send::SMTP>.  This module is just a wrapper for L<Email::Send>,
+L<Email::Sender::Transport::SMTP>.  This module is just a wrapper for L<Email::Sender::Simple>,
 so if you get an error on sending, it is likely from there anyway.
 
 If you are using SMTP and have troubles sending, whether it is authentication
@@ -385,6 +407,10 @@ Roman Filippov
 
 Lance Brown <lance@bearcircle.net>
 
+Devin Austin <dhoss@cpan.org>
+
+Chris Nehren <apeiron@cpan.org>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2007 - 2009