[Catalyst-commits] r12512 - in Catalyst-Plugin-Static-Simple/trunk: . lib/Catalyst/Plugin/Static

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-01-03 14:41:22 +0000 (Sun, 03 Jan 2010)
New Revision: 12512

Modified:
   Catalyst-Plugin-Static-Simple/trunk/Makefile.PL
   Catalyst-Plugin-Static-Simple/trunk/lib/Catalyst/Plugin/Static/Simple.pm
Log:
Don't override setup, rather hook setup_finalize otherwise as a role we won't play nicely with other plugins

Modified: Catalyst-Plugin-Static-Simple/trunk/Makefile.PL
===================================================================
--- Catalyst-Plugin-Static-Simple/trunk/Makefile.PL	2010-01-03 14:36:38 UTC (rev 12511)
+++ Catalyst-Plugin-Static-Simple/trunk/Makefile.PL	2010-01-03 14:41:22 UTC (rev 12512)
@@ -1,4 +1,6 @@
-use inc::Module::Install 0.87;
+use strict;
+use warnings;
+use inc::Module::Install 0.91;
 
 name 'Catalyst-Plugin-Static-Simple';
 all_from 'lib/Catalyst/Plugin/Static/Simple.pm';
@@ -6,7 +8,8 @@
 requires 'Catalyst::Runtime' => '5.80008';
 requires 'MIME::Types' => '1.25';
 requires 'Test::More';
-requires 'MRO::Compat';
+requires 'Moose';
+requires 'namespace::autoclean';
 
 if( can_use 'Catalyst::Plugin::SubRequest' ) {
     unless( can_use 'Catalyst::Plugin::SubRequest' => '0.08' ) {

Modified: Catalyst-Plugin-Static-Simple/trunk/lib/Catalyst/Plugin/Static/Simple.pm
===================================================================
--- Catalyst-Plugin-Static-Simple/trunk/lib/Catalyst/Plugin/Static/Simple.pm	2010-01-03 14:36:38 UTC (rev 12511)
+++ Catalyst-Plugin-Static-Simple/trunk/lib/Catalyst/Plugin/Static/Simple.pm	2010-01-03 14:41:22 UTC (rev 12512)
@@ -5,7 +5,7 @@
 use File::Spec ();
 use IO::File ();
 use MIME::Types ();
-use MRO::Compat;
+use namespace::autoclean;
 
 our $VERSION = '0.26';
 
@@ -84,11 +84,9 @@
     }
 };
 
-sub setup {
+before setup_finalize => sub {
     my $c = shift;
 
-    $c->maybe::next::method(@_);
-
     my $config = $c->config->{static} ||= {};
 
     $config->{dirs} ||= [];
@@ -106,7 +104,7 @@
 
     # preload the type index hash so it's not built on the first request
     $config->{mime_types_obj}->create_type_index;
-}
+};
 
 # Search through all included directories for the static file
 # Based on Template Toolkit INCLUDE_PATH code
@@ -296,7 +294,7 @@
 
    # handled by static::simple, not dispatched to your application
    /images/exists.png
-   
+
    # static::simple will not find the file and let your application
    # handle the request. You are responsible for generating a file
    # or returning a 404 error