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=55cf4c340618b2fa6c3aba5f3353dbd5f37a7dfb;hp=4f9b40113f90dad15e147a473290e774792c7745;hb=ade8c46e9b5c63a262f6db99c9a0d703695912b0;hpb=4efab5582d1ec3acd99a2ffb898bed58d5f2420b diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm index 4f9b401..55cf4c3 100644 --- a/lib/Config/Any.pm +++ b/lib/Config/Any.pm @@ -5,9 +5,8 @@ use warnings; use Carp; use Module::Pluggable::Object (); -use English qw(-no_match_vars); -our $VERSION = '0.09'; +our $VERSION = '0.09_01'; =head1 NAME @@ -15,7 +14,7 @@ Config::Any - Load configuration from different file formats, transparently =head1 VERSION -This document describes Config::Any version 0.0.8 +This document describes Config::Any version 0.09 =head1 SYNOPSIS @@ -49,7 +48,7 @@ configuration formats. =cut -=head2 load_files( ) +=head2 load_files( \%args ) Config::Any->load_files( { files => \@files } ); Config::Any->load_files( { files => \@files, filter => \&filter } ); @@ -95,11 +94,11 @@ sub load_files { return $class->_load( $args ); } -=head2 load_stems( ) +=head2 load_stems( \%args ) - 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 } ); + Config::Any->load_stems( { stems => \@stems, filter => \&filter } ); + Config::Any->load_stems( { stems => \@stems, use_ext => 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 @@ -112,94 +111,93 @@ parameters. Please read the C documentation before using this meth sub load_stems { my ( $class, $args ) = @_; - return unless defined $args; - unless ( exists $args->{ stems } ) { - warn "no stems specified"; + + unless ( $args && exists $args->{ stems } ) { + warn "No stems specified!"; return; } - my %load_args - = map { $_ => defined $args->{ $_ } ? $args->{ $_ } : undef } - qw(filter use_ext force_plugins driver_args); - - $load_args{ files } = $class->_stems_to_files( $args->{ stems } ); - return $class->_load( \%load_args ); -} - -sub _stems_to_files { - my ( $class, $stems ) = @_; - return unless defined $stems; - + my $stems = delete $args->{ stems }; my @files; for my $s ( @$stems ) { for my $ext ( $class->extensions ) { push @files, "$s.$ext"; } } - return \@files; -} -sub _maphash { # syntactic sugar - map { $_ => 1 } @_; -} + $args->{ files } = \@files; + 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 = _maphash @$files_ref; - my %force_plugins = _maphash @$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 = _maphash $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 } || {}; + } - next if $EVAL_ERROR; # if it croaked or warned, we can't use it - next if !$config; - delete $files{ $filename }; + my @results; - # post-process config with a filter callback, if we got one - $filter_cb->( $config ) if defined $filter_cb; + for my $filename ( @{ $args->{ files } } ) { - push @$final_configs, { $filename => $config }; + # don't even bother if it's not there + next unless -f $filename; + + my @try_plugins = @plugins; + + 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 file: $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; } } - $final_configs; + + return \@results; } =head2 finder( ) @@ -217,7 +215,7 @@ sub finder { search_path => [ __PACKAGE__ ], require => 1 ); - $finder; + return $finder; } =head2 plugins( ) @@ -250,7 +248,7 @@ sub extensions { =over -=item C or C +=item C or C The C and C methods will issue this warning if called with an empty list of files/stems to load.