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=785f3968b8f05c6e1646c37756de0c74e95e45f4;hp=47470e93505536ae279ab1bfcee5f02bed58ba46;hb=3a27e96d3f96ae99fa6bc1a78ec420b0a6392f0d;hpb=f9f3d682a0332cec1207764dcada85a7ff7750f0

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 47470e9..785f396 100644
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -45,38 +45,36 @@ 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 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( )
@@ -94,7 +92,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2015 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.