X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FGeneral.pm;h=c07229321832528581dd05865cd38f05e7e5e81f;hp=975bff674a471317128484faed56ec94c2d332a9;hb=3adc3480014aae487da279703125827ef0cb039e;hpb=e0c0c283d718e11db7e71a002fee6642ce1b73bd
diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm
index 975bff6..c072293 100644
--- a/lib/Config/Any/General.pm
+++ b/lib/Config/Any/General.pm
@@ -3,6 +3,8 @@ package Config::Any::General;
use strict;
use warnings;
+use base 'Config::Any::Base';
+
=head1 NAME
Config::Any::General - Load Config::General files
@@ -14,6 +16,7 @@ Loads Config::General files. Example:
name = TestApp
foo bar
+ bar [ arrayref-value ]
qux xyzzy
@@ -42,60 +45,47 @@ sub load {
my $file = shift;
my $args = shift || {};
- # work around bug (?) in Config::General
-# return if $class->_test_perl($file);
-
- $args->{-ConfigFile} = $file;
+ $args->{ -ConfigFile } = $file;
require Config::General;
+ Config::General->VERSION( '2.48' );
+
+ $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( )
-=head1 AUTHOR
+Specifies that this module requires L in order to work.
-=over 4
+=cut
-=item * Brian Cassidy Ebricas@cpan.orgE
+sub requires_all_of { [ 'Config::General' => '2.48' ] }
-=back
-
-=head1 CONTRIBUTORS
+=head1 AUTHOR
-=over 4
+Brian Cassidy
-=item * Joel Bernstein C<< >>
+=head1 CONTRIBUTORS
-=back
+Joel Bernstein
=head1 COPYRIGHT AND LICENSE
-Copyright 2006 by Brian Cassidy
+Copyright 2006-2016 by Brian Cassidy
Portions Copyright 2006 Portugal Telecom
This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+it under the same terms as Perl itself.
=head1 SEE ALSO
-=over 4
+=over 4
=item * L
@@ -108,4 +98,3 @@ it under the same terms as Perl itself.
=cut
1;
-