X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView%2FComponent%2FSubInclude%2FSubRequest.pm;h=b931a74814ef34f426e110c4c1bfc43226cf9a1d;hb=8bbd65bf6b13d05aae77781463bc43f3c0a44deb;hp=2e97236c5276d848ffcaddc00568b23519eebe88;hpb=e88af2835e002b378e700d70a81912b493b40b1f;p=catagits%2FCatalyst-View-Component-SubInclude.git

diff --git a/lib/Catalyst/View/Component/SubInclude/SubRequest.pm b/lib/Catalyst/View/Component/SubInclude/SubRequest.pm
index 2e97236..b931a74 100644
--- a/lib/Catalyst/View/Component/SubInclude/SubRequest.pm
+++ b/lib/Catalyst/View/Component/SubInclude/SubRequest.pm
@@ -1,9 +1,7 @@
 package Catalyst::View::Component::SubInclude::SubRequest;
-use warnings;
-use strict;
-
+use Moose;
 use Carp qw/croak/;
-use namespace::clean qw/croak/;
+use namespace::clean -except => 'meta';
 
 =head1 NAME
 
@@ -11,11 +9,11 @@ Catalyst::View::Component::SubInclude::SubRequest - Sub-requests plugin for C::V
 
 =head1 VERSION
 
-Version 0.02
+Version 0.07
 
 =cut
 
-our $VERSION = '0.02';
+our $VERSION = '0.07';
 
 =head1 SYNOPSIS
 
@@ -55,29 +53,36 @@ It requires L<Catalyst::Plugin::SubRequest>.
 
 =head2 C<generate_subinclude( $c, $path, @args )>
 
-This will translate to the following sub-request call:
+This will make a sub-request call to the action specified by C<$path>. Note that
+C<$path> should be the private action path - translation to the public path is
+handled internally.
+
+So, after path translation, the call will be (roughly) equivalent to:
 
-  $c->sub_request( $path, {}, @args );
+  $c->sub_request( $translated_path, {}, @args );
 
 Notice that the stash will always be empty. This behavior could be configurable
 in the future through an additional switch - for now, this behavior guarantees a
-common interface for plugins.
+common interface for all plugins.
 
 =cut
 
 sub generate_subinclude {
-    my ($class, $c, $path, @params) = @_;
-    my $stash = {};
+    my ($class, $config, $c, $path, @params) = @_;
+    my $stash = $config->{keep_stash} ? { %{ $c->stash } } : {};
 
     croak "subincludes through subrequests require Catalyst::Plugin::SubRequest"
         unless $c->can('sub_request');
+
+    my $query = ref $params[-1] eq 'HASH' ? pop @params : {};
     
-    my $dispatcher = $c->dispatcher;
-    my ($action, $args) = $dispatcher->_invoke_as_path( $c, $path, @params );
+    my $action = blessed($path)
+          ? $path
+          : $c->dispatcher->get_action_by_path($path);
 
-    my $uri = $c->uri_for( $action, $args );
+    my $uri = $c->uri_for( $action, @params );
 
-    $c->sub_request( $uri->path, $stash, @params );
+    $c->sub_request( $uri->path, $stash, $query );
 }
 
 =head1 SEE ALSO
@@ -104,4 +109,5 @@ under the same terms as Perl itself.
 
 =cut
 
+__PACKAGE__->meta->make_immutable;
 1;