X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FActionContainer.pm;h=ee7cfa7ed7aadb687cb7e401aef03b6329c724ec;hp=4dd45002c6a4a0dde25cfcb223414d60a1244fef;hb=059c085bfcead450e70ace9ef193aa99ac2ab37d;hpb=b5ecfcf07b8ffe7e9984f0279c8781ce51c6ac6a

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index 4dd4500..ee7cfa7 100644
--- a/lib/Catalyst/ActionContainer.pm
+++ b/lib/Catalyst/ActionContainer.pm
@@ -1,17 +1,5 @@
 package Catalyst::ActionContainer;
 
-use strict;
-use base qw/Class::Accessor::Fast/;
-
-__PACKAGE__->mk_accessors(qw/part actions/);
-
-use overload (
-
-    # Stringify to path part for tree search
-    q{""} => sub { shift->{part} },
-
-);
-
 =head1 NAME
 
 Catalyst::ActionContainer - Catalyst Action Container
@@ -22,25 +10,73 @@ See L<Catalyst>.
 
 =head1 DESCRIPTION
 
-=head1 METHODS
-
-=head2 get_action
+This is a container for actions. The dispatcher sets up a tree of these
+to represent the various dispatch points in your application.
 
 =cut
 
+use Moose;
+
+has part    => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+has actions => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+
+around 'new' => sub {
+  my $next = shift;
+  my ($self, $params) = @_;
+  $params = { part => $params } unless ref $params;
+  $next->($self, $params);
+};
+
+no Moose;
+
 sub get_action {
     my ( $self, $name ) = @_;
     return $self->actions->{$name} if defined $self->actions->{$name};
     return;
 }
 
+sub add_action {
+    my ( $self, $action, $name ) = @_;
+    $name ||= $action->name;
+    $self->actions->{$name} = $action;
+}
+
+1;
+
+__END__
+
+=head1 METHODS
+
+=head2 new(\%data | $part)
+
+Can be called with { part => $part, actions => \%actions } for full
+construction or with just a part, which will result in an empty actions
+hashref to be populated via add_action later
+
+=head2 get_action($name)
+
+Returns an action from this container based on the action name, or undef
+
+=head2 add_action($action, [ $name ])
+
+Adds an action, optionally providing a name to override $action->name
+
 =head2 actions
 
+Accessor to the actions hashref, containing all actions in this container.
+
 =head2 part
 
+Accessor to the path part this container resolves to. Also what the container
+stringifies to.
+
+=head2 meta
+
+Provided by Moose
+
 =head1 AUTHOR
 
-Matt S. Trout
+Matt S. Trout 
 
 =head1 COPYRIGHT