add support Mojolicious 4.0

Build.PL

@@ -12,11 +12,11 @@ my $builder = Module::Build->new(
 		'Test::More' => 0,
 	},
 	requires => {
-		'perl'           => 5.008007,
+		'perl'           => 5.001001,
 		'Encode'         => 0,
 		'MIME::Lite'     => 3.027,
 		'MIME::EncWords' => 0,
-		'Mojolicious'    => 1.17,
+		'Mojolicious'    => 4.0,
 	},
 	add_to_cleanup  => [],
 	meta_merge => {

Changes

@@ -1,5 +1,8 @@
 Revision history for Mojolicious-Plugin-Mail
 
+0.95  2013-05-23/01:09
+	* Mojolicious 4.0 ready
+
 0.94  2012-02-29/16:01
 	* small fixes
 

META.yml

@@ -21,14 +21,14 @@ name: Mojolicious-Plugin-Mail
 provides:
   Mojolicious::Plugin::Mail:
     file: lib/Mojolicious/Plugin/Mail.pm
-    version: 0.94
+    version: 0.95
 requires:
   Encode: 0
   MIME::EncWords: 0
   MIME::Lite: 3.027
-  Mojolicious: 1.17
-  perl: 5.008007
+  Mojolicious: 4
+  perl: 5.001001
 resources:
   license: http://dev.perl.org/licenses/
   repository: http://github.com/sharifulin/Mojolicious-Plugin-Mail
-version: 0.94
+version: 0.95

Makefile.PL

@@ -1,5 +1,5 @@
 # Note: this file was auto-generated by Module::Build::Compat version 0.3603
-require 5.008007;
+require 5.001001;
 use ExtUtils::MakeMaker;
 WriteMakefile
 (
@@ -12,7 +12,7 @@ WriteMakefile
                            'Test::More' => 0,
                            'MIME::EncWords' => 0,
                            'MIME::Lite' => '3.027',
-                           'Mojolicious' => '1.17',
+                           'Mojolicious' => '4',
                            'Encode' => 0
                          }
         )

README.pod

@@ -34,6 +34,7 @@ Mojolicious::Plugin::Mail - Mojolicious Plugin for send mail
 =head1 DESCRIPTION
 
 L<Mojolicous::Plugin::Mail> is a plugin for Mojolicious apps to send mail using L<MIME::Lite>.
+Mojolicious 4.0 ready.
 
 =head1 HELPERS
 

example/test.pl

@@ -15,7 +15,7 @@
 		data     => "Привет, это тестовое сообщение от Mojolicious::Plugin::Mail.\n\nРаботает!",
 	);
 
