use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode';
use File::Spec;
use JSON::MaybeXS;
+use Data::Dumper;
use Scalar::Util ();
# Test cases for incoming utf8
sub uri_for :Path('uri_for') {
my ($self, $c) = @_;
$c->response->content_type('text/html');
- $c->response->body("${\$c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥', {'♥'=>'♥♥'})}");
+ $c->response->body("${\$c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥#X♥X', {'♥'=>'♥♥'})}");
}
sub heart_with_arg :Path('a♥') Args(1) {
sub write_then_body :Local {
my ($self, $c) = @_;
- $c->clear_encoding;
- $c->res->content_type('text/plain');
+
+ $c->res->content_type('text/html');
$c->res->write("<p>This is early_write action ♥</p>");
$c->res->body("<p>This is body_write action ♥</p>");
}
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};
Test::More::is $upload->charset, 'UTF-8';
$c->response->body($decoded_text);
}
+ sub file_upload_utf8_param :POST Consumes(Multipart) Local {
+ my ($self, $c) = @_;
+
+ Test::More::is $c->req->body_parameters->{'♥'}, '♥♥';
+ Test::More::ok my $upload = $c->req->uploads->{'♥'};
+ Test::More::is $upload->charset, 'UTF-8';
+
+ my $text = $upload->slurp;
+ Test::More::is Encode::decode_utf8($text), "<p>This is stream_body_fh action ♥</p>\n";
+
+ my $decoded_text = $upload->decoded_slurp;
+ Test::More::is $decoded_text, "<p>This is stream_body_fh action ♥</p>\n";
+
+ Test::More::is $upload->filename, '♥ttachment.txt';
+ Test::More::is $upload->raw_basename, '♥ttachment.txt';
+
+ $c->response->content_type('text/html');
+ $c->response->body($decoded_text);
+ }
+
sub json :POST Consumes(JSON) Local {
my ($self, $c) = @_;
my $post = $c->req->body_data;
$c->response->body($c->req->body_parameters->{arg});
}
+ sub echo_param :Local {
+ my ($self, $c) = @_;
+ $c->response->content_type('text/plain');
+ $c->response->body($c->req->query_parameters->{arg});
+ }
+
+
package MyApp;
use Catalyst;
{
my ($res, $c) = ctx_request "/root/uri_for";
- my $url = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥', {'♥'=>'♥♥'});
+ my $url = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥#X♥X', {'♥'=>'♥♥'});
is $res->code, 200, 'OK';
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_length, 104, 'correct length';
is $res->content_charset, 'UTF-8';
{
}
{
+ ok my $path = File::Spec->catfile('t', 'utf8.txt');
+ ok my $req = POST '/root/file_upload_utf8_param',
+ Content_Type => 'form-data',
+ Content => [encode_utf8('♥')=>encode_utf8('♥♥'), encode_utf8('♥')=>["$path", encode_utf8('♥ttachment.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
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';
+ is $c->req->body_parameters->{'arg1'}, $utf8, 'decoded utf8 param';
+ is $c->req->body_parameters->{'arg2'}[0], $shiftjs, 'decoded shiftjs param';
+ is $c->req->body_parameters->{'arg2'}[1], $shiftjs, 'decoded shiftjs param';
+ is $c->req->body_parameters->{'♥♥♥'}, $shiftjs, 'decoded shiftjs param';
}
is $c->req->query_parameters->{'a'}, $shiftjs, 'got expected value';
}
+{
+ my $invalid = '%e2';
+ # in url
+ {
+ my $req = GET "/$invalid";
+ my $res = request $req;
+ is ($res->code, '400', "Invalid url param is 400");
+ }
+ # in body
+ {
+ my $req = POST "/root/echo_arg", Content => "arg0=$invalid";
+ my $res = request $req;
+ is ($res->code, '400', "Invalid post param is 400");
+ }
+ # in query
+ {
+ # failing since 5.90080
+ my $req = GET "/root/echo_param?arg=$invalid";
+ my $res = request $req;
+ is ($res->code, '400', "Invalid get param is 400") or diag Dumper($res->decoded_content);
+ }
+}
+
## should we use binmode on filehandles to force the encoding...?
## Not sure what else to do with multipart here, if docs are enough...