reformat Changes. bump copyright year.

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

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index ce29549..ca2da3e 100644 (file)
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -49,9 +49,18 @@ sub load {
     my $content = do { local $/; <$fh> };
     close $fh;
 
+    eval { require JSON::DWIW; };
+    unless( $@ ) {
+        my $decoder = JSON::DWIW->new;
+        my ( $data, $error ) = $decoder->from_json( $content );
+        die $error if $error;
+        return $data;
+    }
+
     eval { require JSON::XS; };
     unless( $@ ) {
-        return JSON::XS::decode_json( $content );
+        my $decoder = JSON::XS->new->relaxed;
+        return $decoder->decode( $content );
     }
 
     eval { require JSON::Syck; };
@@ -66,12 +75,12 @@ sub load {
 
 =head2 requires_any_of( )
 
-Specifies that this modules requires one of,  L<JSON::XS>, L<JSON::Syck> or
-L<JSON> in order to work.
+Specifies that this modules requires one of,  L<JSON::DWIW>, L<JSON::XS>,
+L<JSON::Syck> or L<JSON> in order to work.
 
 =cut
 
-sub requires_any_of { 'JSON::XS', 'JSON::Syck', 'JSON' }
+sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON' }
 
 =head1 AUTHOR
 
@@ -79,7 +88,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Brian Cassidy
+Copyright 2006-2011 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 
@@ -92,11 +101,13 @@ it under the same terms as Perl itself.
 
 =item * L<Config::Any>
 
-=item * L<JSON>
+=item * L<JSON::DWIW>
+
+=item * L<JSON::XS>
 
 =item * L<JSON::Syck>
 
-=item * L<JSON::XS>
+=item * L<JSON>
 
 =back