-	$self->render_text('OK');
+	$self->render(text => 'OK');
 };
 
 get '/render' => sub {

example/test_attach.pl

@@ -9,7 +9,7 @@
 	my $self = shift;
 
 	my $data = $self->render_mail(template => 'render');
-	my $att  = $self->render_partial('partial');
+	my $att  = $self->render('partial', partial => 1);
 
 	warn $self->mail(
 		mail => {

lib/Mojolicious/Plugin/Mail.pm

@@ -10,7 +10,7 @@ use constant FROM     => 'test-mail-plugin@mojolicio.us';
 use constant CHARSET  => 'UTF-8';
 use constant ENCODING => 'base64';
 
-our $VERSION = '0.94';
+our $VERSION = '0.95';
 
 has conf => sub { +{} };
 
@@ -32,7 +32,7 @@ sub register {
 			# simple interface
 			unless (exists $args->{mail}) {
 				$args->{mail}->{ $_->[1] } = delete $args->{ $_->[0] }
-					for grep { $args->{ $_->[0] } }
+					for grep $args->{ $_->[0] },
 						[to   => 'To'  ], [from => 'From'], [reply_to => 'Reply-To'],
 						[cc   => 'Cc'  ], [bcc  => 'Bcc' ], [subject  => 'Subject' ],
 						[data => 'Data'], [type => 'Type'],
@@ -54,17 +54,17 @@ sub register {
 			my $test = $args->{test} || TEST;
 			$msg->send( $conf->{'how'}, @{$conf->{'howargs'}||[]} ) unless $test;
 
-			return $msg->as_string;
+			$msg->as_string;
 		},
 	);
 
 	$app->helper(
 		render_mail => sub {
 			my $self = shift;
-			my $data = $self->render_partial(@_, format => 'mail');
+			my $data = $self->render(@_, format => 'mail', partial => 1);
 
-			delete @{$self->stash}{ qw(partial mojo.content mojo.rendered format) };
-			return $data;
+			delete @{$self->stash}{ qw(partial cb format mojo.captures mojo.started mojo.content mojo.routed mojo.secret) };
+			$data;
 		},
 	);
 }
@@ -82,19 +82,21 @@ sub build {
 
 	# tuning
 
-	$mail->{From} ||= $conf->{from};
-	$mail->{Type} ||= $conf->{type};
+	$mail->{From} ||= $conf->{from} || '';
+	$mail->{Type} ||= $conf->{type} || '';
 
 	if ($mail->{Data} && $mail->{Type} !~ /multipart/) {
 		$mail->{Encoding} ||= $encoding;
 		_enc($mail->{Data} => $charset);
 	}
 
 	if ($mimeword) {
-		$_ = MIME::EncWords::encode_mimeword($_, $encode, $charset) for grep { _enc($_ => $charset); 1 } $mail->{Subject};
+		$_ = MIME::EncWords::encode_mimeword($_, $encode, $charset)
+			for grep { _enc($_ => $charset); 1 } $mail->{Subject}
+		;
 
-		for (grep { $mail->{$_} } qw(From To Cc Bcc)) {
-			$mail->{$_} = join ",\n",
+		for (grep $mail->{$_}, qw(From To Cc Bcc)) {
+			$mail->{$_} = join ", ",
 				grep {
 					_enc($_ => $charset);
 					{
@@ -143,13 +145,13 @@ sub build {
 		@{$p->{attach} || []}
 	;
 
-	return $msg;
+	$msg;
 }
 
 sub _enc($$) {
 	my $charset = $_[1] || CHARSET;
 	$_[0] = b($_[0])->encode('UTF-8')->to_string if $_[0] && $charset && $charset =~ /utf-8/i;
-	return $_[0];
+	$_[0];
 }
 
 1;

t/mail.t

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-use lib qw(lib ../../lib);
+use lib qw(lib ../lib ../mojo/lib ../../mojo/lib);
 use utf8;
 
 BEGIN { $ENV{MOJO_NO_BONJOUR}++ };
@@ -17,7 +17,7 @@ plugin mail => {
 
 get '/empty' => sub {
 	my $self = shift;
-	$self->render_json({ ok => 1, mail => $self->mail || undef})
+	$self->render(json => { ok => 1, mail => $self->mail || undef})
 };
 
 get '/simple' => sub {
@@ -30,7 +30,7 @@ get '/simple' => sub {
 		data    => "<p>Привет!</p>",
 	);
 
-	$self->render_json({ ok => 1, mail => $mail });
+	$self->render(json => { ok => 1, mail => $mail });
 };
 
 get '/simple1' => sub {
@@ -45,7 +45,7 @@ get '/simple1' => sub {
 		},
 	);
 
-	$self->render_json({ ok => 1, mail => $mail });
+	$self->render(json => { ok => 1, mail => $mail });
 };
 
 get '/simple2' => sub {
@@ -64,7 +64,7 @@ get '/simple2' => sub {
 		},
 	);
 
-	$self->render_json({ ok => 1, mail => $mail });
+	$self->render(json => { ok => 1, mail => $mail });
 };
 
 get '/attach' => sub {
@@ -93,7 +93,7 @@ get '/attach' => sub {
 		headers => [ { 'X-My-Header' => 'Mojolicious' }, { 'X-Mailer' => 'My mail client' } ],
 	);
 
-	$self->render_json({ ok => 1, mail => $mail });
+	$self->render(json => { ok => 1, mail => $mail });
 };
 
 get '/multi' => sub {
@@ -126,7 +126,7 @@ get '/multi' => sub {
 		],
 	);
 
-	$self->render_json({ ok => 1, mail => $mail });
+	$self->render(json => { ok => 1, mail => $mail });
 };
 
 get '/render' => sub {
@@ -231,7 +231,7 @@ get '/render_simple_reply_to_plain' => sub {
 
 #
 
-use Test::More tests => 178;
+use Test::More;
 use Test::Mojo;
 
 use Mojo::Headers;
@@ -244,7 +244,7 @@ my $json;
 
 $t->get_ok('/empty')
   ->status_is(200)
-  ->json_content_is({ok => 1, mail => undef}, 'empty')
+  ->json_is({ok => 1, mail => undef}, 'empty')
 ;
 
 $json = $t->get_ok('/simple')
@@ -579,6 +579,8 @@ $d = $t->get_ok('/render_simple_reply_to_plain')
 	is $body, "CjxwPtCf0YDQuNCy0LXRgiBtYWlsIHJlbmRlcjIhPC9wPgo=\n", 'render_simple_reply_to_plain';
 }
 
+done_testing;
+
 __DATA__
 
 @@ render.html.ep
@@ -595,6 +597,6 @@ __DATA__
 <p><%== $mail %></p>
 
 @@ render2.mail.ep
-% stash 'subject' => 'Привет render2';
+% stash subject => 'Привет render2';
 
 <p>Привет mail render2!</p>