[Catalyst-commits] r13475 - in trunk/Config-Any: lib/Config/Any t

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2010-08-05 20:41:54 +0100 (Thu, 05 Aug 2010)
New Revision: 13475

Modified:
   trunk/Config-Any/lib/Config/Any/General.pm
   trunk/Config-Any/t/50-general.t
Log:
tidy C::G related code, plus remove an old work-around which has been inactive for years.

Modified: trunk/Config-Any/lib/Config/Any/General.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/General.pm	2010-08-05 19:36:50 UTC (rev 13474)
+++ trunk/Config-Any/lib/Config/Any/General.pm	2010-08-05 19:41:54 UTC (rev 13475)
@@ -46,13 +46,10 @@
     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 @@
     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 @@
 
 =head1 CONTRIBUTORS
 
-Joel Bernstein C<< <rataxis at cpan.org> >>
+Joel Bernstein E<lt>rataxis at cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
@@ -116,4 +99,3 @@
 =cut
 
 1;
-

Modified: trunk/Config-Any/t/50-general.t
===================================================================
--- trunk/Config-Any/t/50-general.t	2010-08-05 19:36:50 UTC (rev 13474)
+++ trunk/Config-Any/t/50-general.t	2010-08-05 19:41:54 UTC (rev 13475)
@@ -25,11 +25,9 @@
 }
 
 {
-    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