Use File::Slurp, instead of our own home-grown version.

Requires adjustments to several of the tests, to normalize "end-of-line
at end-of-file", but we'll just `chomp()` those away.

Author: bleargh45

Build.PL

@@ -57,6 +57,9 @@ $build_pkg->new(
     'recommends'        => {
         'JavaScript::Minifier::XS' => 0,
         },
+    'test_requires' => {
+        'File::Slurp' => 0,
+    },
     # add configuration requirements both to build_requires and to META.yml,
     # until M::B supports "configure_requires" directly.
     'build_requires'    => { %configure_requires },

MANIFEST

@@ -23,7 +23,6 @@ t/htdocs/test.js
 t/htdocs/test.txt
 t/htdocs/minified.txt
 t/htdocs/minified-xs.txt
-t/MY/slurp.pm
 t/MY/CharsetHandler.pm
 t/MY/JSHandler.pm
 t/MY/NoCTypeHandler.pm

t/MY/CharsetHandler.pm

@@ -7,7 +7,7 @@ use Apache2::RequestRec qw();
 use Apache2::RequestUtil qw();
 use Apache2::Const -compile => qw(OK);
 use File::Spec::Functions qw(catfile);
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 sub handler {
     my $r = shift;

t/MY/JSHandler.pm

@@ -7,7 +7,7 @@ use Apache2::RequestRec qw();
 use Apache2::RequestUtil qw();
 use Apache2::Const -compile => qw(OK);
 use File::Spec::Functions qw(catfile);
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 sub handler {
     my $r = shift;

t/MY/NoCTypeHandler.pm

@@ -7,7 +7,7 @@ use Apache2::RequestRec qw();
 use Apache2::RequestUtil qw();
 use Apache2::Const -compile => qw(OK);
 use File::Spec::Functions qw(catfile);
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 sub handler {
     my $r = shift;

t/MY/PlainHandler.pm

@@ -7,7 +7,7 @@ use Apache2::RequestRec qw();
 use Apache2::RequestUtil qw();
 use Apache2::Const -compile => qw(OK);
 use File::Spec::Functions qw(catfile);
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 sub handler {
     my $r = shift;

t/MY/slurp.pm

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test "Content-Type" headers
 plan tests => 2, need_lwp;
@@ -13,7 +13,6 @@ plan tests => 2, need_lwp;
 charset_minified: {
     my $body = GET_BODY '/content-type/charset';
     my $min  = slurp( 't/htdocs/minified.txt' );
-    chomp($min);
 
     ok( t_cmp($body, $min) );
 }

t/content-type.t

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test non-JS responses still have other filters applied
 plan tests => 1, need_lwp;

t/decline.t

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test dynamically generated content
 plan tests => 2, need_lwp;
@@ -20,6 +20,5 @@ dynamic_unaltered: {
 dynamic_minified: {
     my $body = GET_BODY '/dynamic/js';
     my $min  = slurp( 't/htdocs/minified.txt' );
-    chomp($min);
     ok( t_cmp($body, $min) );
 }

t/dynamic.t

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test non-JS responses when we've supplemented MIME-Types list
 plan tests => 2, need_lwp;
@@ -13,7 +13,6 @@ plan tests => 2, need_lwp;
 single_mimetype: {
     my $body  = GET_BODY '/mimetypes/single';
     my $min   = slurp('t/htdocs/minified.txt');
-    chomp($min);
 
     ok( t_cmp($body, $min) );
 }
@@ -22,7 +21,6 @@ single_mimetype: {
 multiple_mimetypes: {
     my $body  = GET_BODY '/mimetypes/multiple';
     my $min   = slurp('t/htdocs/minified.txt');
-    chomp($min);
 
     ok( t_cmp($body, $min) );
 }

t/mime-types.t

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test minification with an explicitly specified minifier.
 plan tests => 2, need_lwp;
@@ -14,6 +14,7 @@ js_minifier: {
     my $body = GET_BODY '/explicit/pp';
     my $min  = slurp('t/htdocs/minified.txt');
     chomp($min);
+    chomp($body);
 
     ok( t_cmp($body, $min) );
 }
@@ -28,6 +29,7 @@ js_minifier_xs: {
         my $body = GET_BODY '/explicit/xs';
         my $min  = slurp('t/htdocs/minified-xs.txt');
         chomp($min);
+        chomp($body);
 
         ok( t_cmp($body, $min) );
     }

t/minifiers.t

@@ -5,7 +5,7 @@ use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp t_write_perl_script);
 use File::Spec::Functions qw(catfile);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test filtered mod_cgi output
 plan tests => 4, (need_lwp && need_cgi);
@@ -21,7 +21,7 @@ cgi_unaltered: {
     t_write_perl_script(
         catfile($svrroot, qw(cgi-bin plain.cgi)),
         qq{ use lib "$svrroot";
-            use MY::slurp;
+            use File::Slurp qw(slurp);
             print "Content-Type: text/plain\\n\\n";
             print slurp("$docroot/test.js");
         } );
@@ -41,7 +41,7 @@ cgi_minified: {
     t_write_perl_script(
         catfile($svrroot, qw(cgi-bin js.cgi)),
         qq{ use lib "$svrroot";
-            use MY::slurp;
+            use File::Slurp qw(slurp);
             print "Content-Type: text/javascript\\n\\n";
             print slurp("$docroot/test.js");
         } );
@@ -50,7 +50,6 @@ cgi_minified: {
     my $res  = GET '/cgi-bin/js.cgi';
     my $body = $res->content;
     my $min  = slurp('t/htdocs/minified.txt');
-    chomp($min);
 
     ok( $res->content_type eq 'text/javascript' );
     ok( t_cmp($body, $min) );

t/mod-cgi.t

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Make sure that non-JS files get passed through unaltered
 plan tests => 1, need_lwp;

t/non-js.t

@@ -1,4 +1,4 @@
-use MY::slurp;
+use File::Slurp qw(slurp);
 use File::Spec::Functions qw(catfile);
 my $r = shift;
 $r->content_type('text/javascript');

t/perl-bin/js.pl

@@ -1,4 +1,4 @@
-use MY::slurp;
+use File::Slurp qw(slurp);
 use File::Spec::Functions qw(catfile);
 my $r = shift;
 $r->content_type('text/plain');

t/perl-bin/plain.pl

@@ -4,7 +4,7 @@ use Apache::Test;
 use Apache::TestRequest;
 use Apache::TestUtil qw(t_cmp);
 use lib 't';
-use MY::slurp;
+use File::Slurp qw(slurp);
 
 # Test filtered ModPerl::Registry output
 plan tests => 4, need_lwp;
@@ -24,7 +24,6 @@ registry_minified: {
     my $res  = GET '/perl-bin/js.pl';
     my $body = $res->content;
     my $min  = slurp('t/htdocs/minified.txt');
-    chomp($min);
 
     ok( $res->content_type eq 'text/javascript' );
     ok( t_cmp($body, $min) );