handle UTF-8 data in JSON correctly

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

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index faa041d..785f396 100644 (file)
--- a/lib/Config/Any/JSON.pm
+++ b/lib/Config/Any/JSON.pm
@@ -1,92 +1,120 @@
-package Config::Any::JSON;\r
-\r
-use strict;\r
-use warnings;\r
-\r
-=head1 NAME\r
-\r
-Config::Any::JSON - Load JSON config files\r
-\r
-=head1 DESCRIPTION\r
-\r
-Loads JSON files. Example:\r
-\r
-    {\r
-        "name": "TestApp",\r
-        "Controller::Foo": {\r
-            "foo": "bar"\r
-        },\r
-        "Model::Baz": {\r
-            "qux": "xyzzy"\r
-        }\r
-    }\r
-\r
-=head1 METHODS\r
-\r
-=head2 extensions( )\r
-\r
-return an array of valid extensions (C<json>, C<jsn>).\r
-\r
-=cut\r
-\r
-sub extensions {\r
-    return qw( json jsn );\r
-}\r
-\r
-=head2 load( $file )\r
-\r
-Attempts to load C<$file> as a JSON file.\r
-\r
-=cut\r
-\r
-sub load {\r
-    my $class = shift;\r
-    my $file  = shift;\r
-\r
-    open( my $fh, $file ) or die $!;\r
-    my $content = do { local $/; <$fh> };\r
-    close $fh;\r
-\r
-    eval { require JSON::Syck; };\r
-    if( $@ ) {\r
-        require JSON;\r
-        JSON->import;\r
-        return jsonToObj( $content );\r
-    }\r
-    else {\r
-        return JSON::Syck::Load( $content );\r
-    }\r
-}\r
-\r
-=head1 AUTHOR\r
-\r
-=over 4 \r
-\r
-=item * Brian Cassidy E<lt>bricas@cpan.orgE<gt>\r
-\r
-=back\r
-\r
-=head1 COPYRIGHT AND LICENSE\r
-\r
-Copyright 2006 by Brian Cassidy\r
-\r
-This library is free software; you can redistribute it and/or modify\r
-it under the same terms as Perl itself. \r
-\r
-=head1 SEE ALSO\r
-\r
-=over 4 \r
-\r
-=item * L<Catalyst>\r
-\r
-=item * L<Config::Any>\r
-\r
-=item * L<JSON>\r
-\r
-=item * L<JSON::Syck>\r
-\r
-=back\r
-\r
-=cut\r
-\r
-1;
\ No newline at end of file
+package Config::Any::JSON;
+
+use strict;
+use warnings;
+
+use base 'Config::Any::Base';
+
+=head1 NAME
+
+Config::Any::JSON - Load JSON config files
+
+=head1 DESCRIPTION
+
+Loads JSON files. Example:
+
+    {
+        "name": "TestApp",
+        "Controller::Foo": {
+            "foo": "bar"
+        },
+        "Model::Baz": {
+            "qux": "xyzzy"
+        }
+    }
+
+=head1 METHODS
+
+=head2 extensions( )
+
+return an array of valid extensions (C<json>, C<jsn>).
+
+=cut
+
+sub extensions {
+    return qw( json jsn );
+}
+
+=head2 load( $file )
+
+Attempts to load C<$file> as a JSON file.
+
+=cut
+
+sub load {
+    my $class = shift;
+    my $file  = shift;
+
+    open( my $fh, '<', $file ) or die $!;
+    binmode $fh;
+    my $content = do { local $/; <$fh> };
+    close $fh;
+
+    if ( eval { require JSON::DWIW } ) {
+        my $decoder = JSON::DWIW->new;
+        my ( $data, $error ) = $decoder->from_json( $content );
+        die $error if $error;
+        return $data;
+    }
+    elsif ( eval { require JSON::XS } ) {
+        my $decoder = JSON::XS->new->utf8->relaxed;
+        return $decoder->decode( $content );
+    }
+    elsif ( eval { require JSON::Syck } ) {
+        require Encode;
+        return JSON::Syck::Load( Encode::decode('UTF-8', $content ) );
+    }
+    elsif ( eval { require JSON::PP; JSON::PP->VERSION( 2 ); } ) {
+        my $decoder = JSON::PP->new->utf8->relaxed;
+        return $decoder->decode( $content );
+    }
+    require JSON;
+    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.
+
+=cut
+
+sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON::PP', 'JSON' }
+
+=head1 AUTHOR
+
+Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+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. 
+
+=head1 SEE ALSO
+
+=over 4 
+
+=item * L<Catalyst>
+
+=item * L<Config::Any>
+
+=item * L<JSON::DWIW>
+
+=item * L<JSON::XS>
+
+=item * L<JSON::Syck>
+
+=item * L<JSON>
+
+=back
+
+=cut
+
+1;