improved handling of Pod::Simple::XHTML 3.09 dependency

mojolicious · Jul 27, 2014 · 021b944 · 021b944
1 parent e11921b
commit 021b944
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-5.21  2014-07-28
+5.21  2014-07-27
+  - Improved handling of Pod::Simple::XHTML 3.09 dependency.
   - Improved documentation browser CSS.
 
 5.20  2014-07-27

diff --git a/Makefile.PL b/Makefile.PL
@@ -5,14 +5,15 @@ use warnings;
 
 use ExtUtils::MakeMaker;
 
+# Pod::Simple 3.09 first shipped with Perl 5.11.2
 WriteMakefile(
   NAME         => 'Mojolicious',
   VERSION_FROM => 'lib/Mojolicious.pm',
   ABSTRACT     => 'Real-time web framework',
   AUTHOR       => 'Sebastian Riedel <sri@cpan.org>',
   LICENSE      => 'artistic_2',
   META_MERGE   => {
-    requires  => {perl => '5.010001'},
+    requires  => {perl => '5.010001', 'Pod::Simple' => '3.09'},
     resources => {
       homepage    => 'http://mojolicio.us',
       license     => 'http://www.opensource.org/licenses/artistic-license-2.0',

diff --git a/lib/Mojolicious/Plugin/PODRenderer.pm b/lib/Mojolicious/Plugin/PODRenderer.pm
@@ -6,15 +6,12 @@ use Mojo::ByteStream 'b';
 use Mojo::DOM;
 use Mojo::URL;
 use Mojo::Util qw(slurp unindent url_escape);
-use Pod::Simple::XHTML;
+use Pod::Simple::XHTML 3.09;
 use Pod::Simple::Search;
 
 sub register {
   my ($self, $app, $conf) = @_;
 
-  # Pod::Simple::XHTML in Perl 5.10.1 was broken
-  die 'Mojolicious::Plugin::PODRenderer requires Perl 5.12' if $] < 5.012;
-
   my $preprocess = $conf->{preprocess} || 'ep';
   $app->renderer->add_handler(
     $conf->{name} || 'pod' => sub {

diff --git a/t/mojolicious/pod_renderer_lite_app.t b/t/mojolicious/pod_renderer_lite_app.t
@@ -6,10 +6,6 @@ BEGIN {
 }
 
 use Test::More;
-
-plan skip_all => 'Mojolicious::Plugin::PODRenderer requires Perl 5.12'
-  if $] < 5.012;
-
 use Mojolicious::Lite;
 use Test::Mojo;
 

diff --git a/t/mojolicious/twinkle_lite_app.t b/t/mojolicious/twinkle_lite_app.t
@@ -6,10 +6,6 @@ BEGIN {
 }
 
 use Test::More;
-
-plan skip_all => 'Mojolicious::Plugin::PODRenderer requires Perl 5.12'
-  if $] < 5.012;
-
 use Mojolicious::Lite;
 use Mojo::Util;
 use Test::Mojo;