a little cleanup before a dev release

[p5sagit/Config-Any.git] / lib / Config / Any.pm

diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm
index 708936a..d1a3b0e 100644 (file)
--- a/lib/Config/Any.pm
+++ b/lib/Config/Any.pm
@@ -14,7 +14,7 @@ Config::Any - Load configuration from different file formats, transparently
 
 =head1 VERSION
 
-This document describes Config::Any version 0.09
+This document describes Config::Any version 0.09_01
 
 =head1 SYNOPSIS
 
@@ -133,19 +133,20 @@ sub _load {
     my ( $class, $args ) = @_;
     croak "_load requires a arrayref of file paths" unless $args->{ files };
 
-    if( !defined $args->{ use_ext } ) {
-        warn "use_ext argument was not explicitly set, as of 0.09, this is true by default";
+    my $force = defined $args->{ force_plugins };
+    if ( !$force and !defined $args->{ use_ext } ) {
+        warn
+            "use_ext argument was not explicitly set, as of 0.09, this is true by default";
         $args->{ use_ext } = 1;
     }
 
     # figure out what plugins we're using
-    my $force   = defined $args->{ force_plugins };
     my @plugins = $force ? @{ $args->{ force_plugins } } : $class->plugins;
 
     # map extensions if we have to
-    my( %extension_lut, $extension_re );
+    my ( %extension_lut, $extension_re );
     my $use_ext_lut = !$force && $args->{ use_ext };
-    if( $use_ext_lut ) {
+    if ( $use_ext_lut ) {
         for my $plugin ( @plugins ) {
             $extension_lut{ $_ } = $plugin for $plugin->extensions;
         }
@@ -164,19 +165,22 @@ sub _load {
     my @results;
 
     for my $filename ( @{ $args->{ files } } ) {
+
         # don't even bother if it's not there
         next unless -f $filename;
 
         my @try_plugins = @plugins;
 
-        if( $use_ext_lut ) {
+        if ( $use_ext_lut ) {
             $filename =~ m{\.($extension_re)\z};
             next unless $1;
             @try_plugins = $extension_lut{ $1 };
         }
 
         for my $loader ( @try_plugins ) {
-            my @configs = eval { $loader->load( $filename, $loader_args{ $loader } ); };
+            next unless $loader->is_supported;
+            my @configs
+                = eval { $loader->load( $filename, $loader_args{ $loader } ); };
 
             # fatal error if we used extension matching
             croak "Error parsing file: $filename" if $@ and $use_ext_lut;
@@ -187,7 +191,8 @@ sub _load {
                 $args->{ filter }->( $_ ) for @configs;
             }
 
-            push @results, { $filename => @configs == 1 ? $configs[ 0 ] : \@configs };
+            push @results,
+                { $filename => @configs == 1 ? $configs[ 0 ] : \@configs };
             last;
         }
     }