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=17055f3accec940937df29b61d6b784d6b690a52;hp=e8a12461ac5d66b9d1c608c29d7b5a79fe5071b8;hb=d60679ba40498138c7dd83aa5a735e76ffdc3714;hpb=a8ffcd3bebfdfed41159d7ab3f48bb67082db773

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index e8a1246..17055f3 100644
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -45,68 +45,87 @@ sub load {
     my $class = shift;
     my $file  = shift;
 
-    open( my $fh, $file ) or die $!;
+    open( my $fh, '<', $file ) or die $!;
+    binmode $fh;
     my $content = do { local $/; <$fh> };
     close $fh;
 
-    eval { require JSON::DWIW; };
-    unless( $@ ) {
+    if ( eval { require Cpanel::JSON::XS } ) {
+        my $decoder = Cpanel::JSON::XS->new->utf8->relaxed;
+        return $decoder->decode( $content );
+    }
+    elsif ( eval { require JSON::MaybeXS } ) {
+        my $decoder = JSON::MaybeXS::JSON()->new->utf8->relaxed;
+        return $decoder->decode( $content );
+    }
+    elsif ( 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( $@ ) {
-        my $decoder = JSON::XS->new->relaxed;
+    elsif ( eval { require JSON::XS } ) {
+        my $decoder = JSON::XS->new->utf8->relaxed;
         return $decoder->decode( $content );
     }
-
-    eval { require JSON::Syck; };
-    unless( $@ ) {
-        return JSON::Syck::Load( $content );
+    elsif ( eval { require JSON::Syck } ) {
+        require Encode;
+        return JSON::Syck::Load( Encode::decode('UTF-8', $content ) );
     }
-
-    eval { require JSON::PP; JSON::PP->VERSION( 2 ); };
-    unless( $@ ) {
-        my $decoder = JSON::PP->new->relaxed;
+    elsif ( eval { require JSON::PP; JSON::PP->VERSION( 2 ); } ) {
+        my $decoder = JSON::PP->new->utf8->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::decode_json( $content );
+    }
+    else {
+        return JSON::jsonToObj( $content );
+    }
 }
 
 =head2 requires_any_of( )
 
-Specifies that this modules requires one of,  L<JSON::DWIW>, L<JSON::XS>,
-L<JSON::Syck> or L<JSON> in order to work.
+Specifies that this modules requires one of, L<Cpanel::JSON::XS>,
+L<JSON::MaybeXS>, L<JSON::DWIW>, L<JSON::XS>, L<JSON::Syck>, L<JSON::PP> or
+L<JSON> in order to work.
 
 =cut
 
-sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON::PP', 'JSON' }
+sub requires_any_of { qw(
+  Cpanel::JSON::XS
+  JSON::MaybeXS
+  JSON::DWIW
+  JSON::XS
+  JSON::Syck
+  JSON::PP
+  JSON
+) }
 
 =head1 AUTHOR
 
-Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+Brian Cassidy <bricas@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2013 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. 
+it under the same terms as Perl itself.
 
 =head1 SEE ALSO
 
-=over 4 
+=over 4
 
 =item * L<Catalyst>
 
 =item * L<Config::Any>
 
+=item * L<Cpanel::JSON::XS>
+
+=item * L<JSON::MaybeXS>
+
 =item * L<JSON::DWIW>
 
 =item * L<JSON::XS>