use strict;
use Test::More;
use HTTP::Request::Common;
+use Encode 2.21 'decode_utf8', 'encode_utf8';
+use File::Spec;
+use JSON::MaybeXS;
# Test cases for incoming utf8
$c->response->content_type('text/html');
my $writer = $c->res->write_fh;
+ $writer->write_encoded('<p>This is stream_write_fh action ♥</p>');
+ $writer->close;
+ }
+
+ # Stream a file with utf8 chars directly, you don't need to decode
+ sub stream_body_fh :Local {
+ my ($self, $c) = @_;
+ my $path = File::Spec->catfile('t', 'utf8.txt');
+ open(my $fh, '<', $path) || die "trouble: $!";
+ $c->response->content_type('text/html');
+ $c->response->body($fh);
+ }
+
+ # If you pull the file contents into a var, NOW you need to specify the
+ # IO encoding on the FH. Ultimately Plack at the end wants bytes...
+ sub stream_body_fh2 :Local {
+ my ($self, $c) = @_;
+ my $path = File::Spec->catfile('t', 'utf8.txt');
+ open(my $fh, '<:encoding(UTF-8)', $path) || die "trouble: $!";
+ my $contents = do { local $/; <$fh> };
+
+ $c->response->content_type('text/html');
+ $c->response->body($contents);
+ }
+
+ sub file_upload :POST Consumes(Multipart) Local {
+ my ($self, $c) = @_;
+ Test::More::is $c->req->body_parameters->{'♥'}, '♥♥';
+ Test::More::ok my $upload = $c->req->uploads->{file};
+
+ my $text = $upload->slurp;
+ Test::More::is Encode::decode_utf8($text), "<p>This is stream_body_fh action ♥</p>\n";
+
+ $c->response->content_type('text/html');
+ $c->response->body($upload->fh);
+ }
+
+ sub json :POST Consumes(JSON) Local {
+ my ($self, $c) = @_;
+ my $post = $c->req->body_data;
+
+ Test::More::is $post->{'♥'}, '♥♥';
+ $c->response->content_type('application/json');
- $writer->write("<p>This is stream_write_fh action ♥</p>");
- $writer->close("<p>This is stream_write_fh action ♥</p>");
+ # Encode JSON also encodes to a UTF-8 encoded, binary string. This is why we don't
+ # have application/json as one of the things we match, otherwise we get double
+ # encoding.
+ $c->response->body(JSON::MaybeXS::encode_json($post));
}
package MyApp;
use Catalyst;
- MyApp->config(encoding=>'UTF-8');
+ # Default encoding is now UTF-8
+ # MyApp->config(encoding=>'UTF-8');
Test::More::ok(MyApp->setup, 'setup app');
}
ok my $psgi = MyApp->psgi_app, 'build psgi app';
use Catalyst::Test 'MyApp';
-use Encode 2.21 'decode_utf8', 'encode_utf8';
{
my $res = request "/root/♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-heart action ♥</p>', 'correct body';
is $res->content_length, 36, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-heart-arg action ♥</p>', 'correct body';
is $res->content_length, 40, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-hat action ^</p>', 'correct body';
is $res->content_length, 32, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
is $res->content_length, 35, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
is $c->req->parameters->{'♥'}[0], '♥';
is $c->req->parameters->{a}, 1;
is $c->req->body_parameters->{a}, 1;
+ is $res->content_charset, 'UTF-8';
}
{
is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
is $res->content_length, 35, 'correct length';
is $c->req->query_keywords, '♥♥♥';
+ is $res->content_charset, 'UTF-8';
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
is $res->content_length, 39, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
is $res->content_length, 39, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
{
my ($res, $c) = ctx_request POST "/base/♥/♥/♥/♥?♥=♥♥", [a=>1, b=>'2', '♥'=>'♥♥'];
## Make sure that the urls we generate work the same
- my $uri_for = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥', {'♥'=>'♥♥'});
+ my $uri_for1 = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥', {'♥'=>'♥♥'});
+ my $uri_for2 = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥', '♥'], {'♥'=>'♥♥'});
my $uri = $c->req->uri;
- is "$uri", "$uri_for";
+ is "$uri_for1", "$uri_for2";
+ is "$uri", "$uri_for1";
{
- my ($res, $c) = ctx_request POST "$uri_for", [a=>1, b=>'2', '♥'=>'♥♥'];
+ my ($res, $c) = ctx_request POST "$uri_for1", [a=>1, b=>'2', '♥'=>'♥♥'];
is $c->req->query_parameters->{'♥'}, '♥♥';
is $c->req->body_parameters->{'♥'}, '♥♥';
is $c->req->parameters->{'♥'}[0], '♥♥'; #combined with query and body
+ is $res->content_charset, 'UTF-8';
}
}
is decode_utf8($res->content), "$url", 'correct body'; #should do nothing
is $res->content, "$url", 'correct body';
is $res->content_length, 90, 'correct length';
+ is $res->content_charset, 'UTF-8';
+
+ {
+ my $url = $c->uri_for($c->controller->action_for('heart_with_arg'), '♥');
+ is "$url", 'http://localhost/root/a%E2%99%A5/%E2%99%A5';
+ }
+
+ {
+ my $url = $c->uri_for($c->controller->action_for('heart_with_arg'), ['♥']);
+ is "$url", 'http://localhost/root/a%E2%99%A5/%E2%99%A5';
+ }
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is stream_write action ♥</p>', 'correct body';
+ is $res->content_charset, 'UTF-8';
+}
+
+{
+ my $res = request "/root/stream_body_fh";
+
+ is $res->code, 200, 'OK';
+ is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n", 'correct body';
+ is $res->content_charset, 'UTF-8';
+ # Not sure why there is a trailing newline above... its not in catalyst code I can see. Not sure
+ # if is a problem or just an artifact of the why the test stuff works - JNAP
}
{
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is stream_write_fh action ♥</p>', 'correct body';
+ #is $res->content_length, 41, 'correct length';
+ is $res->content_charset, 'UTF-8';
}
+{
+ my $res = request "/root/stream_body_fh2";
+
+ is $res->code, 200, 'OK';
+ is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n", 'correct body';
+ is $res->content_length, 41, 'correct length';
+ 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',
+ Content => [encode_utf8('♥')=>encode_utf8('♥♥'), file=>["$path", 'attachment.txt', 'Content-Type' =>'text/html; charset=UTF-8', ]];
+
+ ok my $res = request $req;
+ is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n";
+}
+
+{
+ ok my $req = POST '/root/json',
+ Content_Type => 'application/json',
+ Content => encode_json +{'♥'=>'♥♥'}; # Note: JSON does the UTF* encoding for us
+
+ 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)), +{'♥'=>'♥♥'};
+}
+
+## should we use binmode on filehandles to force the encoding...?
+## Not sure what else to do with multipart here, if docs are enough...
+
done_testing;
projects / catagits/Catalyst-Runtime.git / blobdiff