X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView%2FComponent%2FSubInclude%2FVisit.pm;h=dbcb9ab5a0e53a01d33bb3f07f54ddd258c21440;hb=0a202862226f435e11ff538261244f94c9046759;hp=c50d9eca049aa5578fdbabbe779e23c38c971154;hpb=84616d2a8aa249873c1b4b5524234e30956eee9e;p=catagits%2FCatalyst-View-Component-SubInclude.git

diff --git a/lib/Catalyst/View/Component/SubInclude/Visit.pm b/lib/Catalyst/View/Component/SubInclude/Visit.pm
index c50d9ec..dbcb9ab 100644
--- a/lib/Catalyst/View/Component/SubInclude/Visit.pm
+++ b/lib/Catalyst/View/Component/SubInclude/Visit.pm
@@ -1,9 +1,8 @@
 package Catalyst::View::Component::SubInclude::Visit;
-use warnings;
-use strict;
-
+use Moose;
 use Carp qw/croak/;
-use namespace::clean qw/croak/;
+use MooseX::Types::Moose qw/ Bool /;
+use namespace::clean -except => 'meta';
 
 =head1 NAME
 
@@ -11,11 +10,12 @@ Catalyst::View::Component::SubInclude::Visit - visit() plugin for C::V::Componen
 
 =head1 VERSION
 
-Version 0.04
+Version 0.07_03
 
 =cut
 
-our $VERSION = '0.04';
+our $VERSION = '0.07_03';
+$VERSION = eval $VERSION;
 
 =head1 SYNOPSIS
 
@@ -58,23 +58,28 @@ with the other plugins.
 
 =cut
 
+has keep_stash => (
+    isa => Bool,
+    is => 'ro',
+    default => 0,
+);
+
 sub generate_subinclude {
-    my ($class, $c, $path, @params) = @_;
+    my ($self, $c, $path, @params) = @_;
 
     croak "subincludes through visit() require Catalyst version 5.71000 or newer"
         unless $c->can('visit');
-    
-    $c->log->debug("generate subinclude: $path @params");
 
     {
-        local $c->{stash} = {};
+        local $c->{stash} = $self->keep_stash ? $c->{stash} : {};
         
         local $c->request->{parameters} = 
             ref $params[-1] eq 'HASH' ? pop @params : {};
 
         local $c->response->{body};
 
-        $c->visit( $path, ( ref $params[0] eq 'ARRAY' ? shift @params : () ) );
+        my $captures = ref $params[0] eq 'ARRAY' ? shift @params : [];
+        $c->visit( $path, $captures, \@params );
 
         return $c->response->{body};
     }
@@ -105,4 +110,5 @@ under the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
 1;