tidy C::G related code, plus remove an old work-around which has been inactive for...

diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm
index 5c697e9..609d914 100644 (file)
--- a/lib/Config/Any/General.pm
+++ b/lib/Config/Any/General.pm
@@ -46,13 +46,10 @@ 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');
+    Config::General->VERSION( '2.47' );
 
     $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray };
 
@@ -62,20 +59,6 @@ sub load {
     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<Config::General> in order to work.
@@ -90,7 +73,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 CONTRIBUTORS
 
-Joel Bernstein C<< <rataxis@cpan.org> >>
+Joel Bernstein E<lt>rataxis@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
@@ -116,4 +99,3 @@ it under the same terms as Perl itself.
 =cut
 
 1;
-

diff --git a/t/50-general.t b/t/50-general.t
index 6db7243..cc7d6f8 100644 (file)
--- a/t/50-general.t
+++ b/t/50-general.t
@@ -25,11 +25,9 @@ else {
 }
 
 {
-    my $config = Config::Any::General->load(
-        't/conf/single_element_arrayref.conf'
-    );
-    is_deeply $config->{foo}, [ 'bar' ],
-        'single element arrayref';
+    my $config
+        = Config::Any::General->load( 't/conf/single_element_arrayref.conf' );
+    is_deeply $config->{ foo }, [ 'bar' ], 'single element arrayref';
 }
 
 # test invalid config