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=07f7a9c10310e976700f3c2c1e10f3ad3f080b1c;hp=031a0e214128ac3fe41918c525c1e0debe4d6376;hb=7c2181827882c125de98ccbe16402f5b277a3f44;hpb=92a04e78451078b33f75e7c44d247b024c27b4f7

diff --git a/lib/Config/Any.pm b/lib/Config/Any.pm
index 031a0e2..07f7a9c 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.08';
+our $VERSION = '0.09';
 
 =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,11 +48,11 @@ configuration formats.
 
 =cut
 
-=head2 load_files( )
+=head2 load_files( \%args )
 
-    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 } );
+    Config::Any->load_files( { files => \@files, filter  => \&filter } );
+    Config::Any->load_files( { files => \@files, use_ext => 1 } );
 
 C<load_files()> attempts to load configuration from the list of files passed in
 the C<files> parameter, if the file exists.
@@ -86,24 +85,20 @@ parser object. Example:
 
 sub load_files {
     my ( $class, $args ) = @_;
-    return unless defined $args;
-    unless ( exists $args->{ files } ) {
-        warn "no files specified";
+
+    unless ( $args && exists $args->{ files } ) {
+        warn "No files specified!";
         return;
     }
 
-    my %load_args
-        = map { $_ => defined $args->{ $_ } ? $args->{ $_ } : undef }
-        qw(filter use_ext force_plugins driver_args);
-    $load_args{ files } = [ grep { -f $_ } @{ $args->{ files } } ];
-    return $class->_load( \%load_args );
+    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<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 
@@ -116,42 +111,23 @@ parameters. Please read the C<load_files()> 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);
-
-    my $filenames = $class->_stems_to_files( $args->{ stems } );
-    $load_args{ files } = [ grep { -f $_ } @{ $filenames } ];
-    return $class->_load( \%load_args );
-}
-
-sub _stems_to_files {
-    my ( $class, $stems ) = @_;
-    return unless defined $stems;
-
+    my $stems = delete $args->{ stems };
     my @files;
-STEM:
     for my $s ( @$stems ) {
-    EXT:
         for my $ext ( $class->extensions ) {
-            my $file = "$s.$ext";
-            next EXT unless -f $file;
-            push @files, $file;
-            last EXT;
+            push @files, "$s.$ext";
         }
     }
-    \@files;
-}
 
-sub _maphash (@) {
-    map { $_ => 1 } @_;
-}    # sugar
+    $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
@@ -162,9 +138,9 @@ sub _load {
         = @{ $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 %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 = {};
@@ -173,13 +149,14 @@ sub _load {
     for my $loader ( $class->plugins ) {
         next if $enforcing && not defined $force_plugins{ $loader };
         last unless keys %files;
-        my %ext = _maphash $loader->extensions;
+        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
@@ -198,7 +175,7 @@ sub _load {
             my $config;
             eval { $config = $loader->load( $filename, $driver_args ); };
 
-            next if $EVAL_ERROR;    # if it croaked or warned, we can't use it
+            next if $@;         # if it croaked or warned, we can't use it
             next if !$config;
             delete $files{ $filename };
 
@@ -208,7 +185,8 @@ sub _load {
             push @$final_configs, { $filename => $config };
         }
     }
-    $final_configs;
+
+    return $final_configs;
 }
 
 =head2 finder( )
@@ -226,7 +204,7 @@ sub finder {
         search_path => [ __PACKAGE__ ],
         require     => 1
     );
-    $finder;
+    return $finder;
 }
 
 =head2 plugins( )
@@ -252,14 +230,14 @@ parameter to those methods.
 sub extensions {
     my $class = shift;
     my @ext = map { $_->extensions } $class->plugins;
-    return wantarray ? @ext : [ @ext ];
+    return wantarray ? @ext : \@ext;
 }
 
 =head1 DIAGNOSTICS
 
 =over
 
-=item C<no files specified> or C<no stems specified>
+=item C<No files specified!> or C<No stems specified!>
 
 The C<load_files()> and C<load_stems()> methods will issue this warning if
 called with an empty list of files/stems to load.