deprecated Mojo::Home->slurp_rel_file in favor of Mojo::Util->slurp

mojolicious · Jan 14, 2013 · c2f218e · c2f218e
1 parent 622e241
commit c2f218e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
   - Deprecated Mojo::Util->html_escape in favor of Mojo::Util->xml_escape.
   - Deprecated Mojo::ByteStream->html_escape in favor of
     Mojo::ByteStream->xml_escape.
+  - Deprecated Mojo::Home->slurp_rel_file in favor of Mojo::Util->slurp.
   - Improved documentation.
   - Fixed support for multi byte entities in Mojo::Util.
 

diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -80,7 +80,13 @@ sub parse {
 sub rel_dir { catdir(@{shift->{parts} || []}, split '/', shift) }
 sub rel_file { catfile(@{shift->{parts} || []}, split '/', shift) }
 
-sub slurp_rel_file { slurp shift->rel_file(@_) }
+# DEPRECATED in Rainbow!
+sub slurp_rel_file {
+  warn <<EOF;
+Mojo::Home->slurp_rel_file is DEPRECATED in favor of Mojo::Util->slurp!!!
+EOF
+  slurp shift->rel_file(@_);
+}
 
 sub to_string { catdir(@{shift->{parts} || []}) }
 
@@ -166,14 +172,6 @@ directory.
 
 Portably generate an absolute path for a file relative to the home directory.
 
-=head2 slurp_rel_file
-
-  my $content = $home->slurp_rel_file('foo/bar.html');
-
-Portably read all data at once from file relative to the home directory.
-
-  my $content = $home->slurp_rel_file($home->list_files('public')->[1]);
-
 =head2 to_string
 
   my $string = $home->to_string;

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -6,7 +6,7 @@ use Mojo::Cache;
 use Mojo::JSON;
 use Mojo::Home;
 use Mojo::Loader;
-use Mojo::Util 'encode';
+use Mojo::Util qw(encode slurp);
 
 has cache   => sub { Mojo::Cache->new };
 has classes => sub { ['main'] };
@@ -20,7 +20,7 @@ has paths => sub { [] };
 my $HOME = Mojo::Home->new;
 $HOME->parse(
   $HOME->parse($HOME->mojo_lib_dir)->rel_dir('Mojolicious/templates'));
-my %TEMPLATES = map { $_ => $HOME->slurp_rel_file($_) } @{$HOME->list_files};
+my %TEMPLATES = map { $_ => slurp $HOME->rel_file($_) } @{$HOME->list_files};
 
 sub new {
   my $self = shift->SUPER::new(@_);

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -56,12 +56,4 @@ is first(sub {/Base2\.pm$/}, @{$home->list_files('lib')}),
 is first(sub {/Base3\.pm$/}, @{$home->list_files('lib')}),
   'Mojo/BaseTest/Base3.pm', 'right result';
 
-# Slurp files
-like $home->slurp_rel_file('lib/Mojo/BaseTest/Base1.pm'), qr/Base1/,
-  'right content';
-like $home->slurp_rel_file('lib/Mojo/BaseTest/Base2.pm'), qr/Base2/,
-  'right content';
-like $home->slurp_rel_file('lib/Mojo/BaseTest/Base3.pm'), qr/Base3/,
-  'right content';
-
 done_testing();
diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -8,7 +8,7 @@ plan skip_all => 'Test::Pod::Coverage 1.04 required for this test!'
   unless eval 'use Test::Pod::Coverage 1.04; 1';
 
 # DEPRECATED in Rainbow!
-my @rainbow = qw(html_escape namespace start);
+my @rainbow = qw(html_escape namespace slurp_rel_file start);
 
 # False positive constants
 all_pod_coverage_ok({also_private => [@rainbow, qw(IPV6 TLS)]});