X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny.pm;h=d0d789cb0f5893bd71ac84907d916b341ed58d8f;hp=022fcd1e4e48525f6455306131e2498c563aecb2;hb=692fc1958052bf9e7783f424e9733efde5736aeb;hpb=72628dc786ef43d546023d6f17a86c3f5edeb21a

diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm
index 022fcd1..d0d789c 100644
--- a/lib/Config/Any.pm
+++ b/lib/Config/Any.pm
@@ -6,16 +6,12 @@ use warnings;
 use Carp;
 use Module::Pluggable::Object ();
 
-our $VERSION = '0.09_01';
+our $VERSION = '0.12';
 
 =head1 NAME
 
 Config::Any - Load configuration from different file formats, transparently
 
-=head1 VERSION
-
-This document describes Config::Any version 0.09
-
 =head1 SYNOPSIS
 
     use Config::Any;
@@ -25,7 +21,7 @@ This document describes Config::Any version 0.09
     my $cfg = Config::Any->load_files({files => \@filepaths, ... });
 
     for (@$cfg) {
-        my ($filename, $config) = each %$_;
+        my ($filename, $config) = %$_;
         $class->config($config);
         warn "loaded config from file: $filename";
     }
@@ -133,16 +129,15 @@ sub _load {
     my ( $class, $args ) = @_;
     croak "_load requires a arrayref of file paths" unless $args->{ files };
 
-    if ( !defined $args->{ use_ext } ) {
+    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 = grep { $_->is_supported }
-        ( $force ? @{ $args->{ force_plugins } } : $class->plugins );
+    my @plugins = $force ? @{ $args->{ force_plugins } } : $class->plugins;
 
     # map extensions if we have to
     my ( %extension_lut, $extension_re );
@@ -179,11 +174,12 @@ sub _load {
         }
 
         for my $loader ( @try_plugins ) {
+            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;
+            croak "Error parsing $filename: $@" if $@ and $use_ext_lut;
             next if $@ or !@configs;
 
             # post-process config with a filter callback