fix up slurp idiom

diff --git a/lib/Catalyst/Plugin/ConfigLoader.pm b/lib/Catalyst/Plugin/ConfigLoader.pm
index 8047225..b75aa19 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader.pm
@@ -94,7 +94,7 @@ sub finalize_config {
     my $v = Data::Visitor::Callback->new(\r
         plain_value => sub { s[^__HOME__/(.+)$][ $c->path_to($1) ]e }\r
     );\r
-    $v->visit($c->config);\r
+    $v->visit( $c->config );\r
 }\r
 \r
 =head1 AUTHOR\r

diff --git a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
index a820535..2cdab4e 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
@@ -40,9 +40,8 @@ sub load {
     my $class = shift;\r
     my $file  = shift;\r
 \r
-    my $content;\r
-    open(my $fh, $file) or die $!;\r
-    { local $/; $content = <$fh> }\r
+    open( my $fh, $file ) or die $!;\r
+    my $content = do { local $/; $content = <$fh> };\r
     close $fh;\r
 \r
     eval { require JSON::Syck; };\r

diff --git a/lib/Catalyst/Plugin/ConfigLoader/YAML.pm b/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
index f1f6588..c096e9b 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/YAML.pm
@@ -44,9 +44,8 @@ sub load {
         return YAML::LoadFile( $file );\r
     }\r
     else {\r
-        my $content;\r
-        open(my $fh, $file) or die $!;\r
-        { local $/; $content = <$fh> }\r
+        open( my $fh, $file ) or die $!;\r
+        my $content = do { local $/; $content = <$fh> };\r
         close $fh;\r
         return YAML::Syck::Load( $content );\r
     }\r