From: David Kamholz <dkamholz@cpan.org>
Date: Wed, 8 Feb 2006 20:42:11 +0000 (+0000)
Subject: fix ConfigLoader
X-Git-Tag: v0.04~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=468464b87cd7b26729ac5650e8616a445fb3ff49;hp=fcf9e2a0ba68c10589fcaf2be6ad7aad156ce8a4;p=catagits%2FCatalyst-Plugin-ConfigLoader.git

fix ConfigLoader
---

diff --git a/Build.PL b/Build.PL
index a8e80b1..461dbd9 100644
--- a/Build.PL
+++ b/Build.PL
@@ -10,7 +10,6 @@ my $build = Module::Build->new(
 	create_makefile_pl => 'traditional',
 	requires           => {
 		'Catalyst'    => 0,
-		'File::Slurp' => 0,
 		'Data::Visitor' => 0.02,
 	},
 );
diff --git a/Changes b/Changes
index 4c4c0f6..dcc1191 100644
--- a/Changes
+++ b/Changes
@@ -4,7 +4,7 @@ Revision history for Perl extension Catalyst::Plugin::ConfigLoader.
     - add finalize_config method
     - make default finalize_config traverse the config and substitute
       things beginning __HOME__/* with real path
-    - don't (re-)use File::Slurp, not sure how to eliminate warnings
+    - don't use File::Slurp, produces annoying warnings on some systems
 
 0.03  Mon Jan 30 2006
     - pod fixes
diff --git a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
index 3a187d1..a820535 100644
--- a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
@@ -3,8 +3,6 @@ package Catalyst::Plugin::ConfigLoader::JSON;
 use strict;
 use warnings;
 
-#use File::Slurp;    
-
 =head1 NAME
 
 Catalyst::Plugin::ConfigLoader::JSON - Load JSON config files
@@ -42,7 +40,10 @@ sub load {
     my $class = shift;
     my $file  = shift;
 
-    my $content = read_file( $file );
+    my $content;
+    open(my $fh, $file) or die $!;
+    { local $/; $content = <$fh> }
+    close $fh;
 
     eval { require JSON::Syck; };
     if( $@ ) {
diff --git a/lib/Catalyst/Plugin/ConfigLoader/YAML.pm b/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
index e16bce1..f1f6588 100644
--- a/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
@@ -3,8 +3,6 @@ package Catalyst::Plugin::ConfigLoader::YAML;
 use strict;
 use warnings;
 
-#use File::Slurp;
-
 =head1 NAME
 
 Catalyst::Plugin::ConfigLoader::YAML - Load YAML config files
@@ -46,7 +44,10 @@ sub load {
         return YAML::LoadFile( $file );
     }
     else {
-        my $content = read_file( $file );
+        my $content;
+        open(my $fh, $file) or die $!;
+        { local $/; $content = <$fh> }
+        close $fh;
         return YAML::Syck::Load( $content );
     }
 }