switched to Module::Pluggable::Object

code cleanup

diff --git a/Changes b/Changes
index 1479b37..83476f6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Revision history for Perl extension Catalyst::Plugin::ConfigLoader.
     - remove hash merging since it is now a core behavior\r
     - added C/M/V legacy shortcuts\r
     - fixed debug output some\r
+    - switched to Module::Pluggable::Object\r
 \r
 0.09  Wed May 24 2006\r
     - ignore non-ref model/view/controller/component keys\r

diff --git a/lib/Catalyst/Plugin/ConfigLoader.pm b/lib/Catalyst/Plugin/ConfigLoader.pm
index 930112c..8494e96 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader.pm
@@ -4,10 +4,7 @@ use strict;
 use warnings;\r
 \r
 use NEXT;\r
-use Module::Pluggable::Fast\r
-    name    => '_config_loaders',\r
-    search  => [ __PACKAGE__ ],\r
-    require => 1;\r
+use Module::Pluggable::Object ();\r
 use Data::Visitor::Callback;\r
 \r
 our $VERSION = '0.1';\r
@@ -51,8 +48,13 @@ loaded, set the C<config()> section.
 sub setup {\r
     my $c = shift;\r
     my( $path, $extension ) = $c->get_config_path;\r
-    \r
-    for my $loader ( $c->_config_loaders ) {\r
+\r
+    my $finder = Module::Pluggable::Object->new(\r
+        search_path => [ __PACKAGE__ ],\r
+        require     => 1\r
+    );\r
+\r
+    for my $loader ( $finder->plugins ) {\r
         my @files;\r
         my @extensions = $loader->extensions;\r
         if( $extension ) {\r
@@ -102,8 +104,8 @@ sub finalize_config {
     my $v = Data::Visitor::Callback->new(\r
         plain_value => sub {\r
             return unless defined $_;\r
-            s[__HOME__][ $c->path_to( '' ) ]e;\r
-            s[__path_to\((.+)\)__][ $c->path_to( split( '/', $1 ) ) ]e;\r
+            s{__HOME__}{ $c->path_to( '' ) }e;\r
+            s{__path_to\((.+)\)__}{ $c->path_to( split( '/', $1 ) ) }e;\r
         }\r
     );\r
     $v->visit( $c->config );\r
@@ -140,10 +142,10 @@ sub get_config_path {
         || $c->config->{ file }\r
         || $c->path_to( $prefix );\r
 \r
-    my( $extension ) = ( $path =~ /\.(.{1,4})$/ );\r
+    my( $extension ) = ( $path =~ m{\.(.{1,4})$} );\r
     \r
     if( -d $path ) {\r
-        $path  =~ s/[\/\\]$//;\r
+        $path  =~ s{[\/\\]$}{};\r
         $path .= "/$prefix";\r
     }\r
     \r