X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FXML.pm;h=466033896e80ba1f120beac5f9f7a65ede1fe608;hp=a37a2f2513df84352887ae8c947e2b45cfaba9f1;hb=83020fbd096a2523ceedbb3ea1e9b99e030f994c;hpb=c80a0905834ed09d487b84d7a00a3e92e44bbb62

diff --git a/lib/Config/Any/XML.pm b/lib/Config/Any/XML.pm
index a37a2f2..4660338 100644
--- a/lib/Config/Any/XML.pm
+++ b/lib/Config/Any/XML.pm
@@ -1,82 +1,104 @@
-package Config::Any::XML;
-
-use strict;
-use warnings;
-
-=head1 NAME
-
-Config::Any::XML - Load XML config files
-
-=head1 DESCRIPTION
-
-Loads XML files. Example:
-
-    <config>
-        <name>TestApp</name>
-        <component name="Controller::Foo">
-            <foo>bar</foo>
-        </component>
-        <model name="Baz">
-            <qux>xyzzy</qux>
-        </model>
-    </config>
-
-=head1 METHODS
-
-=head2 extensions( )
-
-return an array of valid extensions (C<xml>).
-
-=cut
-
-sub extensions {
-    return qw( xml );
-}
-
-=head2 load( $file )
-
-Attempts to load C<$file> as an XML file.
-
-=cut
-
-sub load {
-    my $class = shift;
-    my $file  = shift;
-
-    require XML::Simple;
-    XML::Simple->import;
-    my $config = XMLin( $file, ForceArray => [ qw( component model view controller ) ] );
-
-    return $config;
-}
-
-=head1 AUTHOR
-
-=over 4 
-
-=item * Brian Cassidy E<lt>bricas@cpan.orgE<gt>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006 by Brian Cassidy
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself. 
-
-=head1 SEE ALSO
-
-=over 4 
-
-=item * L<Catalyst>
-
-=item * L<Config::Any>
-
-=item * L<XML::Simple>
-
-=back
-
-=cut
-
-1;
\ No newline at end of file
+package Config::Any::XML;
+
+use strict;
+use warnings;
+
+=head1 NAME
+
+Config::Any::XML - Load XML config files
+
+=head1 DESCRIPTION
+
+Loads XML files. Example:
+
+    <config>
+        <name>TestApp</name>
+        <component name="Controller::Foo">
+            <foo>bar</foo>
+        </component>
+        <model name="Baz">
+            <qux>xyzzy</qux>
+        </model>
+    </config>
+
+=head1 METHODS
+
+=head2 extensions( )
+
+return an array of valid extensions (C<xml>).
+
+=cut
+
+sub extensions {
+    return qw( xml );
+}
+
+=head2 load( $file )
+
+Attempts to load C<$file> as an XML file.
+
+=cut
+
+sub load {
+    my $class = shift;
+    my $file  = shift;
+
+    require XML::Simple;
+    XML::Simple->import;
+    my $config = XMLin( 
+        $file, 
+        ForceArray => [ qw( component model view controller ) ],
+    );
+
+    return $class->_coerce($config);
+}
+
+sub _coerce {
+    # coerce the XML-parsed config into the correct format
+    my $class = shift;
+    my $config = shift;
+    my $out;
+    for my $k (keys %$config) {
+        my $ref = $config->{$k};
+        my $name = ref $ref ? delete $ref->{name} : undef;
+        if (defined $name) {
+            $out->{$k}->{$name} = $ref; 
+        } else {
+            $out->{$k} = $ref;
+        }
+    }
+    $out;
+}
+
+=head1 AUTHOR
+
+=over 4 
+
+=item * Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+
+=item * Joel Bernstein E<lt>rataxis@cpan.orgE<gt>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006 by Brian Cassidy
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself. 
+
+=head1 SEE ALSO
+
+=over 4 
+
+=item * L<Catalyst>
+
+=item * L<Config::Any>
+
+=item * L<XML::Simple>
+
+=back
+
+=cut
+
+1;