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=07f7a9c10310e976700f3c2c1e10f3ad3f080b1c;hb=9d569cf0c9b945399035ced825ff7059692786c7;hpb=7c2181827882c125de98ccbe16402f5b277a3f44 diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm index 07f7a9c..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'; +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 attempts to load configuration from the list of files passed in the C parameter, if the file exists. @@ -69,6 +66,9 @@ be aware that you will lose flexibility -- for example, a file called C or C would be. +When the C 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 also supports a 'force_plugins' parameter, whose value should be an arrayref of plugin names like C. 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 attempts to load configuration from a list of files which it generates by combining the filename stems list passed in the C parameter with the @@ -129,64 +130,80 @@ sub load_stems { return $class->_load( $args ); } -# this is where we do the real work -# it's a private class-method because users should use the interface described -# in the POD. sub _load { my ( $class, $args ) = @_; - my ( $files_ref, $filter_cb, $use_ext, $force_plugins_ref ) - = @{ $args }{ qw(files filter use_ext force_plugins) }; - croak "_load requires a arrayref of file paths" unless defined $files_ref; - - my %files = map { $_ => 1 } @$files_ref; - my %force_plugins = map { $_ => 1 } @$force_plugins_ref; - my $enforcing = keys %force_plugins ? 1 : 0; - - my $final_configs = []; - my $originally_loaded = {}; - - # perform a separate file loop for each loader - for my $loader ( $class->plugins ) { - next if $enforcing && not defined $force_plugins{ $loader }; - last unless keys %files; - my %ext = map { $_ => 1 } $loader->extensions; - - my ( $loader_class ) = $loader =~ /::([^:]+)$/; - my $driver_args = $args->{ driver_args }{ $loader_class } || {}; - - FILE: - for my $filename ( keys %files ) { - next unless -f $filename; - - # use file extension to decide whether this loader should try this file - # use_ext => 1 hits this block - if ( defined $use_ext && !$enforcing ) { - my $matched_ext = 0; - EXT: - for my $e ( keys %ext ) { - next EXT unless $filename =~ m{ \. $e \z }xms; - next FILE unless exists $ext{ $e }; - $matched_ext = 1; - } - - next FILE unless $matched_ext; - } + croak "_load requires a arrayref of file paths" unless $args->{ files }; + + 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 @plugins = $force ? @{ $args->{ force_plugins } } : $class->plugins; + + # map extensions if we have to + my ( %extension_lut, $extension_re ); + my $use_ext_lut = !$force && $args->{ use_ext }; + if ( $use_ext_lut ) { + for my $plugin ( @plugins ) { + $extension_lut{ $_ } = $plugin for $plugin->extensions; + } + + $extension_re = join( '|', keys %extension_lut ); + } - my $config; - eval { $config = $loader->load( $filename, $driver_args ); }; + # map args to plugins + my $base_class = __PACKAGE__; + my %loader_args; + for my $plugin ( @plugins ) { + $plugin =~ m{^$base_class\::(.+)}; + $loader_args{ $plugin } = $args->{ driver_args }->{ $1 } || {}; + } + + my @results; + + for my $filename ( @{ $args->{ files } } ) { - next if $@; # if it croaked or warned, we can't use it - next if !$config; - delete $files{ $filename }; + # don't even bother if it's not there + next unless -f $filename; - # post-process config with a filter callback, if we got one - $filter_cb->( $config ) if defined $filter_cb; + my @try_plugins = @plugins; - push @$final_configs, { $filename => $config }; + if ( $use_ext_lut ) { + $filename =~ m{\.($extension_re)\z}; + next unless $1; + @try_plugins = $extension_lut{ $1 }; } + + 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 $filename: $@" if $@ and $use_ext_lut; + next if $@ or !@configs; + + # post-process config with a filter callback + if ( $args->{ filter } ) { + $args->{ filter }->( $_ ) for @configs; + } + + push @results, + { $filename => @configs == 1 ? $configs[ 0 ] : \@configs }; + last; + } + } + + if ( defined $args->{ flatten_to_hash } ) { + my %flattened = map { %$_ } @results; + return \%flattened; } - return $final_configs; + return \@results; } =head2 finder( ) @@ -281,7 +298,7 @@ L. =head1 AUTHOR -Joel Bernstein Erataxis@cpan.orgE +Joel Bernstein Erataxis@cpan.orgE =head1 CONTRIBUTORS