r37256@bricas-laptop (orig r8347): bricas | 2008-09-03 10:53:01 -0300

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

diff --git a/lib/Config/Any/JSON.pm b/lib/Config/Any/JSON.pm
index 954e305..6e39d63 100644 (file)
--- 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
@@ -48,27 +50,32 @@ sub load {
     close $fh;
 
     eval { require JSON::Syck; };
-    if( $@ ) {
+    if ( $@ ) {
         require JSON;
-        JSON->import;
-        return jsonToObj( $content );
+        eval { JSON->VERSION( 2 ); };
+        return $@ ? JSON::jsonToObj( $content ) : JSON::from_json( $content );
     }
     else {
         return JSON::Syck::Load( $content );
     }
 }
 
-=head1 AUTHOR
+=head2 requires_any_of( )
 
-=over 4 
+Specifies that this modules requires one of L<JSON::Syck> or L<JSON> in 
+order to work.
+
+=cut
 
-=item * Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+sub requires_any_of { 'JSON::Syck', 'JSON' }
 
-=back
+=head1 AUTHOR
+
+Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Brian Cassidy
+Copyright 2007 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.