X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FYAML.pm;h=563eaf9d3a1bbf982087645afa0f3432576c64a2;hp=8a999b5cb4aa2dfc8ef90120707cceaedd4e9456;hb=2ff1869fa60acd56ea565700fb3b0116ee5c2ed5;hpb=48e4a267ac83f85a46ee54c53052f8831752acac

diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm
index 8a999b5..563eaf9 100644
--- a/lib/Config/Any/YAML.pm
+++ b/lib/Config/Any/YAML.pm
@@ -3,6 +3,10 @@ package Config::Any::YAML;
 use strict;
 use warnings;
 
+use base 'Config::Any::Base';
+
+use Carp ();
+
 =head1 NAME
 
 Config::Any::YAML - Load YAML config files
@@ -41,30 +45,29 @@ sub load {
     my $class = shift;
     my $file  = shift;
 
-    eval { require YAML::Syck; YAML::Syck->VERSION( '0.70' ) };
-    if ( $@ ) {
-        require YAML;
-        return YAML::LoadFile( $file );
+    if (eval { require YAML::XS; 1 }) {
+        return YAML::XS::LoadFile( $file );
     }
-    else {
+    elsif ($] > 5.008008 && eval { require YAML::Syck; YAML::Syck->VERSION(0.70) } ) {
         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 is_supported( )
+=head2 requires_any_of( )
 
-Returns true if either L<YAML::Syck> or L<YAML> is available.
+Specifies that this modules requires one of L<YAML::XS>, L<YAML::Syck> (0.70) or
+L<YAML> in order to work.
 
 =cut
 
-sub is_supported {
-    eval { require YAML::Syck; };
-    return 1 unless $@;
-    eval { require YAML; };
-    return $@ ? 0 : 1;
+sub requires_any_of {
+    'YAML::XS', ( $] > 5.008008 ? [ 'YAML::Syck', '0.70' ] : ()), 'YAML';
 }
 
 =head1 AUTHOR
@@ -73,7 +76,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 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. 
@@ -86,6 +89,8 @@ it under the same terms as Perl itself.
 
 =item * L<Config::Any>
 
+=item * L<YAML::XS>
+
 =item * L<YAML>
 
 =item * L<YAML::Syck>