refactor option module loads for JSON subclass

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

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 0ef772f..950424f 100644 (file)
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -49,28 +49,30 @@ sub load {
     my $content = do { local $/; <$fh> };
     close $fh;
 
-    eval { require JSON::DWIW; };
-    unless( $@ ) {
+    if ( eval { require JSON::DWIW } ) {
         my $decoder = JSON::DWIW->new;
         my ( $data, $error ) = $decoder->from_json( $content );
         die $error if $error;
         return $data;
     }
-
-    eval { require JSON::XS; };
-    unless( $@ ) {
+    elsif ( eval { require JSON::XS } ) {
         my $decoder = JSON::XS->new->relaxed;
         return $decoder->decode( $content );
     }
-
-    eval { require JSON::Syck; };
-    unless( $@ ) {
+    elsif ( eval { require JSON::Syck } ) {
         return JSON::Syck::Load( $content );
     }
-
+    elsif ( eval { require JSON::PP; JSON::PP->VERSION( 2 ); } ) {
+        my $decoder = JSON::PP->new->relaxed;
+        return $decoder->decode( $content );
+    }
     require JSON;
-    eval { JSON->VERSION( 2 ); };
-    return $@ ? JSON::jsonToObj( $content ) : JSON::from_json( $content );
+    if ( eval { JSON->VERSION( 2 ) } ) {
+        return JSON::from_json( $content );
+    }
+    else {
+        return JSON::jsonToObj( $content );
+    }
 }
 
 =head2 requires_any_of( )
@@ -80,7 +82,7 @@ L<JSON::Syck> or L<JSON> in order to work.
 
 =cut
 
-sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON' }
+sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON::PP', 'JSON' }
 
 =head1 AUTHOR
 
@@ -88,7 +90,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2010 by Brian Cassidy
+Copyright 2006-2016 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.