remove Mojolicious::Plugin::Charset

mojolicious · Jun 22, 2016 · 503dec9 · 503dec9 · s1037989 · Jun 22, 2016
1 parent 74ff057
commit 503dec9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 76 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 
 7.0  2016-06-22
   - Code name "Nerd Face", this is a major release.
+  - Removed Mojolicious::Plugin::Charset.
   - Removed squish method from Mojo::ByteStream.
   - Removed squish function from Mojo::Util.
   - Removed support for smart whitespace trimming from all_text and text methods

diff --git a/lib/Mojolicious/Guides.pod b/lib/Mojolicious/Guides.pod
@@ -397,8 +397,6 @@ This is the class hierarchy of the L<Mojolicious> distribution.
 
 =over 2
 
-=item * L<Mojolicious::Plugin::Charset>
-
 =item * L<Mojolicious::Plugin::Config>
 
 =over 2

diff --git a/lib/Mojolicious/Plugin/Charset.pm b/lib/Mojolicious/Plugin/Charset.pm
diff --git a/lib/Mojolicious/Plugins.pm b/lib/Mojolicious/Plugins.pm
@@ -78,10 +78,6 @@ examples.
 
 =over 2
 
-=item L<Mojolicious::Plugin::Charset>
-
-Change the application charset.
-
 =item L<Mojolicious::Plugin::Config>
 
 Perl-ish configuration files.

diff --git a/t/mojolicious/charset_lite_app.t b/t/mojolicious/charset_lite_app.t
@@ -10,8 +10,13 @@ use Test::Mojo;
 my $yatta      = 'やった';
 my $yatta_sjis = b($yatta)->encode('shift_jis')->to_string;
 
-# Charset plugin
-plugin Charset => {charset => 'Shift_JIS'};
+app->types->type(html => 'text/html;charset=Shift_JIS');
+app->renderer->encoding('Shift_JIS');
+app->hook(
+  before_dispatch => sub {
+    shift->req->default_charset('Shift_JIS')->url->query->charset('Shift_JIS');
+  }
+);
 
 # UTF-8 text renderer
 app->renderer->add_handler(