X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FConfig%2FAny%2FJSON.pm;h=0ef772ff6e773b119f6f7af85a9674f0290cd6df;hb=refs%2Ftags%2Fv0.19;hp=6e39d63e9ca3284f45ca3a91dd10657a3d54b0b3;hpb=dcfb1d1d1a544d27a82cb174168df23abc539acb;p=p5sagit%2FConfig-Any.git

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 6e39d63..0ef772f 100644
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -49,25 +49,38 @@ sub load {
     my $content = do { local $/; <$fh> };
     close $fh;
 
-    eval { require JSON::Syck; };
-    if ( $@ ) {
-        require JSON;
-        eval { JSON->VERSION( 2 ); };
-        return $@ ? JSON::jsonToObj( $content ) : JSON::from_json( $content );
+    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( $@ ) {
+        my $decoder = JSON::XS->new->relaxed;
+        return $decoder->decode( $content );
     }
-    else {
+
+    eval { require JSON::Syck; };
+    unless( $@ ) {
         return JSON::Syck::Load( $content );
     }
+
+    require JSON;
+    eval { JSON->VERSION( 2 ); };
+    return $@ ? JSON::jsonToObj( $content ) : JSON::from_json( $content );
 }
 
 =head2 requires_any_of( )
 
-Specifies that this modules requires one of 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::Syck', 'JSON' }
+sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON' }
 
 =head1 AUTHOR
 
@@ -75,7 +88,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy
+Copyright 2006-2010 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 
@@ -88,10 +101,14 @@ 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>
+
 =back
 
 =cut