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=0a7f7d788aedacf4b2cbbcb8384753829727cd0b;hp=022fcd1e4e48525f6455306131e2498c563aecb2;hb=af9773e254ae71eee4cbdf5ee48d25b17c922b50;hpb=72628dc786ef43d546023d6f17a86c3f5edeb21a diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm index 022fcd1..0a7f7d7 100644 --- a/lib/Config/Any.pm +++ b/lib/Config/Any.pm @@ -6,7 +6,7 @@ use warnings; use Carp; use Module::Pluggable::Object (); -our $VERSION = '0.09_01'; +our $VERSION = '0.10'; =head1 NAME @@ -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_02 =head1 SYNOPSIS @@ -25,7 +25,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 +133,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,6 +178,7 @@ sub _load { } for my $loader ( @try_plugins ) { + next unless $loader->is_supported; my @configs = eval { $loader->load( $filename, $loader_args{ $loader } ); };