[Catalyst-commits] r10929 - in trunk/Config-Any: . lib/Config lib/Config/Any

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2009-07-21 01:25:38 +0000 (Tue, 21 Jul 2009)
New Revision: 10929

Modified:
   trunk/Config-Any/Changes
   trunk/Config-Any/lib/Config/Any.pm
   trunk/Config-Any/lib/Config/Any/Base.pm
   trunk/Config-Any/lib/Config/Any/General.pm
   trunk/Config-Any/lib/Config/Any/INI.pm
   trunk/Config-Any/lib/Config/Any/JSON.pm
   trunk/Config-Any/lib/Config/Any/Perl.pm
   trunk/Config-Any/lib/Config/Any/XML.pm
   trunk/Config-Any/lib/Config/Any/YAML.pm
Log:
add YAML::XS to the top of the YAML loaders. tidy up some copyright lines.

Modified: trunk/Config-Any/Changes
===================================================================
--- trunk/Config-Any/Changes	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/Changes	2009-07-21 01:25:38 UTC (rev 10929)
@@ -1,5 +1,8 @@
 Revision history for Config-Any
 
+0.18 XXX
+    - add YAML::XS to the top of the YAML loaders list
+
 0.17 Thu 05 Feb 2009
     - ensure require() happens against plugin specified in force_plugins.
     - add JSON::XS to the top of the JSON loaders list

Modified: trunk/Config-Any/lib/Config/Any/Base.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/Base.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/Base.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -67,7 +67,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2008 by Brian Cassidy
+Copyright 2008-2009 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 

Modified: trunk/Config-Any/lib/Config/Any/General.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/General.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/General.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -88,7 +88,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy
+Copyright 2006-2009 by Brian Cassidy
 
 Portions Copyright 2006 Portugal Telecom
 

Modified: trunk/Config-Any/lib/Config/Any/INI.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/INI.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/INI.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -103,7 +103,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy, portions copyright 2006, 2007 by Joel Bernstein
+Copyright 2006-2009 by Brian Cassidy, portions copyright 2006, 2007 by Joel Bernstein
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 

Modified: trunk/Config-Any/lib/Config/Any/JSON.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/JSON.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/JSON.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -79,7 +79,7 @@
 
 =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. 

Modified: trunk/Config-Any/lib/Config/Any/Perl.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/Perl.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/Perl.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -62,7 +62,7 @@
 
 =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. 

Modified: trunk/Config-Any/lib/Config/Any/XML.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/XML.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/XML.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -102,7 +102,7 @@
 
 =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. 

Modified: trunk/Config-Any/lib/Config/Any/YAML.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/YAML.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any/YAML.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -43,6 +43,11 @@
     my $class = shift;
     my $file  = shift;
 
+    eval { require YAML::XS };
+    unless ( $@ ) {
+        return YAML::XS::LoadFile( $file );
+    }
+
     eval { require YAML::Syck; YAML::Syck->VERSION( '0.70' ) };
     unless ( $@ ) {
         open( my $fh, $file ) or die $!;
@@ -62,7 +67,7 @@
 
 =cut
 
-sub requires_any_of { [ 'YAML::Syck', '0.70' ], 'YAML' }
+sub requires_any_of { 'YAML::XS', [ 'YAML::Syck', '0.70' ], 'YAML' }
 
 =head1 AUTHOR
 
@@ -70,7 +75,7 @@
 
 =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. 

Modified: trunk/Config-Any/lib/Config/Any.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any.pm	2009-07-20 23:04:08 UTC (rev 10928)
+++ trunk/Config-Any/lib/Config/Any.pm	2009-07-21 01:25:38 UTC (rev 10929)
@@ -6,7 +6,7 @@
 use Carp;
 use Module::Pluggable::Object ();
 
-our $VERSION = '0.17';
+our $VERSION = '0.18';
 
 =head1 NAME