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=c4de85bae99857302a7e0045c2a27660f584baff;hp=708936aa14a106c16666d96f22232158ef6040bf;hb=9d569cf0c9b945399035ced825ff7059692786c7;hpb=a918b0b8b7952db918dfabb8dc72bf34832d43d0

diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm
index 708936a..c4de85b 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.14';
 
 =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";
     }
@@ -53,6 +49,7 @@ configuration formats.
     Config::Any->load_files( { files => \@files } );
     Config::Any->load_files( { files => \@files, filter  => \&filter } );
     Config::Any->load_files( { files => \@files, use_ext => 1 } );
+    Config::Any->load_files( { files => \@files, flatten_to_hash => 1 } );
 
 C<load_files()> attempts to load configuration from the list of files passed in
 the C<files> parameter, if the file exists.
@@ -69,6 +66,9 @@ be aware that you will lose flexibility -- for example, a file called C<myapp.cf
 containing YAML data will not be offered to the YAML plugin, whereas C<myapp.yml>
 or C<myapp.yaml> would be.
 
+When the C<flatten_to_hash> parameter is defined, the loader will return a hash
+keyed on the file names, as opposed to the usual list of single-key hashes.
+
 C<load_files()> also supports a 'force_plugins' parameter, whose value should be an
 arrayref of plugin names like C<Config::Any::INI>. Its intended use is to allow the use 
 of a non-standard file extension while forcing it to be offered to a particular parser.
@@ -99,6 +99,7 @@ sub load_files {
     Config::Any->load_stems( { stems => \@stems } );
     Config::Any->load_stems( { stems => \@stems, filter  => \&filter } );
     Config::Any->load_stems( { stems => \@stems, use_ext => 1 } );
+    Config::Any->load_stems( { stems => \@stems, flatten_to_hash => 1 } );
 
 C<load_stems()> attempts to load configuration from a list of files which it generates
 by combining the filename stems list passed in the C<stems> parameter with the 
@@ -133,19 +134,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,22 +166,25 @@ 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;
+            croak "Error parsing $filename: $@" if $@ and $use_ext_lut;
             next if $@ or !@configs;
 
             # post-process config with a filter callback
@@ -187,11 +192,17 @@ sub _load {
                 $args->{ filter }->( $_ ) for @configs;
             }
 
-            push @results, { $filename => @configs == 1 ? $configs[ 0 ] : \@configs };
+            push @results,
+                { $filename => @configs == 1 ? $configs[ 0 ] : \@configs };
             last;
         }
     }
 
+    if ( defined $args->{ flatten_to_hash } ) {
+        my %flattened = map { %$_ } @results;
+        return \%flattened;
+    }
+
     return \@results;
 }
 
@@ -287,7 +298,7 @@ L<http://rt.cpan.org>.
 
 =head1 AUTHOR
 
-Joel Bernstein  E<lt>rataxis@cpan.orgE<gt>
+Joel Bernstein E<lt>rataxis@cpan.orgE<gt>
 
 =head1 CONTRIBUTORS