fix for ini subsections (RT #32726), use from_json for JSON v2.x, refactor test suite.

[p5sagit/Config-Any.git] / lib / Config / Any / INI.pm

diff --git a/lib/Config/Any/INI.pm b/lib/Config/Any/INI.pm
index ea2abce..68e3f06 100644 (file)
--- a/lib/Config/Any/INI.pm
+++ b/lib/Config/Any/INI.pm
@@ -45,26 +45,35 @@ sub load {
 
     require Config::Tiny;
     my $config = Config::Tiny->read( $file );
-
-    my $main = delete $config->{ _ };
-    my $out;
-    $out->{ $_ } = $main->{ $_ } for keys %$main;
+    my $out = delete $config->{ _ } || {};
 
     for my $k ( keys %$config ) {
-        my @keys = split /\s+/, $k if $MAP_SECTION_SPACE_TO_NESTED_KEY;
+        my @keys = split /\s+/, $k;
         my $ref = $config->{ $k };
 
-        if ( @keys > 1 ) {
+        if ( $MAP_SECTION_SPACE_TO_NESTED_KEY && @keys > 1 ) {
             my ( $a, $b ) = @keys[ 0, 1 ];
             $out->{ $a }->{ $b } = $ref;
         }
         else {
-            $out->{ $k } = $ref;
+            $out->{ $k } = { %{ $out->{ $k } || {} }, %$ref };
         }
     }
+
     return $out;
 }
 
+=head2 is_supported( )
+
+Returns true if L<Config::Tiny> is available.
+
+=cut
+
+sub is_supported {
+    eval { require Config::Tiny; };
+    return $@ ? 0 : 1;
+}
+
 =head1 PACKAGE VARIABLES
 
 =over 4
@@ -84,19 +93,15 @@ Set it to 0 to preserve literal spaces in section headings:
 
 =back
 
-=head1 AUTHOR
-
-=over 4 
-
-=item * Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+=head1 AUTHORS
 
-=item * Joel Bernstein E<lt>rataxis@cpan.orgE<gt>
+Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
-=back
+Joel Bernstein E<lt>rataxis@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Brian Cassidy, portions copyright 2006, 2007 by Joel Bernstein
+Copyright 2007 by Brian Cassidy, portions copyright 2006, 2007 by Joel Bernstein
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.