steal some code from CGI::Compile, release

diff --git a/Changes b/Changes
index a564961..efff47d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,12 @@
 Revision history for Catalyst-Controller-WrapCGI
 
+0.023  2009-12-22 00:41:10
+    - some code stole from CGI::Compile (until we can dep on it)
+        - correct line numbers for CGIs
+        - CGI::initialize_globals() called
+        - better CGI path to action name mapping
+    - coderefs are passed ($controller, $context)
+
 0.022  2009-12-06 05:18:08
     - handle scripts that override $SIG{__DIE__} and $SIG{__WARN__}
 

diff --git a/Makefile.PL b/Makefile.PL
index 9993ef9..3d7fa20 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,8 @@ author   'Matt S. Trout <mst@shadowcat.co.uk>';
 
 requires 'Catalyst' => '5.80015';
 requires 'HTTP::Request::AsCGI' => '0.8';;
+#requires 'CGI::Compile' => '0.06';
+requires 'File::pushd';
 requires 'File::Find::Rule';
 requires 'List::MoreUtils';
 requires 'File::Slurp';
@@ -19,7 +21,7 @@ requires 'Moose';
 test_requires 'Catalyst::Plugin::Static::Simple';
 test_requires 'CGI';
 
-build_requires 'Test::More' => '0.86';
+build_requires 'Test::More' => '0.92';
 
 auto_provides;
 auto_install;

diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm
index d1760a7..cc5218d 100644 (file)
--- a/lib/Catalyst/Controller/CGIBin.pm
+++ b/lib/Catalyst/Controller/CGIBin.pm
@@ -13,8 +13,9 @@ use IPC::Open3;
 use Symbol 'gensym';
 use List::MoreUtils 'any';
 use IO::File ();
-use Carp;
 use File::Temp 'tempfile';
+use File::pushd;
+#use CGI::Compile;
  
 use namespace::clean -except => 'meta';
 
@@ -24,11 +25,11 @@ Catalyst::Controller::CGIBin - Serve CGIs from root/cgi-bin
 
 =head1 VERSION
 
-Version 0.022
+Version 0.023
 
 =cut
 
-our $VERSION = '0.022';
+our $VERSION = '0.023';
 
 =head1 SYNOPSIS
 
