X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Futf_incoming.t;h=ff61a6bfedae526f8c6f22114170c3e0f4f095c7;hp=638cef5a1555ea2ab1830d0226494c86794e3187;hb=f176d1c8ec4d1b119ca573a9c2e2aa5fc3a3324d;hpb=70005e986f12f433f81595e35c902358487b7869 diff --git a/t/utf_incoming.t b/t/utf_incoming.t index 638cef5..ff61a6b 100644 --- a/t/utf_incoming.t +++ b/t/utf_incoming.t @@ -3,9 +3,11 @@ use warnings; use strict; use Test::More; use HTTP::Request::Common; -use Encode 2.21 'decode_utf8', 'encode_utf8'; +use HTTP::Message::PSGI (); +use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode'; use File::Spec; use JSON::MaybeXS; +use Scalar::Util (); # Test cases for incoming utf8 @@ -109,6 +111,14 @@ use JSON::MaybeXS; $c->response->body($contents); } + sub write_then_body :Local { + my ($self, $c) = @_; + + $c->res->content_type('text/html'); + $c->res->write("

This is early_write action ♥

"); + $c->res->body("

This is body_write action ♥

"); + } + sub file_upload :POST Consumes(Multipart) Local { my ($self, $c) = @_; Test::More::is $c->req->body_parameters->{'♥'}, '♥♥'; @@ -180,6 +190,18 @@ use JSON::MaybeXS; $c->response->write("

This is stream_write action ♥

"); } + sub from_external_psgi :Local { + my ($self, $c) = @_; + my $env = HTTP::Message::PSGI::req_to_psgi( HTTP::Request::Common::GET '/root/♥'); + $c->res->from_psgi_response( ref($c)->to_app->($env)); + } + + sub echo_arg :Local { + my ($self, $c) = @_; + $c->response->content_type('text/plain'); + $c->response->body($c->req->body_parameters->{arg}); + } + package MyApp; use Catalyst; @@ -351,6 +373,14 @@ use Catalyst::Test 'MyApp'; } { + my $res = request "/root/write_then_body"; + + is $res->code, 200, 'OK'; + is decode_utf8($res->content), "

This is early_write action ♥

This is body_write action ♥

"; + is $res->content_charset, 'UTF-8'; +} + +{ ok my $path = File::Spec->catfile('t', 'utf8.txt'); ok my $req = POST '/root/file_upload', Content_Type => 'form-data', @@ -368,7 +398,7 @@ use Catalyst::Test 'MyApp'; ok my $res = request $req; ## decode_json expect the binary utf8 string and does the decoded bit for us. - is_deeply decode_json(($res->content)), +{'♥'=>'♥♥'}; + is_deeply decode_json(($res->content)), +{'♥'=>'♥♥'}, 'JSON was decoded correctly'; } { @@ -379,7 +409,7 @@ use Catalyst::Test 'MyApp'; is $enc->decode($res->content), "テスト", 'correct body'; is $res->content_length, 6, 'correct length'; # Bytes over the wire is length($enc->decode($res->content)), 3; - is $res->content_charset, 'SHIFT_JIS'; + is $res->content_charset, 'SHIFT_JIS', 'content charset is SHIFT_JIS as expected'; } { @@ -401,7 +431,7 @@ SKIP: { is $res->code, 200, 'OK'; is decode_utf8($content), "manual_1 ♥", 'correct body'; - is $res->content_charset, 'UTF-8'; + is $res->content_charset, 'UTF-8', 'zlib charset is set correctly'; } { @@ -411,6 +441,69 @@ SKIP: { like decode_utf8($res->content), qr[

This is stream_write action ♥

code, 200, 'OK'; + is decode_utf8($res->content), '

This is path-heart action ♥

', 'correct body'; + is $res->content_length, 36, 'correct length'; + is $res->content_charset, 'UTF-8', 'external PSGI app has expected charset'; +} + +{ + my $utf8 = 'test ♥'; + my $shiftjs = 'test テスト'; + + ok my $req = POST '/root/echo_arg', + Content_Type => 'form-data', + Content => [ + arg0 => 'helloworld', + Encode::encode('UTF-8','♥') => Encode::encode('UTF-8','♥♥'), # Long form POST simple does not auto encode... + Encode::encode('UTF-8','♥♥♥') => [ + undef, '', + 'Content-Type' =>'text/plain; charset=SHIFT_JIS', + 'Content' => Encode::encode('SHIFT_JIS', $shiftjs)], + arg1 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=UTF-8', + 'Content' => Encode::encode('UTF-8', $utf8)], + arg2 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=SHIFT_JIS', + 'Content' => Encode::encode('SHIFT_JIS', $shiftjs)], + arg2 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=SHIFT_JIS', + 'Content' => Encode::encode('SHIFT_JIS', $shiftjs)], + ]; + + my ($res, $c) = ctx_request $req; + + is $c->req->body_parameters->{'arg0'}, 'helloworld', 'got helloworld value'; + is $c->req->body_parameters->{'♥'}, '♥♥'; + + ok Scalar::Util::blessed($c->req->body_parameters->{'arg1'}); + ok Scalar::Util::blessed($c->req->body_parameters->{'arg2'}[0]); + ok Scalar::Util::blessed($c->req->body_parameters->{'arg2'}[1]); + ok Scalar::Util::blessed($c->req->body_parameters->{'♥♥♥'}); + + # Since the form post is COMPLEX you are expected to decode it yourself. + is Encode::decode('UTF-8', $c->req->body_parameters->{'arg1'}->raw_data), $utf8, 'decoded utf8 param'; + is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'arg2'}[0]->raw_data), $shiftjs, 'decoded shiftjis param'; + is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'arg2'}[1]->raw_data), $shiftjs, 'decoded shiftjis param'; + is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'♥♥♥'}->raw_data), $shiftjs, 'decoded shiftjis param'; + +} + +{ + my $shiftjs = 'test テスト'; + my $encoded = Encode::encode('UTF-8', $shiftjs); + + ok my $req = GET "/root/echo_arg?a=$encoded"; + my ($res, $c) = ctx_request $req; + + is $c->req->query_parameters->{'a'}, $shiftjs, 'got expected value'; +} ## should we use binmode on filehandles to force the encoding...? ## Not sure what else to do with multipart here, if docs are enough...