Merge pull request #30 from cho45/fix-mojibake

Fix mojibake #29
ukigumo · Mar 17, 2014 · ae61d13 · ae61d13
2 parents 4674a11 + 3862bff
commit ae61d13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/Ukigumo/Server/Command/Report.pm b/lib/Ukigumo/Server/Command/Report.pm
@@ -250,7 +250,7 @@ sub find {
 sub _compress_text_data {
     my ($self, $row) = @_;
     c->config->{enable_compression} or return $row;
-    $row->{$_} = __compress(encode_utf8($row->{$_})) for qw(vc_log body);
+    $row->{$_} = __compress($row->{$_}) for qw(vc_log body);
     $row;
 }
 
@@ -262,7 +262,7 @@ sub _uncompress_text_data {
 }
 
 sub __compress {
-    my $bytes = Compress::Zlib::memGzip(\ $_[0]) ;
+    my $bytes = Compress::Zlib::memGzip(\ encode_utf8($_[0])) ;
     if (length($bytes) < length($_[0])) {
         return $bytes;
     }

diff --git a/t/03-compression.t b/t/03-compression.t
@@ -30,6 +30,8 @@ subtest "compress large data" => sub {
     my $report = Ukigumo::Server::Command::Report->find(report_id => $id);
     is $report->{body}, 'body' x 100;
     is $report->{vc_log}, 'vc_log' x 100;
+    ok utf8::is_utf8($report->{body});
+    ok utf8::is_utf8($report->{vc_log});
 };
 
 subtest "not compress small data" => sub {
@@ -39,17 +41,19 @@ subtest "not compress small data" => sub {
         project => 'MyProj',
         branch  => 'master',
         status  => 1,
-        body    => 'body',
-        vc_log  => 'vc_log',
+        body    => 'body あいやー',
+        vc_log  => 'vc_log そいやー',
     );
 
     my $row = $c->db->single('report', { report_id => $id })->get_columns;
-    is $row->{body}, 'body';
-    is $row->{vc_log}, 'vc_log';
+    is $row->{body}, 'body あいやー';
+    is $row->{vc_log}, 'vc_log そいやー';
 
     my $report = Ukigumo::Server::Command::Report->find(report_id => $id);
-    is $report->{body}, 'body';
-    is $report->{vc_log}, 'vc_log';
+    is $report->{body}, 'body あいやー';
+    is $report->{vc_log}, 'vc_log そいやー';
+    ok utf8::is_utf8($report->{body});
+    ok utf8::is_utf8($report->{vc_log});
 };
 
 subtest "enable_compression option is false" => sub {
@@ -70,6 +74,8 @@ subtest "enable_compression option is false" => sub {
     my $report = Ukigumo::Server::Command::Report->find(report_id => $id);
     is $report->{body}, 'body' x 100;
     is $report->{vc_log}, 'vc_log' x 100;
+    ok utf8::is_utf8($report->{body});
+    ok utf8::is_utf8($report->{vc_log});
 };
 
 subtest "multibytes" => sub {
@@ -90,6 +96,8 @@ subtest "multibytes" => sub {
     my $report = Ukigumo::Server::Command::Report->find(report_id => $id);
     is $report->{body}, 'あいやー' x 100;
     is $report->{vc_log}, 'そいやー' x 100;
+    ok utf8::is_utf8($report->{body});
+    ok utf8::is_utf8($report->{vc_log});
 };
 
 done_testing;