@@ -152,27 +153,17 @@ sub register_actions {
 C<< $self->cgi_action($cgi) >>
 
 Takes a path to a CGI from C<root/cgi-bin> such as C<foo/bar.cgi> and returns
-the action name it is registered as. See L</DESCRIPTION> for a discussion on how
-CGI actions are named.
-
-A path such as C<root/cgi-bin/hlagh/bar.cgi> will get the private path
-C<foo/CGI_hlagh__bar_cgi>, for controller Foo, with the C</>s converted to C<__>
-and prepended with C<CGI_>, as well as all non-word characters converted to
-C<_>s. This is because L<Catalyst> action names can't have non-word characters
-in them.
-
-This means that C<foo/bar.cgi> and C<foo__bar.cgi> for example will both map to
-the action C<CGI_foo__bar_cgi> so B<DON'T DO THAT>.
+the action name it is registered as.
 
 =cut
 
 sub cgi_action {
     my ($self, $cgi) = @_;
 
-    my $action_name = 'CGI_' . join '__' => split '/' => $cgi;
-    $action_name    =~ s/\W/_/g;
+    my $action_name = 'CGI_' . $cgi;
+    $action_name =~ s/([^A-Za-z0-9_])/sprintf("_%2x", unpack("C", $1))/eg;
 
-    $action_name
+    return $action_name;
 }
 
 =head2 cgi_path
@@ -258,13 +249,13 @@ sub wrap_perl_cgi {
     my ($self, $cgi, $action_name) = @_;
 
     my $code = slurp $cgi;
+    my $dir  = File::Basename::dirname($cgi);
 
     $code =~ s/^__DATA__\n(.*)//ms;
     my $data = $1;
 
     my $orig_exit = \*CORE::GLOBAL::exit;
-    my $orig_die  = $SIG{__DIE__};
-    my $orig_warn = $SIG{__WARN__};
+    my %orig_sig  = %SIG;
 
     my $coderef = do {
         no warnings;
@@ -282,11 +273,14 @@ sub wrap_perl_cgi {
             sub {'."\n"
                 . 'local *DATA;'."\n"
                 . q{open DATA, '<', \$data;}."\n"
-                . qq{local \$0 = "\Q$cgi\E";}."\n"
+                . qq{local \$0 = '$cgi';}."\n"
+                . "my \$_dir = File::pushd::pushd '$dir';"."\n"
+                . "CGI::initialize_globals() "."\n"
+                . "    if defined &CGI::initialize_globals;"."\n"
                 . q/my $rv = eval {/."\n"
-                . 'local $SIG{__DIE__}  = $SIG{__DIE__}  || sub { die @_ };'."\n"
-                . 'local $SIG{__WARN__} = $SIG{__WARN__} || sub { warn @_ };'."\n"
-                . $code
+                . 'local %SIG;'."\n"
+                . "#line 1 $cgi"."\n"
+                . $code."\n"
                 . q/};/
                 . q{
                     return $rv unless $@;
@@ -303,14 +297,22 @@ sub wrap_perl_cgi {
 
     # clean up
     *CORE::GLOBAL::exit = $orig_exit;
-    $SIG{__DIE__}       = $orig_die;
-    $SIG{__WARN__}      = $orig_warn;
+    %SIG = %orig_sig;
 
-    croak __PACKAGE__ . ": Could not compile $cgi to coderef: $@" if $@;
+    die "Could not compile $cgi to coderef: $@" if $@;
 
-    return $coderef
+    return $coderef;
 }
 
+# Once CGI::Compile is updated, we can use this:
+
+#sub wrap_perl_cgi {
+#    my ($self, $cgi, $action_name) = @_;
+#
+#    return CGI::Compile->compile($cgi,
+#        "Catalyst::Controller::CGIBin::_CGIs_::$action_name");
+#}
+
 =head2 wrap_nonperl_cgi
 
 C<< $self->wrap_nonperl_cgi($path, $action_name) >>
@@ -336,7 +338,7 @@ __PACKAGE__->meta->make_immutable;
 =head1 SEE ALSO
 
 L<Catalyst::Controller::WrapCGI>, L<CatalystX::GlobalContext>,
-L<Catalyst::Controller>, L<CGI>, L<Catalyst>
+L<Catalyst::Controller>, L<CGI>, L<CGI::Compile>, L<Catalyst>
 
 =head1 BUGS
 

diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index 1a8447c..5c6dfe7 100644 (file)
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -1,5 +1,6 @@
 package Catalyst::Controller::WrapCGI;
 
+use 5.008_001;
 use Moose;
 use mro 'c3';
 
@@ -20,11 +21,11 @@ Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
 =head1 VERSION
 
-Version 0.022
+Version 0.023
 
 =cut
 
-our $VERSION = '0.022';
+our $VERSION = '0.023';
 
 =head1 SYNOPSIS
 
@@ -139,9 +140,11 @@ sub cgi_to_response {
 
 C<< $self->wrap_cgi($c, $coderef) >>
 
-Runs $coderef in a CGI environment using L<HTTP::Request::AsCGI>, returns an
+Runs C<$coderef> in a CGI environment using L<HTTP::Request::AsCGI>, returns an
 L<HTTP::Response>.
 
+C<$coderef> is passed the Controller instance, and C<$c>.
+
 The CGI environment is set up based on C<$c>.
 
 The environment variables to pass on are taken from the configuration for your
@@ -232,7 +235,7 @@ sub wrap_cgi {
     my $saved_error;
 
     $env->setup;
-    eval { $call->() };
+    eval { $call->($self, $c) };
     $saved_error = $@;
     $env->restore;
 

diff --git a/lib/CatalystX/GlobalContext.pm b/lib/CatalystX/GlobalContext.pm
index fd4fbfa..94a3d3a 100644 (file)
--- a/lib/CatalystX/GlobalContext.pm
+++ b/lib/CatalystX/GlobalContext.pm
@@ -15,11 +15,11 @@ CatalystX::GlobalContext - Export Catalyst Context
 
 =head1 VERSION
 
-Version 0.022
+Version 0.023
 
 =cut
 
-our $VERSION = '0.022';
+our $VERSION = '0.023';
 
 =head1 SYNOPSIS
 

diff --git a/t/cgibin.t b/t/cgibin.t
index 5430b3f..140d47a 100644 (file)
--- a/t/cgibin.t
+++ b/t/cgibin.t
@@ -6,8 +6,7 @@ use warnings;
 use FindBin '$Bin';
 use lib "$Bin/lib";
 
-use Test::More tests => 9;
-
+use Test::More;
 use Catalyst::Test 'TestCGIBin';
 use HTTP::Request::Common;
 
@@ -39,14 +38,6 @@ $response = request POST '/my-bin/exit.pl', [
 
 is($response->code, 500, 'POST to Perl CGI with nonzero exit()');
 
-$response = request POST '/cgihandler/dongs', [
-    foo => 'bar',
-    bar => 'baz'
-];
-
-is($response->content, 'foo:bar bar:baz',
-    'POST to Perl CGI File through a forward');
-
 $response = request POST '/cgihandler/mtfnpy', [
     foo => 'bar',
     bar => 'baz'
@@ -63,6 +54,12 @@ $response = request '/my-bin/pathinfo.pl/path/info';
 is($response->content, '/path/info',
     'PATH_INFO works');
 
+my %orig_sig = %SIG;
+
+ok request '/my-bin/sigs.pl';
+
+is_deeply \%SIG, \%orig_sig, '%SIG is preserved';
+
 SKIP: {
     skip "Can't run shell scripts on non-*nix", 1
         if $^O eq 'MSWin32' || $^O eq 'VMS';
@@ -72,3 +69,5 @@ SKIP: {
 
     is(get('/my-bin/test.sh'), "Hello!\n", 'Non-Perl CGI File');
 }
+
+done_testing;

diff --git a/t/lib/TestCGIBin/Controller/CGIHandler.pm b/t/lib/TestCGIBin/Controller/CGIHandler.pm
index 3092f40..ced6e59 100644 (file)
--- a/t/lib/TestCGIBin/Controller/CGIHandler.pm
+++ b/t/lib/TestCGIBin/Controller/CGIHandler.pm
@@ -14,12 +14,6 @@ sub cgi_path {
     return "my-bin/$cgi";
 }
 
-# try out a forward
-sub dongs : Local Args(0) {
-    my ($self, $c) = @_;
-    $c->forward('/cgihandler/CGI_path__test_pl');
-}
-
 # try resolved forward
 sub mtfnpy : Local Args(0) {
     my ($self, $c) = @_;

diff --git a/t/lib/TestCGIBin/root/cgi-bin/sigs.pl b/t/lib/TestCGIBin/root/cgi-bin/sigs.pl
new file mode 100755 (executable)
index 0000000..b1cb8ab
--- /dev/null
+++ b/t/lib/TestCGIBin/root/cgi-bin/sigs.pl
@@ -0,0 +1,11 @@
+#!/usr/bin/perl 
+
+use strict;
+use warnings;
+
+use CGI ':standard';
+
+$SIG{__DIE__} = sub { print "DIED!\n" };
+$SIG{__WARN__} = sub { print "WARNED!\n" };
+
+print header;