X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FConfig%2FAny%2FGeneral.pm;h=3f0af309927a336e95e3b4028191b06946e11d3d;hb=0bdc3e9bef6f841b341c32960565aaaa9551e2be;hp=bb70c50ced36d52d46685239f26fe1ddb7e3dc8f;hpb=c793253e5f2ad3ca9d60e96e07a5d87fa344ec31;p=p5sagit%2FConfig-Any.git
diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm
index bb70c50..3f0af30 100644
--- a/lib/Config/Any/General.pm
+++ b/lib/Config/Any/General.pm
@@ -16,6 +16,7 @@ Loads Config::General files. Example:
name = TestApp
foo bar
+ bar [ arrayref-value ]
qux xyzzy
@@ -44,39 +45,26 @@ sub load {
my $file = shift;
my $args = shift || {};
- # work around bug (?) in Config::General
- # return if $class->_test_perl($file);
-
$args->{ -ConfigFile } = $file;
require Config::General;
+ Config::General->VERSION( '2.47' );
+
+ $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray };
+
my $configfile = Config::General->new( %$args );
my $config = { $configfile->getall };
return $config;
}
-# this is a bit of a hack but necessary, because Config::General is *far* too lax
-# about what it will load -- specifically, it seems to be quite happy to load a Perl
-# config file (ie, a file which is valid Perl and creates a hashref) as if it were
-# an Apache-style configuration file, presumably due to laziness on the part of the
-# developer.
-
-sub _test_perl {
- my ( $class, $file ) = @_;
- my $is_perl_src;
- eval { $is_perl_src = do "$file"; };
- delete $INC{ $file }; # so we don't screw stuff later on
- return defined $is_perl_src;
-}
-
=head2 requires_all_of( )
Specifies that this module requires L in order to work.
=cut
-sub requires_all_of { 'Config::General' }
+sub requires_all_of { [ 'Config::General' ] }
=head1 AUTHOR
@@ -84,11 +72,11 @@ Brian Cassidy Ebricas@cpan.orgE
=head1 CONTRIBUTORS
-Joel Bernstein C<< >>
+Joel Bernstein Erataxis@cpan.orgE
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Brian Cassidy
+Copyright 2006-2013 by Brian Cassidy
Portions Copyright 2006 Portugal Telecom
@@ -110,4 +98,3 @@ it under the same terms as Perl itself.
=cut
1;
-