X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FCGIBin.pm;h=cc5218d36052a148384baed179b73ec5992824cb;hb=d5ba2ab2046dc314890bc7d3c2f9185f605d9f85;hp=183befd6ab742457eece6e4a2ca6efd53ab433f1;hpb=efa4a4342a71f4e26ad25301755b090be880e159;p=catagits%2FCatalyst-Controller-WrapCGI.git

diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm
index 183befd..cc5218d 100644
--- 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.021
+Version 0.023
 
 =cut
 
-our $VERSION = '0.021';
+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,10 +249,14 @@ sub wrap_perl_cgi {
     my ($self, $cgi, $action_name) = @_;
 
     my $code = slurp $cgi;
+    my $dir  = File::Basename::dirname($cgi);
 
-    $code =~ s/^__DATA__(?:\r?\n|\r\n?)(.*)//ms;
+    $code =~ s/^__DATA__\n(.*)//ms;
     my $data = $1;
 
+    my $orig_exit = \*CORE::GLOBAL::exit;
+    my %orig_sig  = %SIG;
+
     my $coderef = do {
         no warnings;
         # catch exit() and turn it into (effectively) a return
@@ -269,18 +264,23 @@ sub wrap_perl_cgi {
         # overridden CORE::GLOBAL::exit in view
         #
         # set $0 to the name of the cgi file in case it's used there
-        eval ' 
+        my $source = ' 
             my $cgi_exited = "EXIT\n";
             BEGIN { *CORE::GLOBAL::exit = sub (;$) {
                 die [ $cgi_exited, $_[0] || 0 ];
             } }
             package Catalyst::Controller::CGIBin::_CGIs_::'.$action_name.';
-            sub {'
-                . 'local *DATA;'
-                . q{open DATA, '<', \$data;}
-                . qq{local \$0 = "\Q$cgi\E";}
-                . q/my $rv = eval {/
-                . $code
+            sub {'."\n"
+                . 'local *DATA;'."\n"
+                . q{open DATA, '<', \$data;}."\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;'."\n"
+                . "#line 1 $cgi"."\n"
+                . $code."\n"
                 . q/};/
                 . q{
                     return $rv unless $@;
@@ -292,13 +292,27 @@ sub wrap_perl_cgi {
                     return $rv;
                 }
          . '}';
+         eval $source;
     };
 
-    croak __PACKAGE__ . ": Could not compile $cgi to coderef: $@" if $@;
+    # clean up
+    *CORE::GLOBAL::exit = $orig_exit;
+    %SIG = %orig_sig;
 
-    $coderef
+    die "Could not compile $cgi to coderef: $@" if $@;
+
+    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) >>
@@ -324,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