X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FJSON.pm;h=b283b86a59502b5ba79d780d1058a602e38bcac2;hp=3213128d43e47050a3c731005b4ef6b3c8861c9d;hb=d49610ab8c8f7a8fa979a60fa75eb20ae690135b;hpb=72628dc786ef43d546023d6f17a86c3f5edeb21a

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 3213128..b283b86 100644
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -3,6 +3,8 @@ package Config::Any::JSON;
 use strict;
 use warnings;
 
+use base 'Config::Any::Base';
+
 =head1 NAME
 
 Config::Any::JSON - Load JSON config files
@@ -47,28 +49,29 @@ sub load {
     my $content = do { local $/; <$fh> };
     close $fh;
 
-    eval { require JSON::Syck; };
-    if ( $@ ) {
-        require JSON;
-        return JSON::jsonToObj( $content );
+    eval { require JSON::XS; };
+    unless( $@ ) {
+        return JSON::XS::decode_json( $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 is_supported( )
+=head2 requires_any_of( )
 
-Returns true if either L<JSON::Syck> or L<JSON> is available.
+Specifies that this modules requires one of,  L<JSON::XS>, L<JSON::Syck> or
+L<JSON> in order to work.
 
 =cut
 
-sub is_supported {
-    eval { require JSON::Syck; };
-    return 1 unless $@;
-    eval { require JSON; };
-    return $@ ? 0 : 1;
-}
+sub requires_any_of { 'JSON::XS', 'JSON::Syck', 'JSON' }
 
 =head1 AUTHOR
 
@@ -93,6 +96,8 @@ it under the same terms as Perl itself.
 
 =item * L<JSON::Syck>
 
+=item * L<JSON::XS>
+
 =back
 
 =cut