minor tidy to deprecation warning

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

diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm
index 2e800be..dd369fd 100644 (file)
--- a/lib/Config/Any/YAML.pm
+++ b/lib/Config/Any/YAML.pm
@@ -5,6 +5,8 @@ use warnings;
 
 use base 'Config::Any::Base';
 
+use Carp ();
+
 =head1 NAME
 
 Config::Any::YAML - Load YAML config files
@@ -43,27 +45,35 @@ sub load {
     my $class = shift;
     my $file  = shift;
 
-    eval { require YAML::Syck; YAML::Syck->VERSION( '0.70' ) };
-    if ( $@ ) {
-        require YAML;
-        return YAML::LoadFile( $file );
+    eval { require YAML::XS };
+    unless ( $@ ) {
+        return YAML::XS::LoadFile( $file );
     }
-    else {
+
+    Carp::carp
+        'Use of YAML::Syck or YAML to parse config files is DEPRECATED. '
+        . 'Please install YAML::XS for proper YAML support';
+
+    eval { require YAML::Syck; YAML::Syck->VERSION( '0.70' ) };
+    unless ( $@ ) {
         open( my $fh, $file ) or die $!;
         my $content = do { local $/; <$fh> };
         close $fh;
         return YAML::Syck::Load( $content );
     }
+
+    require YAML;
+    return YAML::LoadFile( $file );
 }
 
 =head2 requires_any_of( )
 
-Specifies that this modules requires one of L<YAML::Syck> (0.70) or L<YAML> in 
-order to work.
+Specifies that this modules requires one of L<YAML::XS>, L<YAML::Syck> (0.70) or
+L<YAML> in order to work.
 
 =cut
 
-sub requires_any_of { [ 'YAML::Syck', '0.70' ], 'YAML' }
+sub requires_any_of { 'YAML::XS', [ 'YAML::Syck', '0.70' ], 'YAML' }
 
 =head1 AUTHOR
 
@@ -71,7 +81,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy
+Copyright 2006-2009 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 
@@ -84,6 +94,8 @@ it under the same terms as Perl itself.
 
 =item * L<Config::Any>
 
+=item * L<YAML::XS>
+
 =item * L<YAML>
 
 =item * L<YAML::Syck>