[Catalyst-commits] r12865 - trunk/Config-Any/lib/Config/Any

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-02-15 12:17:50 +0000 (Mon, 15 Feb 2010)
New Revision: 12865

Modified:
   trunk/Config-Any/lib/Config/Any/JSON.pm
   trunk/Config-Any/lib/Config/Any/Perl.pm
Log:
make perl loader check mtime for cache, prefer JSON::DWIW for JSON

Modified: trunk/Config-Any/lib/Config/Any/JSON.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/JSON.pm	2010-02-15 06:17:05 UTC (rev 12864)
+++ trunk/Config-Any/lib/Config/Any/JSON.pm	2010-02-15 12:17:50 UTC (rev 12865)
@@ -49,9 +49,18 @@
     my $content = do { local $/; <$fh> };
     close $fh;
 
+    eval { require JSON::DWIW; };
+    unless( $@ ) {
+        my $decoder = JSON::DWIW->new;
+        my ( $data, $error ) = $decoder->from_json( $content );
+        die $error if $error;
+        return $data;
+    }
+
     eval { require JSON::XS; };
     unless( $@ ) {
-        return JSON::XS::decode_json( $content );
+        my $decoder = JSON::XS->new->relaxed;
+        return $decoder->decode( $content );
     }
 
     eval { require JSON::Syck; };
@@ -66,12 +75,12 @@
 
 =head2 requires_any_of( )
 
-Specifies that this modules requires one of,  L<JSON::XS>, L<JSON::Syck> or
-L<JSON> in order to work.
+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::XS', 'JSON::Syck', 'JSON' }
+sub requires_any_of { 'JSON::DWIW', 'JSON::XS', 'JSON::Syck', 'JSON' }
 
 =head1 AUTHOR
 
@@ -92,11 +101,13 @@
 
 =item * L<Config::Any>
 
-=item * L<JSON>
+=item * L<JSON::DWIW>
 
+=item * L<JSON::XS>
+
 =item * L<JSON::Syck>
 
-=item * L<JSON::XS>
+=item * L<JSON>
 
 =back
 

Modified: trunk/Config-Any/lib/Config/Any/Perl.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/Perl.pm	2010-02-15 06:17:05 UTC (rev 12864)
+++ trunk/Config-Any/lib/Config/Any/Perl.pm	2010-02-15 12:17:50 UTC (rev 12865)
@@ -48,12 +48,22 @@
     my $file  = shift;
     my $content;
 
-    unless ( $content = $cache{ $file } ) {
-        $content = require $file;
-        $cache{ $file } = $content;
+    my $mtime = (stat($file))[9];
+
+    if ( (not exists $cache{ $file }) || $cache{ $file }{ mtime } < $mtime ) {
+        my $exception;
+        {
+            local $@;
+            $content = do $file;
+            $exception = $@;
+        }
+        die $exception if $exception;
+
+        $cache{ $file }{ mtime   } = $mtime;
+        $cache{ $file }{ content } = $content;
     }
 
-    return $content;
+    return $cache{ $file }{ content };
 }
 
 =head1 AUTHOR