use Mojo::Util more

mojolicious · Nov 2, 2011 · 98cd58b · 98cd58b
1 parent 3597a41
commit 98cd58b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 38 deletions.
diff --git a/lib/Mojo/Path.pm b/lib/Mojo/Path.pm
@@ -5,7 +5,7 @@ use overload
   '""'     => sub { shift->to_string },
   fallback => 1;
 
-use Mojo::Util qw/url_escape url_unescape/;
+use Mojo::Util qw/encode url_escape url_unescape/;
 use Mojo::URL;
 
 has [qw/leading_slash trailing_slash/];
@@ -114,13 +114,10 @@ sub to_string {
   my $self = shift;
 
   # Escape
-  my @path;
-  for my $part (@{$self->parts}) {
-    my $escaped = $part;
-    utf8::encode $escaped;
-    push @path,
-      url_escape($escaped, "$Mojo::URL::UNRESERVED$Mojo::URL::SUBDELIM\:\@");
-  }
+  my @path = map {
+    url_escape(encode('UTF-8', $_),
+      "$Mojo::URL::UNRESERVED$Mojo::URL::SUBDELIM\:\@")
+  } @{$self->parts};
 
   # Format
   my $path = join '/', @path;

diff --git a/lib/Mojolicious/Command/get.pm b/lib/Mojolicious/Command/get.pm
@@ -6,7 +6,7 @@ use Mojo::DOM;
 use Mojo::IOLoop;
 use Mojo::Transaction::HTTP;
 use Mojo::UserAgent;
-use Mojo::Util 'decode';
+use Mojo::Util qw/decode encode/;
 
 has description => <<'EOF';
 Perform HTTP 1.1 request.
@@ -139,7 +139,7 @@ sub run {
 
   # Error
   my ($message, $code) = $tx->error;
-  utf8::encode $url;
+  $url = encode 'UTF-8', $url;
   warn qq/Problem loading URL "$url". ($message)\n/ if $message && !$code;
 
   # Charset
@@ -153,8 +153,7 @@ sub run {
 
 sub _say {
   return unless length(my $value = shift);
-  utf8::encode $value;
-  say $value;
+  say encode('UTF-8', $value);
 }
 
 sub _select {

diff --git a/lib/Mojolicious/Command/inflate.pm b/lib/Mojolicious/Command/inflate.pm
@@ -3,6 +3,7 @@ use Mojo::Base 'Mojo::Command';
 
 use Getopt::Long 'GetOptions';
 use Mojo::Loader;
+use Mojo::Util 'encode';
 
 has description => <<'EOF';
 Inflate embedded files to real files.
@@ -40,11 +41,9 @@ sub run {
   # Generate
   my $all = $self->get_all_data($class);
   for my $file (keys %$all) {
-    my $prefix  = $file =~ /\.\w+\.\w+$/ ? $templates : $public;
-    my $path    = $self->rel_file("$prefix/$file");
-    my $content = $all->{$file};
-    utf8::encode $content;
-    $self->write_file($path, $content);
+    my $prefix = $file =~ /\.\w+\.\w+$/ ? $templates : $public;
+    my $path = $self->rel_file("$prefix/$file");
+    $self->write_file($path, encode('UTF-8', $all->{$file}));
   }
 }
 

diff --git a/lib/Mojolicious/Plugin/EPLRenderer.pm b/lib/Mojolicious/Plugin/EPLRenderer.pm
@@ -2,7 +2,7 @@ package Mojolicious::Plugin::EPLRenderer;
 use Mojo::Base 'Mojolicious::Plugin';
 
 use Mojo::Template;
-use Mojo::Util 'md5_sum';
+use Mojo::Util qw/encode md5_sum/;
 
 # "Clever things make people feel stupid and unexpected things make them feel
 #  scared."
@@ -18,7 +18,7 @@ sub register {
       my $inline = $options->{inline};
       my $path   = $r->template_path($options);
       if (defined $inline) {
-        utf8::encode $inline;
+        $inline = encode('UTF-8', $inline);
         $path = md5_sum $inline;
       }
       return unless defined $path;

diff --git a/lib/Mojolicious/Plugin/EPRenderer.pm b/lib/Mojolicious/Plugin/EPRenderer.pm
@@ -3,7 +3,7 @@ use Mojo::Base 'Mojolicious::Plugin';
 
 use Mojo::Loader;
 use Mojo::Template;
-use Mojo::Util 'md5_sum';
+use Mojo::Util qw/encode md5_sum/;
 
 # "What do you want?
 #  I'm here to kick your ass!
@@ -31,8 +31,7 @@ sub register {
       # Generate name
       my $path = $r->template_path($options) || $options->{inline};
       return unless defined $path;
-      my $id = join ', ', $path, sort keys %{$c->stash};
-      utf8::encode $id;
+      my $id = encode 'UTF-8', join(', ', $path, sort keys %{$c->stash});
       my $key = $options->{cache} = md5_sum $id;
 
       # Cache

diff --git a/lib/Mojolicious/Plugin/JSONConfig.pm b/lib/Mojolicious/Plugin/JSONConfig.pm
@@ -3,6 +3,7 @@ use Mojo::Base 'Mojolicious::Plugin::Config';
 
 use Mojo::JSON;
 use Mojo::Template;
+use Mojo::Util 'encode';
 
 # "And so we say goodbye to our beloved pet, Nibbler, who's gone to a place
 #  where I, too, hope one day to go. The toilet."
@@ -44,12 +45,8 @@ sub render {
   $prepend .= q/use Mojo::Base -strict;/;
 
   # Render
-  my $mt = Mojo::Template->new($conf->{template} || {});
-  $mt->prepend($prepend);
-  $content = $mt->render($content, $app);
-  utf8::encode $content;
-
-  return $content;
+  my $mt = Mojo::Template->new($conf->{template} || {})->prepend($prepend);
+  return encode 'UTF-8', $mt->render($content, $app);
 }
 
 1;

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -4,7 +4,7 @@ use Mojo::Base -base;
 use Mojo::IOLoop;
 use Mojo::Message::Response;
 use Mojo::UserAgent;
-use Mojo::Util 'decode';
+use Mojo::Util qw/decode encode/;
 use Test::More ();
 
 has ua => sub { Mojo::UserAgent->new->ioloop(Mojo::IOLoop->singleton) };
@@ -231,9 +231,7 @@ sub post_form_ok {
 
   $self->tx($self->ua->post_form($url, @_));
   local $Test::Builder::Level = $Test::Builder::Level + 1;
-  my $desc = "post $url";
-  utf8::encode $desc;
-  Test::More::ok $self->tx->is_finished, $desc;
+  Test::More::ok $self->tx->is_finished, encode('UTF-8', "post $url");
 
   return $self;
 }
@@ -313,8 +311,6 @@ sub websocket_ok {
   my $self = shift;
   my $url  = shift;
 
-  my $desc = "websocket $url";
-  utf8::encode $desc;
   $self->{messages} = [];
   $self->{finished} = 0;
   $self->ua->websocket(
@@ -328,7 +324,8 @@ sub websocket_ok {
   );
   Mojo::IOLoop->start;
   local $Test::Builder::Level = $Test::Builder::Level + 1;
-  Test::More::ok $self->tx->res->code eq 101, $desc;
+  Test::More::ok $self->tx->res->code eq 101,
+    encode('UTF-8', "websocket $url");
 
   return $self;
 }
@@ -362,10 +359,8 @@ sub _request_ok {
   $self->tx($self->ua->$method($url, %$headers, $body));
   local $Test::Builder::Level = $Test::Builder::Level + 2;
   my ($error, $code) = $self->tx->error;
-  my $desc = "$method $url";
-  utf8::encode $desc;
   Test::More::diag $error if !(my $ok = !$error || $code) && $error;
-  Test::More::ok $ok, $desc;
+  Test::More::ok $ok, encode('UTF-8', "$method $url");
 
   return $self;
 }