[Catalyst-commits] r9053 - in trunk/Catalyst-Controller-WrapCGI: . lib/Catalyst/Controller t/lib

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-01-09 23:08:26 +0000 (Fri, 09 Jan 2009)
New Revision: 9053

Modified:
   trunk/Catalyst-Controller-WrapCGI/Changes
   trunk/Catalyst-Controller-WrapCGI/META.yml
   trunk/Catalyst-Controller-WrapCGI/Makefile.PL
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
   trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin.pm
Log:
C::C::CGIBin: add root/cgi-bin to $c->config->{static}{ignore_dirs}


Modified: trunk/Catalyst-Controller-WrapCGI/Changes
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Changes	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/Changes	2009-01-09 23:08:26 UTC (rev 9053)
@@ -8,3 +8,9 @@
 
 0.0022  2008-07-04 02:52:52
     Fixed test shell script portability and missing dep on Class::C3
+
+0.0024  2008-11-19 16:00:54
+    Fixed for Catalyst 5.8
+
+0.0025  2009-01-09 14:59:20
+    Tell Static::Simple to ignore root/cgi-bin for C::C::CGIBin

Modified: trunk/Catalyst-Controller-WrapCGI/META.yml
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/META.yml	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/META.yml	2009-01-09 23:08:26 UTC (rev 9053)
@@ -3,6 +3,7 @@
 author:
   - 'Matt S. Trout <mst at shadowcat.co.uk>'
 build_requires:
+  Catalyst::Plugin::Static::Simple: 0
   Test::More: 0
 distribution_type: module
 generated_by: 'Module::Install version 0.77'
@@ -27,4 +28,4 @@
   parent: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.0024
+version: 0.0025

Modified: trunk/Catalyst-Controller-WrapCGI/Makefile.PL
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Makefile.PL	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/Makefile.PL	2009-01-09 23:08:26 UTC (rev 9053)
@@ -3,6 +3,7 @@
 name     'Catalyst-Controller-WrapCGI';
 all_from 'lib/Catalyst/Controller/WrapCGI.pm';
 author   'Matt S. Trout <mst at shadowcat.co.uk>';
+include  'Module::AutoInstall';
 
 requires 'Catalyst' => '5.7007';
 requires 'Class::C3';
@@ -14,6 +15,8 @@
 requires 'List::MoreUtils';
 requires 'File::Slurp';
 
+test_requires 'Catalyst::Plugin::Static::Simple';
+
 build_requires 'Test::More';
 
 auto_install;

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-01-09 23:08:26 UTC (rev 9053)
@@ -4,7 +4,6 @@
 use warnings;
 
 use Class::C3;
-use URI::Escape;
 use File::Slurp 'slurp';
 use File::Find::Rule ();
 use Catalyst::Exception ();
@@ -13,6 +12,7 @@
 use Symbol 'gensym';
 use List::MoreUtils 'any';
 use IO::File ();
+use namespace::clean -except => 'meta';
 
 use parent 'Catalyst::Controller::WrapCGI';
 
@@ -22,11 +22,11 @@
 
 =head1 VERSION
 
-Version 0.003
+Version 0.004
 
 =cut
 
-our $VERSION = '0.003';
+our $VERSION = '0.004';
 
 =head1 SYNOPSIS
 
@@ -123,6 +123,11 @@
     }
 
     $self->next::method($app, @_);
+
+# Tell Static::Simple to ignore the cgi-bin dir.
+    if (!any{ $_ eq 'cgi-bin' } @{ $app->config->{static}{ignore_dirs}||[] }) {
+        push @{ $app->config->{static}{ignore_dirs} }, 'cgi-bin';
+    }
 }
 
 =head1 METHODS

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-01-09 23:08:26 UTC (rev 9053)
@@ -15,11 +15,11 @@
 
 =head1 VERSION
 
-Version 0.0024
+Version 0.0025
 
 =cut
 
-our $VERSION = '0.0024';
+our $VERSION = '0.0025';
 
 =head1 SYNOPSIS
 

Modified: trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin.pm	2009-01-09 02:30:29 UTC (rev 9052)
+++ trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin.pm	2009-01-09 23:08:26 UTC (rev 9053)
@@ -3,6 +3,6 @@
 use Catalyst::Runtime '5.70';
 use parent 'Catalyst';
 
-__PACKAGE__->setup;
+__PACKAGE__->setup(qw/Static::Simple/);
 
 1;